zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-28 06:53:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

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


SVN r1269 (trunk)
This commit is contained in:
Randy Heit 2008-10-19 00:47:07 +00:00
parent 75fd6085a5
commit 6aa72c84d6
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docs/rh-log.txt
View file

@ -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) October 18, 2008 (Changes by Graf Zahl)
- Added a global symbol table and changed DECORATE parser to put its global - Added a global symbol table and changed DECORATE parser to put its global
symbols there instead of into AActor. symbols there instead of into AActor.

2
src/g_shared/sbarinfo_display.cpp
View file

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

1
src/p_acs.cpp
View file

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