rnd-20060407-1-src

[rocksndiamonds.git] / src / libgame / system.h

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 128726a610b96312960353c8baac1594b04e4fcf..4901a874c5d918e48224f0ed18a452730fbd96e4 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -139,7 +139,7 @@
 #define KEY_BUTTON             (KEY_BUTTON_1 | KEY_BUTTON_2)
 #define KEY_ACTION             (KEY_MOTION | KEY_BUTTON)
 
-#define SET_FOCUS              (1 << BIT_SET_FOCUS)
+#define KEY_SET_FOCUS          (1 << BIT_SET_FOCUS)
 
 #define MV_DIR_FROM_BIT(x)     ((x) < NUM_DIRECTIONS ? 1 << (x) :        \
                                 (x) == MV_BIT_UPLEFT    ? MV_UPLEFT    : \
@@ -277,6 +277,8 @@
 #define RW_BASE_PATH           RW_GAME_DIR
 
 /* directory names */
+#define GRAPHICS_ECS_DIRECTORY "graphics.ecs"
+#define GRAPHICS_AGA_DIRECTORY "graphics.aga"
 #define GRAPHICS_DIRECTORY     "graphics"
 #define SOUNDS_DIRECTORY       "sounds"
 #define MUSIC_DIRECTORY                "music"
@@ -436,9 +438,9 @@
 
 #define ARTWORK_FIRST_NODE(artwork, type)                              \
                                ((type) == ARTWORK_TYPE_GRAPHICS ?      \
-                                (artwork).gfx_first :  \
+                                (artwork).gfx_first :                  \
                                 (type) == ARTWORK_TYPE_SOUNDS ?        \
-                                (artwork).snd_first :  \
+                                (artwork).snd_first :                  \
                                 (artwork).mus_first)
 
 #define ARTWORK_CURRENT_IDENTIFIER_PTR(artwork, type)                  \
@@ -704,6 +706,8 @@ struct SetupInfo
   boolean ask_on_escape;
   boolean ask_on_escape_editor;
   boolean quick_switch;
+  boolean input_on_focus;
+  boolean prefer_aga_graphics;
 
   char *graphics_set;
   char *sounds_set;
@@ -744,6 +748,8 @@ struct TreeInfo
   char *imported_from; /* optional comment for imported levels or artwork */
   char *imported_by;   /* optional comment for imported levels or artwork */
 
+  char *graphics_ecs_set; /* special EMC custom graphics set (ECS graphics) */
+  char *graphics_aga_set; /* special EMC custom graphics set (AGA graphics) */
   char *graphics_set;  /* optional custom graphics set (level tree only) */
   char *sounds_set;    /* optional custom sounds set (level tree only) */
   char *music_set;     /* optional custom music set (level tree only) */