Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update server crc log count

This commit is contained in:
Mark Vejvoda 2013-09-17 16:36:05 +00:00
parent 1d16d57c74
commit b716cea3e7
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/glest_game/game/game.cpp
View File

@ -1709,13 +1709,15 @@ void Game::update() {
if(isNetworkGame == true && NetworkManager::getInstance().getGameNetworkInterface() != NULL) {
GameSettings *settings = world.getGameSettingsPtr();
if(settings != NULL && (settings->getFlagTypes1() & ft1_network_synch_checks) == ft1_network_synch_checks) {
NetworkInterface *netIntf = NetworkManager::getInstance().getGameNetworkInterface();
for(int index = 0; index < GameConstants::maxPlayers; ++index) {
NetworkManager &networkManager = NetworkManager::getInstance();
NetworkRole role = networkManager.getNetworkRole();
NetworkInterface *netIntf = networkManager.getGameNetworkInterface();
for(int index = 0; index < GameConstants::maxPlayers; ++index) {
if(index < world.getFactionCount()) {
Faction *faction = world.getFaction(index);
netIntf->setNetworkPlayerFactionCRC(index,faction->getCRC().getSum());
faction->addCRC_DetailsForWorldFrame(world.getFrameCount());
faction->addCRC_DetailsForWorldFrame(world.getFrameCount(),role == nrServer);
}
else {
netIntf->setNetworkPlayerFactionCRC(index,0);

7
source/glest_game/type_instances/faction.cpp
View File

@ -2299,8 +2299,11 @@ Checksum Faction::getCRC() {
return crcForFaction;
}
void Faction::addCRC_DetailsForWorldFrame(int worldFrameCount) {
const int MAX_FRAME_CACHE = 1500;
void Faction::addCRC_DetailsForWorldFrame(int worldFrameCount,bool isNetworkServer) {
int MAX_FRAME_CACHE = 1500;
if(isNetworkServer == true) {
MAX_FRAME_CACHE += 700;
}
crcWorldFrameDetails[worldFrameCount] = this->toString(true);
//if(worldFrameCount <= 0) printf("Adding world frame: %d log entries: %lld\n",worldFrameCount,(long long int)crcWorldFrameDetails.size());

2
source/glest_game/type_instances/faction.h
View File

@ -372,7 +372,7 @@ public:
void clearCaches();
Checksum getCRC();
void addCRC_DetailsForWorldFrame(int worldFrameCount);
void addCRC_DetailsForWorldFrame(int worldFrameCount,bool isNetworkServer);
string getCRC_DetailsForWorldFrame(int worldFrameCount);
std::pair<int,string> getCRC_DetailsForWorldFrameIndex(int worldFrameIndex);
string getCRC_DetailsForWorldFrames();