zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 08:50:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Game: make BOUNCEMINE spawn FRAMEEFFECT only if moving horizontally.

Browse source 
Also add "zshoot -4096 BOUNCEMINE" to lunatic/test/weaponvars.con
to demonstrate that bouncemines can be shot.

git-svn-id: https://svn.eduke32.com/eduke32@5319 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2015-08-08 07:04:11 +00:00
parent b8442f0b67
commit 212343b390
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
polymer/eduke32/source/actors.c
View file

@ -4498,10 +4498,13 @@ ACTOR_STATIC void G_MoveActors(void)
} }
case BOUNCEMINE__STATIC: case BOUNCEMINE__STATIC:
if (s->xvel != 0)
case MORTER__STATIC: case MORTER__STATIC:
{
j = A_Spawn(i,(PLUTOPAK?FRAMEEFFECT1:FRAMEEFFECT1_13)); j = A_Spawn(i,(PLUTOPAK?FRAMEEFFECT1:FRAMEEFFECT1_13));
actor[j].t_data[0] = 3; actor[j].t_data[0] = 3;
}
/* fall-through */
case HEAVYHBOMB__STATIC: case HEAVYHBOMB__STATIC:
{ {
int32_t p; int32_t p;

4
polymer/eduke32/source/lunatic/test/weaponvars.con
View file

@ -6,6 +6,8 @@ gamevar shoots 2605 2 // RPG
gamevar WEAPON1_SHOOTS 2605 0 gamevar WEAPON1_SHOOTS 2605 0
define MORTER2 1653 define MORTER2 1653
// NOTE: the custom MORTER2 doesn't spawn FRAMEEFFECT like the MORTER, which
// has some hard-wired code running.
defineprojectile MORTER2 PROJ_WORKSLIKE 6150 defineprojectile MORTER2 PROJ_WORKSLIKE 6150
defineprojectile MORTER2 PROJ_SPAWNS EXPLOSION2 defineprojectile MORTER2 PROJ_SPAWNS EXPLOSION2
defineprojectile MORTER2 PROJ_SOUND RPG_SHOOT defineprojectile MORTER2 PROJ_SOUND RPG_SHOOT
@ -32,6 +34,8 @@ definequote 400 Failed setting projectile userdata
useractor notenemy 909 // tree trunk useractor notenemy 909 // tree trunk
ifcount 120 ifcount 120
{ {
zshoot -4096 BOUNCEMINE
// userdata: bitwise-OR in 64 // userdata: bitwise-OR in 64
getprojectile[MORTER2].userdata tmp getprojectile[MORTER2].userdata tmp
orvar tmp 64 orvar tmp 64