Browse Source

Cleanup gmenu_presskeys (#556)

pull/25/head
JustAnotherGuid 7 years ago committed by Anders Jenbo
parent
commit
62fca0f486
  1. 33
      Source/gmenu.cpp
  2. 2
      Source/gmenu.h

33
Source/gmenu.cpp

@ -289,11 +289,8 @@ int __fastcall gmenu_get_lfont(TMenuItem *pItem)
return i - 2; return i - 2;
} }
int __fastcall gmenu_presskeys(int a1) BOOL __fastcall gmenu_presskeys(int a1)
{ {
int v1; // ecx
int v2; // ecx
if (!dword_634480) if (!dword_634480)
return 0; return 0;
switch (a1) { switch (a1) {
@ -302,31 +299,27 @@ int __fastcall gmenu_presskeys(int a1)
PlaySFX(IS_TITLEMOV); PlaySFX(IS_TITLEMOV);
((void(__fastcall *)(signed int))sgpCurrItem->fnMenu)(1); ((void(__fastcall *)(signed int))sgpCurrItem->fnMenu)(1);
} }
return 1; break;
case VK_ESCAPE: case VK_ESCAPE:
PlaySFX(IS_TITLEMOV); PlaySFX(IS_TITLEMOV);
gmenu_call_proc(0, 0); gmenu_call_proc(0, 0);
return 1; break;
case VK_SPACE: case VK_SPACE:
return 0; return FALSE;
case VK_LEFT: case VK_LEFT:
v2 = 0; gmenu_left_right(0);
goto LABEL_12; break;
case VK_UP:
v1 = 0;
goto LABEL_10;
case VK_RIGHT: case VK_RIGHT:
v2 = 1; gmenu_left_right(1);
LABEL_12: break;
gmenu_left_right(v2); case VK_UP:
return 1; gmenu_up_down(0);
break;
case VK_DOWN: case VK_DOWN:
v1 = 1; gmenu_up_down(1);
LABEL_10:
gmenu_up_down(v1);
break; break;
} }
return 1; return TRUE;
} }
void __fastcall gmenu_left_right(int a1) void __fastcall gmenu_left_right(int a1)

2
Source/gmenu.h

@ -26,7 +26,7 @@ void __cdecl gmenu_draw();
void __fastcall gmenu_draw_menu_item(TMenuItem *pItem, int a2); void __fastcall gmenu_draw_menu_item(TMenuItem *pItem, int a2);
void __fastcall gmenu_clear_buffer(int x, int y, int width, int height); void __fastcall gmenu_clear_buffer(int x, int y, int width, int height);
int __fastcall gmenu_get_lfont(TMenuItem *pItem); int __fastcall gmenu_get_lfont(TMenuItem *pItem);
int __fastcall gmenu_presskeys(int a1); BOOL __fastcall gmenu_presskeys(int a1);
void __fastcall gmenu_left_right(int a1); void __fastcall gmenu_left_right(int a1);
int __fastcall gmenu_on_mouse_move(LPARAM lParam); int __fastcall gmenu_on_mouse_move(LPARAM lParam);
BOOLEAN __fastcall gmenu_valid_mouse_pos(int *plOffset); BOOLEAN __fastcall gmenu_valid_mouse_pos(int *plOffset);

Loading…
Cancel
Save