Remove write-only legacy trigger field time
v29_trigger and v30_trigger define a field `time`. v29_trigger never initializes it. v30_trigger initializes it from the uninitialized v29_trigger in legacy mode, and from a file field otherwise. No program logic ever reads this member, so remove it.
This commit is contained in:
parent
600a4f9d62
commit
06a0de1c90
|
@ -110,7 +110,6 @@ struct v29_trigger : prohibit_void_ptr<v29_trigger>
|
|||
sbyte type;
|
||||
short flags;
|
||||
fix value;
|
||||
fix time;
|
||||
sbyte link_num;
|
||||
short num_links;
|
||||
std::array<segnum_t, MAX_WALLS_PER_LINK> seg;
|
||||
|
@ -123,7 +122,6 @@ struct v30_trigger : prohibit_void_ptr<v30_trigger>
|
|||
sbyte num_links;
|
||||
sbyte pad; //keep alignment
|
||||
fix value;
|
||||
fix time;
|
||||
std::array<segnum_t, MAX_WALLS_PER_LINK> seg;
|
||||
std::array<short, MAX_WALLS_PER_LINK> side;
|
||||
};
|
||||
|
|
|
@ -645,7 +645,7 @@ extern void v30_trigger_read(v30_trigger *t, PHYSFS_File *fp)
|
|||
t->num_links = PHYSFSX_readByte(fp);
|
||||
t->pad = PHYSFSX_readByte(fp);
|
||||
t->value = PHYSFSX_readFix(fp);
|
||||
t->time = PHYSFSX_readFix(fp);
|
||||
PHYSFSX_readFix(fp);
|
||||
for (unsigned i=0; i<MAX_WALLS_PER_LINK; i++ )
|
||||
t->seg[i] = PHYSFSX_readShort(fp);
|
||||
for (unsigned i=0; i<MAX_WALLS_PER_LINK; i++ )
|
||||
|
@ -705,7 +705,6 @@ static void v29_trigger_read_as_v30(PHYSFS_File *fp, v30_trigger &trig)
|
|||
// skip trig29.link_num. v30_trigger does not need it
|
||||
trig.num_links = trig29.num_links;
|
||||
trig.value = trig29.value;
|
||||
trig.time = trig29.time;
|
||||
trig.seg = trig29.seg;
|
||||
trig.side = trig29.side;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue