mirror of
https://github.com/ZDoom/raze-gles.git
synced 2025-01-12 19:20:38 +00:00
I'm either clever, or an idiot. Or both.
git-svn-id: https://svn.eduke32.com/eduke32@5548 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
db8b4a00b6
commit
3126cec75e
1 changed files with 9 additions and 6 deletions
|
@ -5050,6 +5050,10 @@ static int32_t G_InitActor(int32_t i, int32_t tilenum, int32_t set_movflag_uncon
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static actor_t NullActor;
|
||||||
|
static spriteext_t NullSprExt;
|
||||||
|
static spritesmooth_t NullSprSmooth;
|
||||||
|
|
||||||
int32_t A_InsertSprite(int32_t whatsect,int32_t s_x,int32_t s_y,int32_t s_z,int32_t s_pn,int32_t s_s,
|
int32_t A_InsertSprite(int32_t whatsect,int32_t s_x,int32_t s_y,int32_t s_z,int32_t s_pn,int32_t s_s,
|
||||||
int32_t s_xr,int32_t s_yr,int32_t s_a,int32_t s_ve,int32_t s_zv,int32_t s_ow,int32_t s_ss)
|
int32_t s_xr,int32_t s_yr,int32_t s_a,int32_t s_ve,int32_t s_zv,int32_t s_ow,int32_t s_ss)
|
||||||
{
|
{
|
||||||
|
@ -5096,10 +5100,9 @@ int32_t A_InsertSprite(int32_t whatsect,int32_t s_x,int32_t s_y,int32_t s_z,int3
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
s = &sprite[i];
|
s = &sprite[i];
|
||||||
|
*s = *(spritetype *)&spr_temp;
|
||||||
Bmemcpy(s, &spr_temp, sizeof(spritetype));
|
actor[i] = NullActor;
|
||||||
Bmemset(&actor[i], 0, sizeof(actor_t));
|
actor[i].bpos = *(vec3_t *) &s;
|
||||||
Bmemcpy(&actor[i].bpos, s, sizeof(vec3_t)); // update bposx/y/z
|
|
||||||
|
|
||||||
if ((unsigned)s_ow < MAXSPRITES)
|
if ((unsigned)s_ow < MAXSPRITES)
|
||||||
{
|
{
|
||||||
|
@ -5115,8 +5118,8 @@ int32_t A_InsertSprite(int32_t whatsect,int32_t s_x,int32_t s_y,int32_t s_z,int3
|
||||||
|
|
||||||
G_InitActor(i, s_pn, 1);
|
G_InitActor(i, s_pn, 1);
|
||||||
|
|
||||||
Bmemset(&spriteext[i], 0, sizeof(spriteext_t));
|
spriteext[i] = NullSprExt;
|
||||||
Bmemset(&spritesmooth[i], 0, sizeof(spritesmooth_t));
|
spritesmooth[i] = NullSprSmooth;
|
||||||
|
|
||||||
#if defined LUNATIC
|
#if defined LUNATIC
|
||||||
if (!g_noResetVars)
|
if (!g_noResetVars)
|
||||||
|
|
Loading…
Reference in a new issue