TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove write-only D1X trigger field type

Browse source
This commit is contained in:
Kp 2014-02-08 23:25:29 +00:00
parent 766ed23dda
commit 6f84624f4c
4 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/switch.h
View file

@ -110,7 +110,7 @@ struct v30_trigger
struct trigger
{
#if defined(DXX_BUILD_DESCENT_I)
sbyte type;
ubyte __obsolete_type; // for padding
short flags;
#elif defined(DXX_BUILD_DESCENT_II)
ubyte type; //what this trigger does

4
similar/main/dumpmine.cpp
View file

@ -548,8 +548,8 @@ static void write_trigger_text(PHYSFS_file *my_file)
PHYSFSX_printf(my_file, "Triggers:\n");
for (i=0; i<Num_triggers; i++) {
#if defined(DXX_BUILD_DESCENT_I)
PHYSFSX_printf(my_file, "Trigger %03i: type=%3i flags=%04x, value=%08x, time=%8x, linknum=%i, num_links=%i ", i,
Triggers[i].type, Triggers[i].flags, (unsigned int) (Triggers[i].value), (unsigned int) (Triggers[i].time), Triggers[i].link_num, Triggers[i].num_links);
PHYSFSX_printf(my_file, "Trigger %03i: flags=%04x, value=%08x, time=%8x, linknum=%i, num_links=%i ", i,
Triggers[i].flags, (unsigned int) (Triggers[i].value), (unsigned int) (Triggers[i].time), Triggers[i].link_num, Triggers[i].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,
Triggers[i].type, Triggers[i].flags, Triggers[i].value, Triggers[i].time, Triggers[i].num_links);

6
similar/main/gamesave.cpp
View file

@ -946,27 +946,21 @@ static int load_game_data(PHYSFS_file *LoadFile)
switch ((type = PHYSFSX_readByte(LoadFile)))
{
case 0: // door
Triggers[i].type = 0;
Triggers[i].flags = TRIGGER_CONTROL_DOORS;
break;
case 2: // matcen
Triggers[i].type = 0;
Triggers[i].flags = TRIGGER_MATCEN;
break;
case 3: // exit
Triggers[i].type = 0;
Triggers[i].flags = TRIGGER_EXIT;
break;
case 4: // secret exit
Triggers[i].type = 0;
Triggers[i].flags = TRIGGER_SECRET_EXIT;
break;
case 5: // illusion off
Triggers[i].type = 0;
Triggers[i].flags = TRIGGER_ILLUSION_OFF;
break;
case 6: // illusion on
Triggers[i].type = 0;
Triggers[i].flags = TRIGGER_ILLUSION_ON;
break;
default:

5
similar/main/switch.cpp
View file

@ -70,7 +70,6 @@ void trigger_init()
for (i=0;i<MAX_TRIGGERS;i++)
{
Triggers[i].type = 0;
Triggers[i].flags = 0;
#if defined(DXX_BUILD_DESCENT_I)
Triggers[i].link_num = -1;
@ -653,7 +652,11 @@ extern void v29_trigger_read(v29_trigger *t, PHYSFS_file *fp)
{
int i;
#if defined(DXX_BUILD_DESCENT_I)
PHYSFSX_readByte(fp);
#elif defined(DXX_BUILD_DESCENT_II)
t->type = PHYSFSX_readByte(fp);
#endif
t->flags = PHYSFSX_readShort(fp);
t->value = PHYSFSX_readFix(fp);
t->time = PHYSFSX_readFix(fp);