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

Downgrade matcen diagnostic from exception to con_printf(CON_URGENT)

Browse source 
Kreator reports that a level from back when Descent was new fails the
test for bogus matcen triggers.  This level cannot be played when that
test throws an exception, so downgrade the exception to a CON_URGENT
message.  This will hopefully deter level authors from creating any new
levels with this problem, but will allow users to play existing levels.
This commit is contained in:
Kp 2016-10-06 02:08:07 +00:00
parent ba2b8c05ba
commit 635b3f54e3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
similar/main/gamesave.cpp
View file

@ -1097,9 +1097,9 @@ static int load_game_data(PHYSFS_File *LoadFile)
w->controlling_trigger = -1;
#endif
for (trgnum_t t = 0; t < Num_triggers; t++)
range_for (const auto &&t, vctrgptridx)
{
auto &tr = *vctrgptr(t);
auto &tr = *t;
for (unsigned l = 0; l < tr.num_links; ++l)
{
//check to see that if a trigger requires a wall that it has one,
@ -1108,7 +1108,7 @@ static int load_game_data(PHYSFS_File *LoadFile)
if (trigger_is_matcen(tr))
{
if (Segments[seg_num].special != SEGMENT_IS_ROBOTMAKER)
throw std::runtime_error("matcen triggers non-matcen segment");
con_printf(CON_URGENT, "matcen %u triggers non-matcen segment %hu", t.get_unchecked_index(), seg_num);
}
#if defined(DXX_BUILD_DESCENT_II)
else if (tr.type != TT_LIGHT_OFF && tr.type != TT_LIGHT_ON)