SVN r753 (trunk)

docs/rh-log.txt

@@ -1,3 +1,8 @@
+February 18, 2008
+- Singleplayers maps using allowrespawn now filter respawn inventory like
+  coop games, since that's essentially what they are.
+- Fixed m_alloc.cpp compilation on Linux.
+
 February 18, 2008 (Changes by Graf Zahl)
 - Applied Blzut3's sbarinfo update #12:
 * When the drawbar code was optimized border was accidently used as how many

src/m_alloc.cpp

@@ -33,8 +33,8 @@
 */
 
 #include "i_system.h"
-
 #include "stats.h"
+#include <malloc.h>
 
 ADD_STAT(mem)
 {
@@ -52,8 +52,6 @@ size_t AllocBytes;
 #endif
 #ifndef _WIN32
 #define _msize(p)				malloc_usable_size(p)	// from glibc/FreeBSD
-#else
-#include <malloc.h>
 #endif
 
 #ifndef _DEBUG

src/p_mobj.cpp

@@ -3604,7 +3604,7 @@ void P_SpawnPlayer (mapthing2_t *mthing, bool tempplayer)
 	{ // Give all cards in death match mode.
 		p->mo->GiveDeathmatchInventory ();
 	}
-	else if (multiplayer && state == PST_REBORN && oldactor != NULL)
+	else if ((multiplayer || (level.flags & LEVEL_ALLOWRESPAWN)) && state == PST_REBORN && oldactor != NULL)
 	{ // Special inventory handling for respawning in coop
 		p->mo->FilterCoopRespawnInventory (oldactor);
 	}