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

Make escort menu a window, now the game is drawn behind it

Browse source
This commit is contained in:
kreatordxx 2010-01-09 01:56:38 +00:00
parent 624ae0b6d0
commit d7d5a8cd20
2 changed files with 109 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -1,5 +1,9 @@
D2X-Rebirth Changelog
20100109
--------
main/escort.c: Make escort menu a window, now the game is drawn behind it
20100108
--------
arch/sdl/event.h, main/newmenu.c, main/newmenu.h: Add EVENT_NEWMENU_SELECTED, allowing a newmenu/listbox selection to be handled in the callback

184
main/escort.c
View file

@ -22,6 +22,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include <stdlib.h> // for rand() and qsort()
#include <string.h> // for memset()
#include "window.h"
#include "inferno.h"
#include "console.h"
#include "fix.h"
@ -1617,14 +1618,101 @@ void drop_stolen_items(object *objp)
}
// --------------------------------------------------------------------------------------------------------------
typedef struct escort_menu
{
char msg[300];
} escort_menu;
int escort_menu_handler(window *wind, d_event *event, escort_menu *menu)
{
int key;
if (event->type == EVENT_DRAW)
{
show_escort_menu(menu->msg); //TXT_PAUSE);
return 1;
}
else if (event->type == EVENT_CLOSE)
{
game_flush_inputs();
palette_restore();
start_time();
digi_resume_digi_sounds();
return 1;
}
key = key_inkey();
switch (key) {
case KEY_0:
case KEY_1:
case KEY_2:
case KEY_3:
case KEY_4:
case KEY_5:
case KEY_6:
case KEY_7:
case KEY_8:
case KEY_9:
Looking_for_marker = -1;
Last_buddy_key = -1;
set_escort_special_goal(key);
Last_buddy_key = -1;
window_close(wind);
break;
case KEY_ESC:
case KEY_ENTER:
window_close(wind);
break;
case KEY_PRINT_SCREEN:
save_screen_shot(0);
break;
#ifndef RELEASE
case KEY_BACKSP: Int3(); break;
#endif
case KEY_T: {
char msg[32];
int temp;
temp = !Buddy_messages_suppressed;
if (temp)
strcpy(msg, "suppressed");
else
strcpy(msg, "enabled");
Buddy_messages_suppressed = 1;
buddy_message("Messages %s.", msg);
Buddy_messages_suppressed = temp;
window_close(wind);
break;
}
default:
return 0;
break;
}
return 1;
}
void do_escort_menu(void)
{
int i;
char msg[300];
int paused;
int key;
int next_goal;
char goal_str[32], tstr[32];
escort_menu *menu;
window *wind;
if (Game_mode & GM_MULTI) {
HUD_init_message("No Guide-Bot in Multiplayer!");
@ -1641,7 +1729,7 @@ void do_escort_menu(void)
HUD_init_message("No Guide-Bot present in mine!");
#ifndef NDEBUG
#if 0 //ndef NDEBUG // Just use HELPVISHNU!!
// If no buddy bot, create one!
HUD_init_message("Debug Version: Creating Guide-Bot!");
create_buddy_bot();
@ -1657,6 +1745,18 @@ void do_escort_menu(void)
return;
}
MALLOC(menu, escort_menu, 1);
if (!menu)
return;
// Just make it the full screen size and let show_escort_menu figure it out
wind = window_create(&grd_curscreen->sc_canvas, 0, 0, SWIDTH, SHEIGHT, (int (*)(window *, d_event *, void *))escort_menu_handler, menu);
if (!wind)
{
d_free(menu);
return;
}
digi_pause_digi_sounds();
stop_time();
@ -1666,8 +1766,6 @@ void do_escort_menu(void)
game_flush_inputs();
paused = 1;
gr_palette_load( gr_palette );
// This prevents the buddy from coming back if you've told him to scram.
@ -1726,7 +1824,7 @@ void do_escort_menu(void)
else
sprintf(tstr, "Enable");
sprintf(msg, "Select Guide-Bot Command:\n\n\n"
sprintf(menu->msg, "Select Guide-Bot Command:\n\n\n"
"0. Next Goal: %s" CC_LSPACING_S "3\n\n"
"\x84. Find Energy Powerup" CC_LSPACING_S "3\n\n"
"2. Find Energy Center" CC_LSPACING_S "3\n\n"
@ -1740,78 +1838,6 @@ void do_escort_menu(void)
"T. %s Messages"
// -- "9. Find the exit" CC_LSPACING_S "3\n"
, goal_str, tstr);
show_escort_menu(msg); //TXT_PAUSE);
while (paused) {
gr_flip();
show_escort_menu(msg); //TXT_PAUSE);
key = key_inkey();
switch (key) {
case KEY_0:
case KEY_1:
case KEY_2:
case KEY_3:
case KEY_4:
case KEY_5:
case KEY_6:
case KEY_7:
case KEY_8:
case KEY_9:
Looking_for_marker = -1;
Last_buddy_key = -1;
set_escort_special_goal(key);
Last_buddy_key = -1;
paused = 0;
break;
case KEY_ESC:
case KEY_ENTER:
paused=0;
break;
case KEY_PRINT_SCREEN:
save_screen_shot(0);
break;
#ifndef RELEASE
case KEY_BACKSP: Int3(); break;
#endif
case KEY_T: {
char msg[32];
int temp;
temp = !Buddy_messages_suppressed;
if (temp)
strcpy(msg, "suppressed");
else
strcpy(msg, "enabled");
Buddy_messages_suppressed = 1;
buddy_message("Messages %s.", msg);
Buddy_messages_suppressed = temp;
paused = 0;
break;
}
default:
break;
}
}
game_flush_inputs();
palette_restore();
start_time();
digi_resume_digi_sounds();
}
// -------------------------------------------------------------------------------