zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't set spriteext[].tspr when creating tsprites from the engine. 

Its only use is to have a actor -> tsprite mapping for the EVENT_ANIMATESPRITE
event and .tspr will be set before it is run.

git-svn-id: https://svn.eduke32.com/eduke32@3448 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-02-01 13:05:08 +00:00
parent 294f97a004
commit 14e97b2a57
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
polymer/eduke32/build/src/engine.c
View File

@ -814,7 +814,6 @@ static void yax_copytsprites()
break; break;
Bmemcpy(&tsprite[spritesortcnt], spr, sizeof(spritetype)); Bmemcpy(&tsprite[spritesortcnt], spr, sizeof(spritetype));
spriteext[spritenum].tspr = &tsprite[spritesortcnt];
tsprite[spritesortcnt].owner = spritenum; tsprite[spritesortcnt].owner = spritenum;
tsprite[spritesortcnt].sectnum = sectnum; // potentially tweak sectnum! tsprite[spritesortcnt].sectnum = sectnum; // potentially tweak sectnum!
@ -2435,8 +2434,7 @@ int32_t engine_addtsprite(int16_t z, int16_t sectnum)
if (spritesortcnt >= MAXSPRITESONSCREEN) if (spritesortcnt >= MAXSPRITESONSCREEN)
return 1; return 1;
copybufbyte(spr,&tsprite[spritesortcnt],sizeof(spritetype)); Bmemcpy(&tsprite[spritesortcnt], spr, sizeof(spritetype));
spriteext[z].tspr = (spritetype *)&tsprite[spritesortcnt];
tsprite[spritesortcnt++].owner = z; tsprite[spritesortcnt++].owner = z;
#ifdef YAX_ENABLE #ifdef YAX_ENABLE

12
polymer/eduke32/source/game.c
View File

@ -6223,11 +6223,15 @@ static int32_t G_CheckAdultTile(int32_t pic)
static void G_DoEventAnimSprites(int32_t j) static void G_DoEventAnimSprites(int32_t j)
{ {
if (display_mirror) tsprite[j].statnum = TSPR_MIRROR; const int32_t ow = tsprite[j].owner;
if ((unsigned)tsprite[j].owner < MAXSPRITES && spriteext[tsprite[j].owner].flags & SPREXT_TSPRACCESS)
if (display_mirror)
tsprite[j].statnum = TSPR_MIRROR;
if ((unsigned)ow < MAXSPRITES && spriteext[ow].flags & SPREXT_TSPRACCESS)
{ {
spriteext[tsprite[j].owner].tspr = &tsprite[j]; spriteext[ow].tspr = &tsprite[j];
VM_OnEvent(EVENT_ANIMATESPRITES, tsprite[j].owner, myconnectindex, -1, 0); VM_OnEvent(EVENT_ANIMATESPRITES, ow, myconnectindex, -1, 0);
} }
} }