Remove 'projectile' field from actor_t because it was entirely unused.

WARNING: This silently breaks savegames on 64-bit platforms.

git-svn-id: https://svn.eduke32.com/eduke32@2197 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2011-12-25 15:31:14 +00:00
parent 60fa7d9f00
commit 41db6bc512
4 changed files with 2 additions and 12 deletions

View file

@ -108,14 +108,12 @@ typedef struct {
void *lightptr;
#endif
projectile_t *projectile; //4b/8b
#if !defined SAMESIZE_ACTOR_T || UINTPTR_MAX == 0xffffffff
/* 32-bit or old, same-declaration version */
int8_t filler[16]; // pad struct to 128 bytes
int8_t filler[24]; // pad struct to 128 bytes
#else
/* 64-bit, will break older savegames */
int8_t filler[8];
int8_t filler[16];
#endif
} actor_t;

View file

@ -3765,8 +3765,6 @@ int32_t A_InsertSprite(int32_t whatsect,int32_t s_x,int32_t s_y,int32_t s_z,int3
Bmemset(&actor[i], 0, sizeof(actor_t));
Bmemcpy(&actor[i].bposx, s, sizeof(vec3_t)); // update bposx/y/z
actor[i].projectile = &SpriteProjectile[i];
if (s_ow > -1 && s_ow < MAXSPRITES)
{
actor[i].picnum = sprite[s_ow].picnum;
@ -3864,8 +3862,6 @@ int32_t A_Spawn(int32_t j, int32_t pn)
if (PN == SECTOREFFECTOR && SLT == 50)
actor[i].picnum = OW;
actor[i].projectile = &SpriteProjectile[i];
OW = actor[i].owner = i;
actor[i].floorz = sector[SECT].floorz;

View file

@ -722,7 +722,6 @@ int32_t Net_UnpackSprite(int32_t i, uint8_t *pbuf)
j += sizeof(int32_t);
}
actor[i].projectile = &SpriteProjectile[i];
#ifdef POLYMER
actor[i].lightptr = mylight;
actor[i].lightId = lightid;

View file

@ -436,7 +436,6 @@ int32_t G_LoadPlayer(int32_t spot)
if (scriptptrs[i]&2) T5 += j;
if (scriptptrs[i]&4) T6 += j;
#endif
actor[i].projectile = &SpriteProjectile[i];
}
#if !defined SAMESIZE_ACTOR_T
@ -1995,8 +1994,6 @@ static void sv_postactordata()
actor[i].lightptr = NULL;
actor[i].lightId = -1;
actor[i].projectile = &SpriteProjectile[i];
#if !defined SAMESIZE_ACTOR_T
if (sprite[i].statnum==MAXSTATUS || actorscrptr[PN]==NULL) continue;
if (savegame_bitmap[i>>3][0]&(1<<(i&7))) T2 += (intptr_t)script;