rnd-20001203-4-src

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

diff --git a/src/libgame/system.c b/src/libgame/system.c
index fe32a073010a33f7bd92289b9f85d6bcff8c77d4..0304be812529fa19b895a5eb9d59bbd11e3db7bb 100644 (file)
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -12,9 +12,17 @@
 *  system.c                                                *
 ***********************************************************/
 
-#include "libgame.h"
+#include <string.h>
+
+#include "platform.h"
 
+#if defined(PLATFORM_MSDOS)
+#include <fcntl.h>
+#endif
+
+#include "libgame.h"
 
+#if 0
 /* ========================================================================= */
 /* exported variables                                                        */
 /* ========================================================================= */
@@ -23,7 +31,7 @@ struct ProgramInfo    program;
 struct OptionInfo      options;
 struct VideoSystemInfo video;
 struct AudioSystemInfo audio;
-struct PlayfieldInfo   playfield;
+struct GfxInfo         gfx;
 
 Display        *display = NULL;
 Visual        *visual = NULL;
@@ -34,23 +42,56 @@ DrawWindow  window = NULL;
 DrawBuffer     backbuffer = NULL;
 DrawBuffer     drawto = NULL;
 
-int            redraw_mask;
-int            redraw_tiles;
+int            button_status = MB_NOT_PRESSED;
+boolean                motion_status = FALSE;
+
+int            redraw_mask = REDRAW_NONE;
+int            redraw_tiles = 0;
 
 int            FrameCounter = 0;
 
+#endif
 
 /* ========================================================================= */
-/* video functions                                                           */
+/* init functions                                                            */
 /* ========================================================================= */
 
-inline void InitProgramInfo(char *command_name, char *program_title,
-                           char *window_title, char *icon_title,
-                           char *x11_icon_filename,
-                           char *x11_iconmask_filename,
-                           char *msdos_pointer_filename)
+void InitCommandName(char *argv0)
 {
-  program.command_name = command_name;
+  program.command_basename =
+    (strrchr(argv0, '/') ? strrchr(argv0, '/') + 1 : argv0);
+}
+
+void InitExitFunction(void (*exit_function)(int))
+{
+  program.exit_function = exit_function;
+}
+
+void InitPlatformDependantStuff(void)
+{
+#if defined(PLATFORM_MSDOS)
+  _fmode = O_BINARY;
+#endif
+}
+
+void InitProgramInfo(char *unix_userdata_directory, char *program_title,
+                    char *window_title, char *icon_title,
+                    char *x11_icon_basename, char *x11_iconmask_basename,
+                    char *msdos_pointer_basename)
+{
+  char *gfx_dir = getPath2(options.ro_base_directory, GRAPHICS_DIRECTORY);
+  char *x11_icon_filename = getPath2(gfx_dir, x11_icon_basename);
+  char *x11_iconmask_filename = getPath2(gfx_dir, x11_iconmask_basename);
+  char *msdos_pointer_filename = getPath2(gfx_dir, msdos_pointer_basename);
+
+  free(gfx_dir);
+
+#if defined(PLATFORM_UNIX)
+  program.userdata_directory = unix_userdata_directory;
+#else
+  program.userdata_directory = "userdata";
+#endif
+
   program.program_title = program_title;
   program.window_title = window_title;
   program.icon_title = icon_title;
@@ -59,44 +100,48 @@ inline void InitProgramInfo(char *command_name, char *program_title,
   program.msdos_pointer_filename = msdos_pointer_filename;
 }
 
-inline void InitPlayfieldInfo(int sx, int sy, int sxsize, int sysize,
-                             int real_sx, int real_sy,
-                             int full_sxsize, int full_sysize)
+void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize,
+                     int real_sx, int real_sy,
+                     int full_sxsize, int full_sysize)
 {
-  playfield.sx = sx;
-  playfield.sy = sy;
-  playfield.sxsize = sxsize;
-  playfield.sysize = sysize;
-  playfield.real_sx = real_sx;
-  playfield.real_sy = real_sy;
-  playfield.full_sxsize = full_sxsize;
-  playfield.full_sysize = full_sysize;
+  gfx.sx = sx;
+  gfx.sy = sy;
+  gfx.sxsize = sxsize;
+  gfx.sysize = sysize;
+  gfx.real_sx = real_sx;
+  gfx.real_sy = real_sy;
+  gfx.full_sxsize = full_sxsize;
+  gfx.full_sysize = full_sysize;
 }
 
-inline void InitDoor1Info(int dx, int dy, int dxsize, int dysize)
+void InitGfxDoor1Info(int dx, int dy, int dxsize, int dysize)
 {
-  playfield.dx = dx;
-  playfield.dy = dy;
-  playfield.dxsize = dxsize;
-  playfield.dysize = dysize;
+  gfx.dx = dx;
+  gfx.dy = dy;
+  gfx.dxsize = dxsize;
+  gfx.dysize = dysize;
 }
 
-inline void InitDoor2Info(int vx, int vy, int vxsize, int vysize)
+void InitGfxDoor2Info(int vx, int vy, int vxsize, int vysize)
 {
-  playfield.vx = vx;
-  playfield.vy = vy;
-  playfield.vxsize = vxsize;
-  playfield.vysize = vysize;
+  gfx.vx = vx;
+  gfx.vy = vy;
+  gfx.vxsize = vxsize;
+  gfx.vysize = vysize;
 }
 
-inline void InitScrollbufferInfo(int scrollbuffer_width,
-                                int scrollbuffer_height)
+void InitGfxScrollbufferInfo(int scrollbuffer_width, int scrollbuffer_height)
 {
   /* currently only used by MSDOS code to alloc VRAM buffer, if available */
-  playfield.scrollbuffer_width = scrollbuffer_width;
-  playfield.scrollbuffer_height = scrollbuffer_height;
+  gfx.scrollbuffer_width = scrollbuffer_width;
+  gfx.scrollbuffer_height = scrollbuffer_height;
 }
 
+
+/* ========================================================================= */
+/* video functions                                                           */
+/* ========================================================================= */
+
 inline static int GetRealDepth(int depth)
 {
   return (depth == DEFAULT_DEPTH ? video.default_depth : depth);
@@ -162,14 +207,14 @@ inline Bitmap CreateBitmap(int width, int height, int depth)
   if (!(pixmap = XCreatePixmap(display, window->drawable,
                               width, height, real_depth)))
     Error(ERR_EXIT, "cannot create pixmap");
-
   new_bitmap->drawable = pixmap;
-#endif
 
   if (window == NULL)
     Error(ERR_EXIT, "Window GC needed for Bitmap -- create Window first");
   new_bitmap->gc = window->gc;
 
+#endif
+
   return new_bitmap;
 }
 
@@ -283,7 +328,7 @@ inline void DrawSimpleWhiteLine(Bitmap bitmap, int from_x, int from_y,
                                int to_x, int to_y)
 {
 #ifdef TARGET_SDL
-  SDLDrawSimpleLine(bitmap->drawable, from_x, from_y, to_x, to_y, 0xffffff);
+  SDLDrawSimpleLine(bitmap->surface, from_x, from_y, to_x, to_y, 0xffffff);
 #else
   XSetForeground(display, bitmap->gc, WhitePixel(display, screen));
   XDrawLine(display, bitmap->drawable, bitmap->gc, from_x, from_y, to_x, to_y);