- Commented out the MugShot state nulling in DSBarInfo::AttachToPlayer() so

that fiddling with player options does not reset the mug shot.
- Fixed: SetMugShotState ACS command did not pop the stack.


SVN r1269 (trunk)

docs/rh-log.txt

@@ -1,3 +1,8 @@
+October 18, 2008
+- Commented out the MugShot state nulling in DSBarInfo::AttachToPlayer() so
+  that fiddling with player options does not reset the mug shot.
+- Fixed: SetMugShotState ACS command did not pop the stack.
+
 October 18, 2008  (Changes by Graf Zahl)
 - Added a global symbol table and changed DECORATE parser to put its global 
   symbols there instead of into AActor.

src/g_shared/sbarinfo_display.cpp

@@ -277,7 +277,7 @@ void DSBarInfo::NewGame ()
 void DSBarInfo::AttachToPlayer (player_t *player)
 {
 	DBaseStatusBar::AttachToPlayer(player);
-	MugShot.CurrentState = NULL;
+//	MugShot.CurrentState = NULL;
 }
 
 void DSBarInfo::SetMugShotState (const char *state_name, bool wait_till_done, bool reset)

src/p_acs.cpp

@@ -5420,6 +5420,7 @@ int DLevelScript::RunScript ()
 
 		case PCD_SETMUGSHOTSTATE:
 			StatusBar->SetMugShotState(FBehavior::StaticLookupString(STACK(1)));
+			sp--;
 			break;
 
 		case PCD_CHECKPLAYERCAMERA: