mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-10 14:51:40 +00:00
- Fixed: GetPlayerInput() died if you tried to get the input of the activator
and the activator was the world. SVN r1522 (trunk)
This commit is contained in:
parent
78fb48302c
commit
e16fde611f
2 changed files with 9 additions and 1 deletions
|
@ -1,4 +1,8 @@
|
|||
April 4, 2009 (Changes by Graf Zahl)
|
||||
April 4, 2009
|
||||
- Fixed: GetPlayerInput() died if you tried to get the input of the activator
|
||||
and the activator was the world.
|
||||
|
||||
April 4, 2009 (Changes by Graf Zahl)
|
||||
- fixed: Any player class inheriting directly from PlayerPawn was left with
|
||||
empty weapon slots due to the recent rewrite of the weapon slot assignment
|
||||
code. To handle such classes each game now defines a default weapon slot
|
||||
|
|
|
@ -2648,6 +2648,10 @@ int DLevelScript::GetPlayerInput(int playernum, int inputnum)
|
|||
|
||||
if (playernum < 0)
|
||||
{
|
||||
if (activator == NULL)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
p = activator->player;
|
||||
}
|
||||
else if (playernum >= MAXPLAYERS || !playeringame[playernum])
|
||||
|
|
Loading…
Reference in a new issue