X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=481290eeba094911a6d7c4579ccaf9df7c9e9d13;hb=fba4d73f859e45839b0e32da0ad389e9145311a7;hp=30ef7d7986b735c5b8289d82ecbe4771c898307d;hpb=cc76b9b12e99bc807966f4e59a4842d3d1ec8b3a;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 30ef7d79..481290ee 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -16,9 +16,9 @@
 #include "types.h"
 
 
-#if defined(PLATFORM_MACOSX)
+#if defined(PLATFORM_MAC)
 #include "macosx.h"
-#elif defined(PLATFORM_WIN32)
+#elif defined(PLATFORM_WINDOWS)
 #include "windows.h"
 #elif defined(PLATFORM_ANDROID)
 #include "android.h"
@@ -163,7 +163,7 @@
 #define DEFAULT_KEY_RIGHT		KSYM_Right
 #define DEFAULT_KEY_UP			KSYM_Up
 #define DEFAULT_KEY_DOWN		KSYM_Down
-#if defined(PLATFORM_MACOSX)
+#if defined(PLATFORM_MAC)
 #define DEFAULT_KEY_SNAP		KSYM_Control_L
 #define DEFAULT_KEY_DROP		KSYM_KP_Enter
 #else
@@ -240,6 +240,7 @@
 #define MB_MENU_MARK			TRUE
 #define MB_MENU_INITIALIZE		(-1)
 #define MB_MENU_LEAVE			(-2)
+#define MB_MENU_CONTINUE		(-3)
 #define MB_LEFTBUTTON			1
 #define MB_MIDDLEBUTTON			2
 #define MB_RIGHTBUTTON			3
@@ -702,6 +703,8 @@
 
 #define GAMECONTROLLER_BASENAME	"gamecontrollerdb.txt"
 
+#define FALLBACK_TEXT_FILENAME	"fallback.txt"
+
 #define LOG_OUT_BASENAME	"stdout.txt"
 #define LOG_ERR_BASENAME	"stderr.txt"
 
@@ -721,7 +724,7 @@
 #define STRING_NEWLINE_UNIX		"\n"
 #define STRING_NEWLINE_DOS		"\r\n"
 
-#if defined(PLATFORM_WIN32)
+#if defined(PLATFORM_WINDOWS)
 #define CHAR_PATH_SEPARATOR	CHAR_PATH_SEPARATOR_DOS
 #define STRING_PATH_SEPARATOR	STRING_PATH_SEPARATOR_DOS
 #define STRING_NEWLINE		STRING_NEWLINE_DOS
@@ -1306,6 +1309,8 @@ struct SetupTouchInfo
   boolean draw_pressed;
 
   boolean grid_initialized;
+
+  boolean overlay_buttons;
 };
 
 struct SetupInputInfo