- Fixed: PO_Busy() did not check for a NULL return from GetPolyobj().

- Fixed two problems with printfs from the net controller stuff: one of them
  is totally valid, and the other is GCC not being as nice as VC++.
- Fixed: The case for defining SAVESIG when SVN_REVISION_NUMBER == 0 did not
  work for GCC (and presumably VC++, though I never ran into that case with
  it) because it tried to stringify something that wasn't a macro argument.


SVN r762 (trunk)

docs/rh-log.txt

@@ -1,3 +1,11 @@
+February 21, 2008
+- Fixed: PO_Busy() did not check for a NULL return from GetPolyobj().
+- Fixed two problems with printfs from the net controller stuff: one of them
+  is totally valid, and the other is GCC not being as nice as VC++.
+- Fixed: The case for defining SAVESIG when SVN_REVISION_NUMBER == 0 did not
+  work for GCC (and presumably VC++, though I never ran into that case with
+  it) because it tried to stringify something that wasn't a macro argument.
+
 February 20, 2008 (Changes by Graf Zahl)
 - Added a modified version of Karate Chris's submission for killing specific
   monsters with the 'Kill' ccmd.

src/d_net.cpp

@@ -2496,7 +2496,7 @@ static void Network_Controller (int playernum, bool add)
 
 	if (!playeringame[playernum])
 	{
-		Printf ("Player (%d) not found!\n");
+		Printf ("Player (%d) not found!\n", playernum);
 		return;
 	}
 

src/d_netinfo.cpp

@@ -825,7 +825,7 @@ CCMD (playerinfo)
 		int i = atoi (argv[1]);
 		userinfo_t *ui = &players[i].userinfo;
 		Printf ("Name:        %s\n",		ui->netname);
-		Printf ("Team:        %s (%d)\n",	ui->team == TEAM_None ? "None" : teams[ui->team].name, ui->team);
+		Printf ("Team:        %s (%d)\n",	ui->team == TEAM_None ? "None" : teams[ui->team].name.GetChars(), ui->team);
 		Printf ("Aimdist:     %d\n",		ui->aimdist);
 		Printf ("Color:       %06x\n",		ui->color);
 		Printf ("Skin:        %s (%d)\n",	skins[ui->skin].name, ui->skin);

src/po_man.cpp

@@ -1545,7 +1545,7 @@ bool PO_Busy (int polyobj)
 	polyobj_t *poly;
 
 	poly = GetPolyobj (polyobj);
-	if (!poly->specialdata)
+	if (poly == NULL || poly->specialdata == NULL)
 	{
 		return false;
 	}

src/version.h

@@ -79,11 +79,12 @@
 
 #if SVN_REVISION_NUMBER == 0
 // This can happen if svnrevision is not updated properly (e.g. compiling while offline)
-#define SAVEVER MINSAVEVER
+#define SAVEVER			MINSAVEVER
-#define SAVESIG "ZDOOMSAVE"#SAVEVER
+#define MAKESAVESIG(x)	"ZDOOMSAVE" #x
+#define SAVESIG			MAKESAVESIG(SAVEVER)
 #else
-#define SAVEVER SVN_REVISION_NUMBER
+#define SAVEVER			SVN_REVISION_NUMBER
-#define SAVESIG "ZDOOMSAVE"SVN_REVISION_STRING
+#define SAVESIG			"ZDOOMSAVE"SVN_REVISION_STRING
 #endif
 
 // This is so that derivates can use the same savegame versions without worrying about engine compatibility

src/win32/fb_ddraw.cpp

@@ -225,7 +225,6 @@ bool DDrawFB::CreateResources ()
 	DDSURFACEDESC ddsd = { sizeof(ddsd), };
 	HRESULT hr;
 	int bits;
-	int refresh;
 
 	BufferCount = 1;