Simplify search for guide bot in escort menu
This commit is contained in:
parent
bb2dafa7be
commit
f1ddfd448a
|
@ -1688,25 +1688,16 @@ void do_escort_menu(void)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i=0; i<=Highest_object_index; i++) {
|
for (i=0;; i++) {
|
||||||
|
if (!(i <= Highest_object_index)) {
|
||||||
|
HUD_init_message_literal(HM_DEFAULT, "No Guide-Bot present in mine!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (Objects[i].type == OBJ_ROBOT)
|
if (Objects[i].type == OBJ_ROBOT)
|
||||||
if (Robot_info[get_robot_id(&Objects[i])].companion)
|
if (Robot_info[get_robot_id(&Objects[i])].companion)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (i > Highest_object_index) {
|
|
||||||
|
|
||||||
HUD_init_message_literal(HM_DEFAULT, "No Guide-Bot present in mine!");
|
|
||||||
|
|
||||||
#if 0 //ndef NDEBUG // Just use HELPVISHNU!!
|
|
||||||
// If no buddy bot, create one!
|
|
||||||
HUD_init_message(HM_DEFAULT, "Debug Version: Creating Guide-Bot!");
|
|
||||||
create_buddy_bot();
|
|
||||||
#else
|
|
||||||
return;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
ok_for_buddy_to_talk(); // Needed here or we might not know buddy can talk when he can.
|
ok_for_buddy_to_talk(); // Needed here or we might not know buddy can talk when he can.
|
||||||
|
|
||||||
if (!Buddy_allowed_to_talk) {
|
if (!Buddy_allowed_to_talk) {
|
||||||
|
|
Loading…
Reference in a new issue