From 169df3545518f90e0ae1870ebda1449bd2508901 Mon Sep 17 00:00:00 2001 From: zicodxx Date: Sun, 23 Jan 2011 09:57:52 +0100 Subject: [PATCH] Taking out one Int3 in init_boss_segments() stopping the program if there is more than one boss in level - taking out because it's not fatal or unsafe to do that; Also removed one conditional size_check which was meant for one mprintf we removed long ago --- CHANGELOG.txt | 4 ++++ main/ai2.c | 9 ++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index dfad57aba..0fc0b79ef 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,9 @@ D2X-Rebirth Changelog +20110123 +-------- +main/ai2.c: Taking out one Int3 in init_boss_segments() stopping the program if there is more than one boss in level - taking out because it's not fatal or unsafe to do that; Also removed one conditional size_check which was meant for one mprintf we removed long ago + 20110122 -------- main/console.c, main/game.c, main/gamerend.c, main/gauges.c: Added timer_update() to stop/start/reset_time() functions so resumed last_timer_value will be precise; Added new FPS counter which actually does count the frames rendered per second and is less irritating; Added timer_dleay2 call to console to not stress CPU too much; Imporoved placement for show_time(), multi messages, marker messages and orb counts diff --git a/main/ai2.c b/main/ai2.c index 95a42f67b..2c941f226 100644 --- a/main/ai2.c +++ b/main/ai2.c @@ -229,15 +229,10 @@ void init_boss_segments(short segptr[], int *num_segs, int size_check, int one_w N_selected_segs = 0; #endif - -if (size_check) // See if there is a boss. If not, quick out. for (i=0; i<=Highest_object_index; i++) - if ((Objects[i].type == OBJ_ROBOT) && (Robot_info[Objects[i].id].boss_flag)) { - if (boss_objnum != -1) // There are two bosses in this mine! i and boss_objnum! - Int3(); //do int3 here instead of assert so museum will work - boss_objnum = i; - } + if ((Objects[i].type == OBJ_ROBOT) && (Robot_info[Objects[i].id].boss_flag)) + boss_objnum = i; // if != 1 then there is more than one boss here. if (boss_objnum != -1) { int original_boss_seg;