From 458dc1918e0889bd64d489dfabf3843f34c32671 Mon Sep 17 00:00:00 2001
From: johns <>
Date: Wed, 27 Mar 2002 22:38:00 +0000
Subject: [PATCH] Renamed MenuKey into MenuHandleKeyboard to avoid name
collision.
---
src/include/menus.h | 2 +-
src/ui/interface.cpp | 2 +-
src/ui/menus.cpp | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/include/menus.h b/src/include/menus.h
index 8162e2b05..e95e384a4 100644
--- a/src/include/menus.h
+++ b/src/include/menus.h
@@ -248,7 +248,7 @@ extern void DrawMenuButton(MenuButtonId button,unsigned flags,unsigned w,unsigne
/// Draw and process a menu
extern void ProcessMenu(int MenuId, int Loop);
/// Keyboard handler for menus
-extern int MenuKey(int key);
+extern int MenuHandleKeyboard(int key);
/// Called if the mouse is moved in Menu interface state
extern void MenuHandleMouseMove(int x,int y);
/// Called if any mouse button is pressed down
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index df8c60e60..945fbadb5 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -776,7 +776,7 @@ global void HandleKeyDown(unsigned key,unsigned keychar)
return;
case IfaceStateMenu: // Menu active
- MenuKey(key);
+ MenuHandleKeyboard(key);
return;
}
}
diff --git a/src/ui/menus.cpp b/src/ui/menus.cpp
index 0aff8b099..fce0459b0 100644
--- a/src/ui/menus.cpp
+++ b/src/ui/menus.cpp
@@ -3178,7 +3178,9 @@ global void ProcessMenu(int menu_id, int loop)
if (loop) {
while (CurrentMenu != -1) {
DebugLevel3("MustRedraw: 0x%08x\n",MustRedraw);
- UpdateDisplay();
+ if( MustRedraw ) {
+ UpdateDisplay();
+ }
RealizeVideoMemory();
oldncr = NetConnectRunning;
WaitEventsAndKeepSync();