zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-23 15:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Miscellaneous get/set(this)projectile cleanup.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4537 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2014-07-06 22:36:34 +00:00
parent 06072db493
commit bc0614dd22
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
polymer/eduke32/source/gamedef.c
View file

@ -2334,6 +2334,8 @@ LUNATIC_EXTERN void C_DefineProjectile(int32_t j, int32_t what, int32_t val)
g_tile[j].defproj.bsound = ProjectileData[j].bsound = val; break; g_tile[j].defproj.bsound = ProjectileData[j].bsound = val; break;
case PROJ_RANGE: case PROJ_RANGE:
g_tile[j].defproj.range = ProjectileData[j].range = val; break; g_tile[j].defproj.range = ProjectileData[j].range = val; break;
case PROJ_FLASH_COLOR:
g_tile[j].defproj.flashcolor = ProjectileData[j].flashcolor = val; break;
case PROJ_USERDATA: case PROJ_USERDATA:
g_tile[j].defproj.userdata = ProjectileData[j].userdata = val; break; g_tile[j].defproj.userdata = ProjectileData[j].userdata = val; break;
default: break; default: break;
@ -6215,14 +6217,15 @@ void C_InitProjectiles(void)
int8_t shade, xrepeat, yrepeat, pal; // 4b int8_t shade, xrepeat, yrepeat, pal; // 4b
int8_t movecnt; // 1b int8_t movecnt; // 1b
uint8_t clipdist; // 1b uint8_t clipdist; // 1b
int8_t filler[6]; // 6b int8_t filler[2]; // 2b
int32_t userdata; // 4b
} defaultprojectile_t; } defaultprojectile_t;
defaultprojectile_t DefaultProjectile = defaultprojectile_t DefaultProjectile =
{ {
1, -1, 2048, 0, 0, (int16_t)SMALLSMOKE, -1, -1, 600, (int16_t)BULLETHOLE, -1, 0, 0, 448, 1, -1, 2048, 0, 0, (int16_t)SMALLSMOKE, -1, -1, 600, (int16_t)BULLETHOLE, -1, 0, 0, 448,
(int16_t)g_numFreezeBounces, (int16_t)PIPEBOMB_BOUNCE, 1, 100, -1, -1, -1, -1, -1, -96, 18, 18, (int16_t)g_numFreezeBounces, (int16_t)PIPEBOMB_BOUNCE, 1, 100, -1, -1, -1, -1, -1, -96, 18, 18,
0, 1, 32, {0,0,0,0,0,0}, 0, 1, 32, {0,0}, 0,
}; };
EDUKE32_STATIC_ASSERT(sizeof(projectile_t) == sizeof(DefaultProjectile)); EDUKE32_STATIC_ASSERT(sizeof(projectile_t) == sizeof(DefaultProjectile));

9
polymer/eduke32/source/gamestructures.c
View file

@ -3468,6 +3468,15 @@ static void __fastcall VM_AccessProjectile(int32_t iSet, int32_t lVar1, int32_t
Gv_SetVarX(lVar2, ProjectileData[lVar1].range); Gv_SetVarX(lVar2, ProjectileData[lVar1].range);
return; return;
case PROJ_FLASH_COLOR:
if (iSet)
{
ProjectileData[lVar1].flashcolor=lValue;
return;
}
Gv_SetVarX(lVar2, ProjectileData[lVar1].flashcolor);
return;
case PROJ_USERDATA: case PROJ_USERDATA:
if (iSet) if (iSet)
{ {