zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 07:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: SetCamera didn't have the 'action' identifier, nor did it use the actual 'cam' actor provided, rendering it nonfunctional.

Browse source
This commit is contained in:
Major Cooke 2017-02-08 08:30:00 -06:00 committed by Christoph Oelckers
parent c77f6636f8
commit dd102caf13
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/p_actionfunctions.cpp
View file

@ -6923,18 +6923,18 @@ DEFINE_ACTION_FUNCTION(AActor, SetCamera)
if (self->player == nullptr || self->player->mo != self) return 0; if (self->player == nullptr || self->player->mo != self) return 0;
if (camera == nullptr) if (cam == nullptr)
{ {
camera = self; cam = self;
revert = false; revert = false;
} }
AActor *oldcamera = self->player->camera; AActor *oldcamera = self->player->camera;
self->player->camera = camera; self->player->camera = cam;
if (revert) self->player->cheats |= CF_REVERTPLEASE; if (revert) self->player->cheats |= CF_REVERTPLEASE;
if (oldcamera != camera) if (oldcamera != cam)
{ {
R_ClearPastViewer(camera); R_ClearPastViewer(cam);
} }
return 0; return 0;
} }

2
wadsrc/static/zscript/actor.txt
View file

@ -498,7 +498,7 @@ class Actor : Thinker native
native bool UsePuzzleItem(int PuzzleItemType); native bool UsePuzzleItem(int PuzzleItemType);
native float AccuracyFactor(); native float AccuracyFactor();
native bool MorphMonster (Class<Actor> spawntype, int duration, int style, Class<Actor> enter_flash, Class<Actor> exit_flash); native bool MorphMonster (Class<Actor> spawntype, int duration, int style, Class<Actor> enter_flash, Class<Actor> exit_flash);
native void SetCamera(Actor cam, bool revert = false); action native void SetCamera(Actor cam, bool revert = false);
// DECORATE compatible functions // DECORATE compatible functions
native int CountInv(class<Inventory> itemtype, int ptr_select = AAPTR_DEFAULT); native int CountInv(class<Inventory> itemtype, int ptr_select = AAPTR_DEFAULT);