rnd-20001125-2-src

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index b00e20a28ef67f89800e2897503ce700ea369f4c..33b276bb0f74832aef7e19dba45b011f82ed9942 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -32,10 +32,6 @@ Bitmap               pix[NUM_BITMAPS];
 Bitmap         pix_masked[NUM_BITMAPS], tile_masked[NUM_TILES];
 Pixmap         clipmask[NUM_BITMAPS], tile_clipmask[NUM_TILES];
 
-#ifdef USE_XPM_LIBRARY
-XpmAttributes  xpm_att[NUM_PICTURES];
-#endif
-
 DrawBuffer     drawto, drawto_field, backbuffer, fieldbuffer;
 Colormap       cmap;
 
@@ -565,6 +561,7 @@ char *element_info[] =
   "-------------------------------",
   */
 };
+int num_element_info = sizeof(element_info)/sizeof(char *);
 
 
 
@@ -572,7 +569,7 @@ char *element_info[] =
 /* | SDL TEST STUFF                                                        | */
 /* +-----------------------------------------------------------------------+ */
 
-#ifdef USE_SDL_LIBRARY
+#ifdef USE_SDL_JOYSTICK
 
 SDL_Surface *sdl_screen, *sdl_image_tmp, *sdl_image, *sdl_image_masked;
 SDL_Surface *sdl_image2_tmp, *sdl_image2, *sdl_image2_masked;
@@ -936,7 +933,7 @@ void TEST_SDL_JOYSTICK()
   SDL_QuitSubSystem(SDL_INIT_VIDEO|SDL_INIT_JOYSTICK);
 }
 
-#endif /* USE_SDL_LIBRARY */
+#endif /* USE_SDL_JOYSTICK */
 
 /* +-----------------------------------------------------------------------+ */
 /* | SDL TEST STUFF                                                        | */
@@ -958,7 +955,7 @@ int main(int argc, char *argv[])
 #endif
 
 #if 0
-#ifdef USE_SDL_LIBRARY
+#ifdef USE_SDL_JOYSTICK
   /*
   TEST_SDL_BLIT_RECT((WIN_XSIZE - TILEX)/2, (WIN_YSIZE - TILEY)/2);
   TEST_SDL_EVENT_LOOP();