X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsdl.h;h=528b763a3db459a56c1ac178128b50a2e5b46d6e;hb=e4bf86b0ac3fd50612eee1439beba2fbaaa7cd09;hp=7db0dc2c38ca30a3853009d0b96feca4cd03a40e;hpb=868a1c69992bb641676a9e6eee5e7308cd02ecde;p=rocksndiamonds.git

diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h
index 7db0dc2c..528b763a 100644
--- a/src/libgame/sdl.h
+++ b/src/libgame/sdl.h
@@ -1,7 +1,7 @@
 /***********************************************************
 * Artsoft Retro-Game Library                               *
 *----------------------------------------------------------*
-* (c) 1994-2001 Artsoft Entertainment                      *
+* (c) 1994-2002 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -23,9 +23,6 @@
 
 #define SURFACE_FLAGS		(SDL_SWSURFACE)
 
-#define SDLCOPYAREA_OPAQUE	0
-#define SDLCOPYAREA_MASKED	1
-
 /* system dependent definitions */
 
 #define TARGET_STRING		"SDL"
@@ -60,6 +57,9 @@ typedef int			Colormap;
 
 struct SDLSurfaceInfo
 {
+  char *source_filename;
+
+  int width, height;
   SDL_Surface *surface;
   SDL_Surface *surface_masked;
   GC gc;
@@ -76,6 +76,9 @@ struct XY
 
 #define None			0L
 
+#define BlackPixel(d, s)	0x000000
+#define WhitePixel(d, s)	0xffffff
+
 #define EVENT_BUTTONPRESS	SDL_MOUSEBUTTONDOWN
 #define EVENT_BUTTONRELEASE	SDL_MOUSEBUTTONUP
 #define EVENT_MOTIONNOTIFY	SDL_MOUSEMOTION
@@ -311,6 +314,10 @@ struct XY
 #define KSYM_F23		KSYM_UNDEFINED
 #define KSYM_F24		KSYM_UNDEFINED
 
+#define KSYM_FKEY_FIRST		KSYM_F1
+#define KSYM_FKEY_LAST		KSYM_F15
+#define KSYM_NUM_FKEYS		(KSYM_FKEY_LAST - KSYM_FKEY_FIRST + 1)
+
 
 /* SDL function definitions */
 
@@ -318,9 +325,12 @@ inline void SDLInitVideoDisplay(void);
 inline void SDLInitVideoBuffer(DrawBuffer **, DrawWindow **, boolean);
 inline boolean SDLSetVideoMode(DrawBuffer **, boolean);
 inline void SDLCopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int);
-inline void SDLFillRectangle(Bitmap *, int, int, int, int, unsigned int);
-inline void SDLDrawSimpleLine(Bitmap *, int, int, int, int, unsigned int);
+inline void SDLFillRectangle(Bitmap *, int, int, int, int, Uint32);
+inline void SDLDrawSimpleLine(Bitmap *, int, int, int, int, Uint32);
 inline void SDLDrawLine(Bitmap *, int, int, int, int, Uint32);
+inline Pixel SDLGetPixel(Bitmap *, int, int);
+
+void SDLZoomBitmap(Bitmap *, Bitmap *);
 
 Bitmap *SDLLoadImage(char *);
 
@@ -329,4 +339,8 @@ inline void SDLCloseAudio(void);
 
 inline void SDLNextEvent(Event *);
 
+void HandleJoystickEvent(Event *);
+void SDLInitJoysticks(void);
+boolean SDLReadJoystick(int, int *, int *, boolean *, boolean *);
+
 #endif /* SDL_H */