Permalink
Browse files

Merge branch 'bugfixes'

* bugfixes:
  Update ChangeLog.
  Make debug messages work in campaign mode.
  • Loading branch information...
2 parents 293594a + ca03389 commit ce9eea62c6715574081806939250255af8d8ee70 @cybersphinx cybersphinx committed Feb 21, 2012
Showing with 11 additions and 8 deletions.
  1. +4 −1 ChangeLog
  2. +2 −2 src/multibot.cpp
  3. +1 −1 src/multigifts.cpp
  4. +2 −2 src/multiplay.cpp
  5. +2 −2 src/multistruct.cpp
View
5 ChangeLog
@@ -1,4 +1,4 @@
-2012-02-20: Version 3.1-beta3
+2012-02-21: Version 3.1-beta4
* General:
* Change: New keyboard shortcuts for unit selection:
* Ctrl+C: All cyborgs
@@ -37,6 +37,9 @@
* Update: Russian (ticket:3184, commit:b7541ac45b9babe0dd0e0b0ffeb3cbd6b9477a2e, commit:519b83fbd3cd086b1c29f4215a2cbbd46114f534)
* Update: Turkish (ticket:3192, commit:2c9886131b24c488bd70d36a2b81437def0002c5)
+2012-02-20: Version 3.1-beta3
+ * Unpublished
+
2012-02-08: Version 3.1-beta2
* General:
* Fix: Show unit designs in factories after loading a game (ticket:3094, commit:6f7e523bc18d9c508c104c3917712400b1c53b4f)
View
4 src/multibot.cpp
@@ -328,7 +328,7 @@ bool recvDroid(NETQUEUE queue)
}
NETend();
- if (!getDebugMappingStatus())
+ if (!getDebugMappingStatus() && bMultiPlayer)
{
debug(LOG_WARNING, "Failed to add droid for player %u.", NetPlay.players[queue.index].position);
return false;
@@ -723,7 +723,7 @@ bool recvDestroyDroid(NETQUEUE queue)
}
NETend();
- if (!getDebugMappingStatus())
+ if (!getDebugMappingStatus() && bMultiPlayer)
{
debug(LOG_WARNING, "Failed to remove droid for player %u.", NetPlay.players[queue.index].position);
return false;
View
2 src/multigifts.cpp
@@ -585,7 +585,7 @@ void recvMultiPlayerFeature(NETQUEUE queue)
}
NETend();
- if (!getDebugMappingStatus())
+ if (!getDebugMappingStatus() && bMultiPlayer)
{
debug(LOG_WARNING, "Failed to add feature for player %u.", NetPlay.players[queue.index].position);
return;
View
4 src/multiplay.cpp
@@ -825,7 +825,7 @@ static bool recvResearch(NETQUEUE queue)
NETuint32_t(&index);
NETend();
- if (!getDebugMappingStatus())
+ if (!getDebugMappingStatus() && bMultiPlayer)
{
debug(LOG_WARNING, "Failed to finish research for player %u.", NetPlay.players[queue.index].position);
return false;
@@ -1525,7 +1525,7 @@ bool recvDestroyFeature(NETQUEUE queue)
NETuint32_t(&id);
NETend();
- if (!getDebugMappingStatus())
+ if (!getDebugMappingStatus() && bMultiPlayer)
{
debug(LOG_WARNING, "Failed to remove feature for player %u.", NetPlay.players[queue.index].position);
return false;
View
4 src/multistruct.cpp
@@ -89,7 +89,7 @@ bool recvBuildFinished(NETQUEUE queue)
ASSERT_OR_RETURN(false, player < MAX_PLAYERS, "invalid player %u", player);
- if (!getDebugMappingStatus())
+ if (!getDebugMappingStatus() && bMultiPlayer)
{
debug(LOG_WARNING, "Failed to add structure for player %u.", NetPlay.players[queue.index].position);
return false;
@@ -183,7 +183,7 @@ bool recvDestroyStructure(NETQUEUE queue)
NETuint32_t(&structID);
NETend();
- if (!getDebugMappingStatus())
+ if (!getDebugMappingStatus() && bMultiPlayer)
{
debug(LOG_WARNING, "Failed to remove structure for player %u.", NetPlay.players[queue.index].position);
return false;

0 comments on commit ce9eea6

Please sign in to comment.