[Scummvm-cvs-logs] CVS: scummvm/gui gui.cpp,1.13,1.14

Nicolas Bacca arisme at users.sourceforge.net
Tue Oct 22 15:36:06 CEST 2002


Update of /cvsroot/scummvm/scummvm/gui
In directory usw-pr-cvs1:/tmp/cvs-serv32605

Modified Files:
	gui.cpp 
Log Message:
Useless, just in order to compile without errors ...

Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/gui.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gui.cpp	26 Sep 2002 12:29:10 -0000	1.13
+++ gui.cpp	22 Oct 2002 22:35:35 -0000	1.14
@@ -39,18 +39,18 @@
 extern bool toolbar_drawn;
 extern bool hide_toolbar;
 extern bool draw_keyboard;
-extern bool get_key_mapping;
+extern bool _get_key_mapping;
 extern struct keyops keyMapping;
 extern void save_key_mapping(void);
 extern void do_hide(bool);
 extern void do_quit();
 uint16 _key_mapping_required;
 uint16 _current_page;
-bool keyboard_override;
-bool save_hide_toolbar;
+extern bool keyboard_override;
+extern bool save_hide_toolbar;
 #else
 #define save_key_mapping() ;
-bool get_key_mapping;
+bool _get_key_mapping;
 uint16 _key_mapping_required;
 #endif
 
@@ -402,7 +402,7 @@
 				break;
 #ifdef _WIN32_WCE
 			case GUI_KEYTEXT:
-				strcpy(text, getGAPIKeyName(getAction((_current_page * 5) + w->_string_number - 1)->action_key));
+				strcpy(text, getGAPIKeyName((int)getAction((_current_page * 5) + w->_string_number - 1)->action_key));
 				break;
 			case GUI_ACTIONTEXT:
 				strcpy(text, getActionName(getAction((_current_page * 5) + w->_string_number - 1)->action_type));
@@ -632,7 +632,7 @@
 		return;
 	case 2:
 		_key_mapping_required = 0;
-		get_key_mapping = true;
+		_get_key_mapping = true;
 		_widgets[0] = keys_dialog;
 		_active = true;
 		_cur_page = 0;
@@ -719,7 +719,7 @@
 		_key_mapping_required = cmd;
 
 	if (cmd == 60) {
-		get_key_mapping = false;
+		_get_key_mapping = false;
 		save_key_mapping();
 		close();
 	}





More information about the Scummvm-git-logs mailing list