diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp
index 6aaf41b5..81a3e340 100644
--- a/Strategic/mapscreen.cpp
+++ b/Strategic/mapscreen.cpp
@@ -1902,7 +1902,7 @@ BOOLEAN InitializeInvPanelCoordsRobot()
 }
 
 // the tries to select a mapscreen character by his soldier ID
-BOOLEAN SetInfoChar( UINT16 ubID )
+BOOLEAN SetInfoChar( SoldierID ubID )
 {
 	for (INT16 bCounter = 0; bCounter < giMAXIMUM_NUMBER_OF_PLAYER_SLOTS; bCounter++)
 	{
@@ -2223,7 +2223,7 @@ void GlowTrashCan( void )
 void DrawFace( INT16 sCharNumber )
 {
 	SOLDIERTYPE	*pSoldier = NULL;
-	static INT16 sOldId = -1;
+	static SoldierID sOldId = NOBODY;
 
 	// draws the face of the currently selected merc, being displayed int he upper left hand corner
 
diff --git a/Strategic/mapscreen.h b/Strategic/mapscreen.h
index 44deeb25..e17da45b 100644
--- a/Strategic/mapscreen.h
+++ b/Strategic/mapscreen.h
@@ -137,7 +137,7 @@ extern BOOLEAN gfSkyriderEmptyHelpGiven;
 extern std::vector<SOLDIERTYPE*> gSelectedSoldiers;
 
 
-BOOLEAN SetInfoChar(UINT16 ubID);
+BOOLEAN SetInfoChar(SoldierID ubID);
 void EndMapScreen( BOOLEAN fDuringFade );
 void ReBuildCharactersList( void );