Commit: 89cf3bfb98b1754f1fe2650b17a99e49855afb95 - zatspg-release (hg)

This is a fork of Zandronum for TSPG.

Commit MetaInfo

• Revisão: 89cf3bfb98b1754f1fe2650b17a99e49855afb95 (tree)
• Hora: 2017-01-16 20:10:09
• Autor: Edoardo Prezioso <edward.san.dev@gmai...>
• Commiter: Edoardo Prezioso

Mensagem de Log

- Fixed regression with vodoo doll players and hubs (fixes 2960).

Mudança Sumário

• modified: src/cooperative.cpp
• modified: src/d_player.h
• modified: src/g_game.cpp

Diff

diff -r 5fc925fd0ba6 -r 89cf3bfb98b1 src/cooperative.cpp
--- a/src/cooperative.cpp	Sun Jan 01 11:19:51 2017 +0100
+++ b/src/cooperative.cpp	Mon Jan 16 12:10:09 2017 +0100
@@ -67,7 +67,7 @@
 //*****************************************************************************
 //	PRIVATE DATA DEFINITIONS
 
-player_t DummyPlayer;
+int dummyplayer = MAXPLAYERS;
 TMap<FName, int> UVDpickupMap;
 
 //*****************************************************************************
@@ -204,7 +204,7 @@
 			// dummy player to get past all the ( player != NULL ) checks. This will require special
 			// handling wherever the code assumes that non-NULL player pointers have a valid mo.
 			if ( sv_coopunassignedvoodoodolls )
-				pDoll->player = &DummyPlayer;
+				pDoll->player = &players[dummyplayer];
 		}
 	}
 
@@ -239,14 +239,14 @@
 //
 void COOP_InitVoodooDollDummyPlayer ( void )
 {
-	DummyPlayer.userinfo.Reset();
+	players[dummyplayer].userinfo.Reset();
 }
 
 //*****************************************************************************
 //
 const player_t* COOP_GetVoodooDollDummyPlayer ( void )
 {
-	return &DummyPlayer;
+	return &players[dummyplayer];
 }
 
 //*****************************************************************************

diff -r 5fc925fd0ba6 -r 89cf3bfb98b1 src/d_player.h
--- a/src/d_player.h	Sun Jan 01 11:19:51 2017 +0100
+++ b/src/d_player.h	Mon Jan 16 12:10:09 2017 +0100
@@ -767,7 +767,8 @@
 };
 
 // Bookkeeping on players - state.
-extern player_t players[MAXPLAYERS];
+// [EP] Add 1 slot for the DummyPlayer
+extern player_t players[MAXPLAYERS + 1];
 
 FArchive &operator<< (FArchive &arc, player_t *&p);
 

diff -r 5fc925fd0ba6 -r 89cf3bfb98b1 src/g_game.cpp
--- a/src/g_game.cpp	Sun Jan 01 11:19:51 2017 +0100
+++ b/src/g_game.cpp	Mon Jan 16 12:10:09 2017 +0100
@@ -196,8 +196,8 @@
 
 bool	 		viewactive;
 
-player_t		players[MAXPLAYERS];
-bool			playeringame[MAXPLAYERS];
+player_t		players[MAXPLAYERS + 1];	// [EP] Add 1 slot for the DummyPlayer
+bool			playeringame[MAXPLAYERS + 1];	// [EP] Add 1 slot for the DummyPlayer
 
 int 			consoleplayer;			// player taking events
 int 			gametic;