mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-03 04:52:34 +02:00
Code Issues Projects Releases Wiki Activity

Added return value to giveNetworkCommand

Browse Source
This commit is contained in:
mathusummut
2018-09-27 00:22:41 +02:00
parent 2ad935481e
commit 1a47746356
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -860,8 +860,7 @@ namespace
replayCommandList.push_back(make_pair(worldFrameCount, command));
}
void
Commander::giveNetworkCommand(NetworkCommand * networkCommand) const {
std::pair<CommandResult, string> Commander::giveNetworkCommand(NetworkCommand * networkCommand) const {
Chrono
chrono;
if (SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).
@@ -1549,8 +1548,7 @@ namespace
break;
default:
assert(false);
break;
return std::pair<CommandResult, string>(crFailUndefined, "");
}
} else {
if (SystemFlags::
@@ -1563,6 +1561,7 @@ namespace
networkCommand->getUnitId(),
networkCommand->
getNetworkCommandType());
return std::pair<CommandResult, string>(crFailUndefined, "");
}
}
@@ -1573,6 +1572,7 @@ namespace
extractFileFromDirectoryPath(__FILE__).
c_str(), __FUNCTION__, __LINE__,
chrono.getMillis());
return std::pair<CommandResult, string>(crSuccess, "");
}
// Reconstruct a network command received.

2
source/glest_game/game/commander.h
View File

@@ -182,7 +182,7 @@ namespace
CommandResult,
string >
computeResult(const CommandResultContainer & results) const;
void
std::pair<CommandResult, string>
giveNetworkCommand(NetworkCommand * networkCommand) const;
bool
canSubmitCommandType(const Unit * unit,