zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 14:41:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: had to give the trip bomb yet another flag.

Browse source 
Unlike every other actor this has scripted animation logic attached that is not supposed to be used. Weird.
This commit is contained in:
Christoph Oelckers 2022-01-29 10:45:36 +01:00
parent 686a648aa1
commit a015958f66
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/duke/src/animatesprites_d.cpp
View file

@ -491,7 +491,7 @@ void animatesprites_d(tspritetype* tsprite, int& spritesortcnt, int x, int y, in
break;
}
if (gs.actorinfo[h->spr.picnum].scriptaddress)
if (gs.actorinfo[h->spr.picnum].scriptaddress && !actorflag(h, SFLAG2_DONTANIMATE))
{
if (t4)
{

1
source/games/duke/src/constants.h
View file

@ -342,6 +342,7 @@ enum sflags2_t
SFLAG2_DOUBLEDMGTHRUST = 0x00000040,
SFLAG2_BREAKMIRRORS = 0x00000080,
SFLAG2_CAMERA = 0x00000100,
SFLAG2_DONTANIMATE = 0x00000200,
};
using EDukeFlags2 = TFlags<sflags2_t, uint32_t>;

1
source/games/duke/src/flags_d.cpp
View file

@ -222,6 +222,7 @@ void initactorflags_d()
setflag(SFLAG2_DOUBLEDMGTHRUST, { RADIUSEXPLOSION, RPG, HYDRENT, HEAVYHBOMB, SEENINE, OOZFILTER, EXPLODINGBARREL });
setflag(SFLAG2_BREAKMIRRORS, { RADIUSEXPLOSION, RPG, HYDRENT, HEAVYHBOMB, SEENINE, OOZFILTER, EXPLODINGBARREL });
setflag(SFLAG2_CAMERA, { CAMERA1 });
setflag(SFLAG2_DONTANIMATE, { TRIPBOMB, LASERLINE });
if (isWorldTour())
{