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

Fix compile errors introduced when merging

Browse source
This commit is contained in:
Chris Taylor 2011-01-14 17:49:33 +08:00
parent 2bd3385abd
commit 80597ad64f
5 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -1,5 +1,9 @@
D1X-Rebirth Changelog
20110114
--------
main/credits.c, main/menu.c, main/net_udp.c, main/scores.c: Fix compile errors introduced when merging
20110113
--------
arch/include/event.h, arch/include/key.h, arch/include/mouse.h, arch/sdl/event.c, arch/sdl/key.c, arch/sdl/mouse.c, editor/med.c, include/ui.h, main/automap.c, main/gamecntl.c, main/inferno.c, main/inferno.h, main/kconfig.c, main/kmatrix.c, main/menu.c, main/net_ipx.c, main/net_udp.c, main/newmenu.c, main/scores.c, main/titles.c, ui/file.c, ui/keypress.c, ui/menu.c, ui/menubar.c, ui/message.c, ui/mouse.c, ui/popup.c, ui/window.c: For editor, replace use of ui_mega_process() with event_process(), with the editor's own default event handler; add EVENT_MOUSE_MOVED event with event_mouse_get_delta() accessor; add event_key_get() to replace ugly casting; rename mouse_get_button() with event_mouse_get_button() to keep with name convention; only send idle events when there are no input events so editor still works properly (or the same anyway); add and use event_send() function for input events (including idle)

2
main/credits.c
View file

@ -75,7 +75,7 @@ int credits_handler(window *wind, d_event *event, credits *cr)
case EVENT_MOUSE_BUTTON_DOWN:
case EVENT_MOUSE_BUTTON_UP:
if (mouse_get_button(event) == MBTN_LEFT || mouse_get_button(event) == MBTN_RIGHT)
if (event_mouse_get_button(event) == MBTN_LEFT || event_mouse_get_button(event) == MBTN_RIGHT)
{
window_close(wind);
return 1;

5
main/menu.c
View file

@ -416,7 +416,7 @@ int main_menu_handler(newmenu *menu, d_event *event, int *menu_choice )
case EVENT_MOUSE_BUTTON_DOWN:
case EVENT_MOUSE_BUTTON_UP:
// Don't allow mousebutton-closing in main menu.
if (mouse_get_button(event) == MBTN_RIGHT)
if (event_mouse_get_button(event) == MBTN_RIGHT)
return 1;
break;
@ -1231,10 +1231,11 @@ void graphics_config()
{
#ifdef OGL
newmenu_item m[11];
int i = 0;
#else
newmenu_item m[2];
#endif
int nitems = 0, i = 0;
int nitems = 0;
#ifdef OGL
m[nitems].type = NM_TYPE_TEXT; m[nitems].text = "Texture Filtering (restart required):"; nitems++;

4
main/net_udp.c
View file

@ -537,7 +537,7 @@ int net_udp_list_join_poll( newmenu *menu, d_event *event, direct_join *dj )
newpage++;
if (NLPage < 0)
NLPage = UDP_NETGAMES_PAGES-1;
((d_event_keycommand *)event)->keycode = 0;
key = 0;
break;
}
if (key == KEY_PAGEDOWN)
@ -546,7 +546,7 @@ int net_udp_list_join_poll( newmenu *menu, d_event *event, direct_join *dj )
newpage++;
if (NLPage >= UDP_NETGAMES_PAGES)
NLPage = 0;
((d_event_keycommand *)event)->keycode = 0;
key = 0;
break;
}
if (key == KEY_F5)

2
main/scores.c
View file

@ -354,7 +354,7 @@ int scores_handler(window *wind, d_event *event, scores_menu *menu)
case EVENT_MOUSE_BUTTON_DOWN:
case EVENT_MOUSE_BUTTON_UP:
if (mouse_get_button(event) == MBTN_LEFT || mouse_get_button(event) == MBTN_RIGHT)
if (event_mouse_get_button(event) == MBTN_LEFT || event_mouse_get_button(event) == MBTN_RIGHT)
{
window_close(wind);
return 1;