From c5f4daa11be7849146e6420081a2f8ecfe801477 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 6 Feb 2016 22:12:55 +0000 Subject: [PATCH] Remove write-only trigger field `time` --- common/main/switch.h | 3 +-- similar/main/dumpmine.cpp | 4 ++-- similar/main/switch.cpp | 20 ++++++++------------ 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/common/main/switch.h b/common/main/switch.h index 5205d3aa5..86b71846d 100644 --- a/common/main/switch.h +++ b/common/main/switch.h @@ -142,16 +142,15 @@ struct trigger : public prohibit_void_ptr { #if defined(DXX_BUILD_DESCENT_I) uint16_t flags; + uint16_t num_links; #elif defined(DXX_BUILD_DESCENT_II) ubyte type; //what this trigger does ubyte flags; //currently unused uint8_t num_links; //how many doors, etc. linked to this #endif fix value; - fix time; #if defined(DXX_BUILD_DESCENT_I) int8_t link_num; - uint16_t num_links; #endif array seg; array side; diff --git a/similar/main/dumpmine.cpp b/similar/main/dumpmine.cpp index ab9625e17..d456e01d8 100644 --- a/similar/main/dumpmine.cpp +++ b/similar/main/dumpmine.cpp @@ -598,10 +598,10 @@ static void write_trigger_text(PHYSFS_File *my_file) const auto &&t = vctrgptr(i); #if defined(DXX_BUILD_DESCENT_I) PHYSFSX_printf(my_file, "Trigger %03i: flags=%04x, value=%08x, time=%8x, linknum=%i, num_links=%i ", i, - t->flags, static_cast(t->value), static_cast(t->time), t->link_num, t->num_links); + t->flags, static_cast(t->value), 0, t->link_num, t->num_links); #elif defined(DXX_BUILD_DESCENT_II) PHYSFSX_printf(my_file, "Trigger %03i: type=%02x flags=%04x, value=%08x, time=%8x, num_links=%i ", i, - t->type, t->flags, t->value, t->time, t->num_links); + t->type, t->flags, t->value, 0, t->num_links); #endif for (unsigned j = 0; j < t->num_links; ++j) diff --git a/similar/main/switch.cpp b/similar/main/switch.cpp index 9bdea2d2e..6a5101674 100644 --- a/similar/main/switch.cpp +++ b/similar/main/switch.cpp @@ -533,9 +533,6 @@ void check_trigger(const vcsegptridx_t seg, short side, const vcobjptridx_t objn void triggers_frame_process() { - range_for (auto &i, partial_range(Triggers, Num_triggers)) - if (i.time >= 0) - i.time -= FrameTime; } /* @@ -573,7 +570,7 @@ void v26_trigger_read(PHYSFS_File *fp, trigger &t) t.flags |= TRIGGER_ONE_SHOT; t.num_links = PHYSFSX_readShort(fp); t.value = PHYSFSX_readInt(fp); - t.time = PHYSFSX_readInt(fp); + PHYSFSX_readInt(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++ ) @@ -594,7 +591,7 @@ extern void v29_trigger_read(v29_trigger *t, PHYSFS_File *fp) #endif t->flags = PHYSFSX_readShort(fp); t->value = PHYSFSX_readFix(fp); - t->time = PHYSFSX_readFix(fp); + PHYSFSX_readFix(fp); t->link_num = PHYSFSX_readByte(fp); t->num_links = PHYSFSX_readShort(fp); for (i=0; inum_links = PHYSFSX_readByte(fp); PHYSFSX_readByte(fp); t->value = PHYSFSX_readFix(fp); - t->time = PHYSFSX_readFix(fp); + PHYSFSX_readFix(fp); for (i=0; iseg[i] = PHYSFSX_readShort(fp); for (i=0; i(), t.flags, t.value, t.time, t.link_num, t.num_links, t.seg, t.side)); +DEFINE_SERIAL_UDT_TO_MESSAGE(trigger, t, (serial::pad<1>(), t.flags, t.value, serial::pad<4>(), t.link_num, t.num_links, t.seg, t.side)); ASSERT_SERIAL_UDT_MESSAGE_SIZE(trigger, 54); #elif defined(DXX_BUILD_DESCENT_II) -DEFINE_SERIAL_UDT_TO_MESSAGE(trigger, t, (t.type, t.flags, t.num_links, serial::pad<1>(), t.value, t.time, t.seg, t.side)); +DEFINE_SERIAL_UDT_TO_MESSAGE(trigger, t, (t.type, t.flags, t.num_links, serial::pad<1>(), t.value, serial::pad<4>(), t.seg, t.side)); ASSERT_SERIAL_UDT_MESSAGE_SIZE(trigger, 52); #endif } @@ -789,7 +785,7 @@ void v29_trigger_write(PHYSFS_File *fp, const trigger &rt) #endif PHYSFSX_writeFix(fp, t->value); - PHYSFSX_writeFix(fp, t->time); + PHYSFSX_writeFix(fp, 0); #if defined(DXX_BUILD_DESCENT_I) PHYSFSX_writeU8(fp, t->link_num); @@ -880,7 +876,7 @@ void v30_trigger_write(PHYSFS_File *fp, const trigger &rt) PHYSFSX_writeU8(fp, 0); // t->pad PHYSFSX_writeFix(fp, t->value); - PHYSFSX_writeFix(fp, t->time); + PHYSFSX_writeFix(fp, 0); for (unsigned i = 0; i < MAX_WALLS_PER_LINK; i++) PHYSFS_writeSLE16(fp, t->seg[i]); @@ -918,7 +914,7 @@ void v31_trigger_write(PHYSFS_File *fp, const trigger &rt) PHYSFSX_writeU8(fp, 0); // t->pad PHYSFSX_writeFix(fp, t->value); - PHYSFSX_writeFix(fp, t->time); + PHYSFSX_writeFix(fp, 0); for (unsigned i = 0; i < MAX_WALLS_PER_LINK; i++) PHYSFS_writeSLE16(fp, t->seg[i]);