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

Use exception, not Error, for invalid weapon render_type

Browse source
This commit is contained in:
Kp 2020-05-02 21:18:43 +00:00
parent fa0d57961d
commit 6f8ae448c7
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
similar/main/laser.cpp
View file

@ -263,6 +263,14 @@ static void do_muzzle_stuff(segnum_t segnum, const vms_vector &pos)
m.create_time = timer_query();
}
__attribute_noreturn
static void report_invalid_weapon_render_type(const int weapon_type, const unsigned render_type)
{
char buf[96];
snprintf(buf, sizeof(buf), "invalid weapon render type %u on weapon %i", render_type, weapon_type);
throw std::runtime_error(buf);
}
}
namespace dsx {
@ -295,7 +303,7 @@ static imobjptridx_t create_weapon_object(int weapon_type,const vmsegptridx_t se
laser_radius = Weapon_info[weapon_type].blob_size;
break;
default:
Error( "Invalid weapon render type in Laser_create_new\n" );
report_invalid_weapon_render_type(weapon_type, Weapon_info[weapon_type].render_type);
}
Assert(laser_radius != -1);