rnd-20060420-1-src

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

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 4901a874c5d918e48224f0ed18a452730fbd96e4..8eb5d9ab99e8eceb795a11521214400540a9e044 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -277,8 +277,6 @@
 #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"
@@ -563,9 +561,13 @@ struct AudioSystemInfo
 struct FontBitmapInfo
 {
   Bitmap *bitmap;
+
   int src_x, src_y;            /* start position of animation frames */
   int width, height;           /* width/height of each animation frame */
-  int draw_x, draw_y;          /* offset for drawing font characters */
+
+  int draw_xoffset;            /* offset for drawing font characters */
+  int draw_yoffset;            /* offset for drawing font characters */
+
   int num_chars;
   int num_chars_per_line;
 
@@ -748,8 +750,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_ecs; /* special EMC custom graphics set (ECS graphics) */
+  char *graphics_set_aga; /* 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) */