Fix commander unit count on loading games.

Add error sound, and text when you can't add any more units to the Commander. Fixes ticket:3513 Fixes ticket:3062
Warzone2100 · Jun 1, 2012 · b3f3b08 · b3f3b08
1 parent 5ba90fe
commit b3f3b08
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/cmddroid.cpp b/src/cmddroid.cpp
@@ -34,6 +34,8 @@
 #include "group.h"
 #include "order.h"
 #include "multiplay.h"
+#include "lib/sound/audio.h"
+#include "lib/sound/audio_id.h"
 
 /**This represents the current selected player, which is the client's player.*/
 extern UDWORD selectedPlayer;
@@ -101,6 +103,11 @@ void cmdDroidAddDroid(DROID *psCommander, DROID *psDroid)
 
 		orderDroidObj(psDroid, DORDER_GUARD, (BASE_OBJECT *)psCommander, ModeImmediate);
 	}
+	else
+	{
+		audio_PlayTrack( ID_SOUND_BUILD_FAIL );
+		addConsoleMessage(_("Commander needs a higher level to command more units"), DEFAULT_JUSTIFY,  SYSTEM_MESSAGE);
+	}
 }
 
 DROID *cmdDroidGetDesignator(UDWORD player)

diff --git a/src/game.cpp b/src/game.cpp
@@ -4116,8 +4116,6 @@ static bool loadSaveDroidPointers(const QString &pFileName, DROID **ppsCurrentDr
 			int tid = ini.value("commander", -1).toInt();
 			DROID *psCommander = (DROID *)getBaseObjFromData(tid, psDroid->player, OBJ_DROID);
 			ASSERT(psCommander, "Failed to find droid commander");
-			psCommander->psGroup = NULL;
-			psCommander->psGrpNext = NULL;
 			cmdDroidAddDroid(psCommander, psDroid);
 		}
 		ini.endGroup();