From 1367b04c1c6c421a804d423d26cd4ed15474d8a4 Mon Sep 17 00:00:00 2001 From: jsalmon3 <> Date: Sun, 24 Nov 2002 23:51:25 +0000 Subject: [PATCH] Fixed bug #643281: Compile errors on Mac OS X 10.2.2 --- doc/ChangeLog.html | 2 ++ src/include/interface.h | 5 +++-- src/ui/interface.cpp | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog.html b/doc/ChangeLog.html index ddfba3f68..37367e6d4 100644 --- a/doc/ChangeLog.html +++ b/doc/ChangeLog.html @@ -987,6 +987,8 @@ <LI>Fixed bug #640812: Flameshield segfault (from Jimmy Salmon). <LI>Fixed bug #641074: Return gold to ally's town hall (from Jimmy Salmon). <LI>Fixed bug #581489: GUI - Network refresh (from Jimmy Salmon). + <LI>Fixed bug #643281: Compile errors on Mac OS X 10.2.2 (from + Jimmy Salmon). <LI>+++ </UL> </UL> diff --git a/src/include/interface.h b/src/include/interface.h index 6b86cdf9b..ae3272e09 100644 --- a/src/include/interface.h +++ b/src/include/interface.h @@ -95,7 +95,7 @@ enum _iface_state_ { enum _key_state_ { KeyStateCommand = 0, /// keys -> commands KeyStateInput /// keys -> line editor -} KeyState; /// current keyboard state +}; /// current keyboard state /// additional keycodes enum _key_codes_ { @@ -228,7 +228,8 @@ extern enum _iface_state_ InterfaceState; extern enum _scroll_state_ KeyScrollState; /// current scroll state of mouse extern enum _scroll_state_ MouseScrollState; - + /// current key state +extern enum _key_state_ KeyState; /// pointer to unit under the cursor extern Unit* UnitUnderCursor; /// button number under the cursor diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index 98e441e30..73df0bcc0 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -78,6 +78,7 @@ global char SkipGameCycle; /// Skip the next game cycle global char BigMapMode; /// Show only the map global enum _iface_state_ InterfaceState; /// Current interface state global int GodMode; /// Invincibility cheat +global enum _key_state_ KeyState; /// current key state /*---------------------------------------------------------------------------- -- Functions