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

Remove unused member from actor_t 

git-svn-id: https://svn.eduke32.com/eduke32@6226 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2017-06-23 03:58:21 +00:00
parent 6319b6fb60
commit c26fcfa786
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/duke3d/src/actors.h
View File

@ -149,6 +149,7 @@ typedef struct { int32_t id; struct action ac; } con_action_t;
# define AC_MOVFLAGS(spr, a) ((spr)->hitag) # define AC_MOVFLAGS(spr, a) ((spr)->hitag)
#endif #endif
#pragma pack(push, 1)
// (+ 40 16 16 4 8 6 8 6 4 20) // (+ 40 16 16 4 8 6 8 6 4 20)
typedef struct typedef struct
{ {
@ -171,10 +172,7 @@ typedef struct
// NOTE: 'dispicnum' is updated locally, not in sync with the game! // NOTE: 'dispicnum' is updated locally, not in sync with the game!
int16_t actorstayput, dispicnum; int16_t actorstayput, dispicnum;
#if !defined LUNATIC #ifdef LUNATIC
// NOTE: shootzvel is not used any more.
int16_t shootzvel_;
#else
// Movement flags, sprite[i].hitag in C-CON: // Movement flags, sprite[i].hitag in C-CON:
uint16_t movflags; uint16_t movflags;
#endif #endif
@ -193,21 +191,20 @@ typedef struct
#if UINTPTR_MAX == 0xffffffff #if UINTPTR_MAX == 0xffffffff
/* 32-bit */ /* 32-bit */
# if !defined LUNATIC # if !defined LUNATIC
int8_t filler[20]; int8_t filler[22];
# else # else
int8_t filler[4]; int8_t filler[4];
# endif # endif
#else #else
/* 64-bit */ /* 64-bit */
# if !defined LUNATIC # if !defined LUNATIC
int8_t filler[16]; int8_t filler[18];
# else # else
/* no padding */ /* no padding */
#endif #endif
#endif #endif
} actor_t; } actor_t;
#pragma pack(push, 1)
// this struct needs to match the beginning of actor_t above // this struct needs to match the beginning of actor_t above
typedef struct typedef struct
{ {
@ -227,9 +224,7 @@ typedef struct
int16_t movflag, tempang, timetosleep; // 6b int16_t movflag, tempang, timetosleep; // 6b
int16_t actorstayput, dispicnum; int16_t actorstayput, dispicnum;
#if !defined LUNATIC #ifdef LUNATIC
int16_t shootzvel_;
#else
uint16_t movflags; uint16_t movflags;
#endif #endif
int16_t cgg; int16_t cgg;

3
source/duke3d/src/net.cpp
View File

@ -1267,7 +1267,6 @@ void Net_CopyToNet(int32_t i, netactor_t *netactor)
netactor->lastvy = actor[i].lastvy; netactor->lastvy = actor[i].lastvy;
netactor->lasttransport = actor[i].lasttransport; netactor->lasttransport = actor[i].lasttransport;
netactor->actorstayput = actor[i].actorstayput; netactor->actorstayput = actor[i].actorstayput;
//netactor->dispicnum = actor[i].dispicnum;
netactor->cgg = actor[i].cgg; netactor->cgg = actor[i].cgg;
netactor->owner = actor[i].owner; netactor->owner = actor[i].owner;
@ -1308,7 +1307,6 @@ void Net_CopyFromNet(int32_t i, netactor_t *netactor)
actor[i].lastvy = netactor->lastvy; actor[i].lastvy = netactor->lastvy;
actor[i].lasttransport = netactor->lasttransport; actor[i].lasttransport = netactor->lasttransport;
actor[i].actorstayput = netactor->actorstayput; actor[i].actorstayput = netactor->actorstayput;
actor[i].dispicnum = netactor->dispicnum;
actor[i].cgg = netactor->cgg; actor[i].cgg = netactor->cgg;
actor[i].owner = netactor->owner; actor[i].owner = netactor->owner;
@ -1337,7 +1335,6 @@ int32_t Net_ActorsAreDifferent(netactor_t *actor1, netactor_t *actor2)
actor1->lastvy != actor2->lastvy || actor1->lastvy != actor2->lastvy ||
actor1->lasttransport != actor2->lasttransport || actor1->lasttransport != actor2->lasttransport ||
actor1->actorstayput != actor2->actorstayput || actor1->actorstayput != actor2->actorstayput ||
//actor1->dispicnum != actor2->dispicnum ||
//actor1->cgg != actor2->cgg || //actor1->cgg != actor2->cgg ||
actor1->sprite.owner != actor2->sprite.owner || actor1->sprite.owner != actor2->sprite.owner ||