rnd-20000807-2-src

diff --git a/src/Makefile b/src/Makefile
index f9a71038c907129b52d791d5baec70bdac2bf3b5..0dad3f3d1736052ae23dc01a92c028db28fd65d3 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -35,6 +35,8 @@ EXTRA_LIBS = -lnsl -lsocket -R$(XLIB_PATH)
 endif
 
 USE_SDL = true
+# USE_SDL = false
+# USE_SDL_OLD_LIBS = true
 USE_SDL_OLD_LIBS = false
 
 ifeq ($(USE_SDL_OLD_LIBS),true)

diff --git a/src/main.h b/src/main.h
index c46bf476c3c8c8ee56a9cdf4bb8598b2759d6c0d..15c21e81fb11a3327d0d5f3ad29f93f71fcd56c1 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -1649,7 +1649,11 @@ extern char              *element_info[];
 #define TAPES_DIRECTORY                "tapes"
 #define SCORES_DIRECTORY       "scores"
 
+#ifdef USE_SDL_LIBRARY
 #define PROGRAM_VERSION_STRING "1.4.0 SDL"
+#else
+#define PROGRAM_VERSION_STRING "1.4.0"
+#endif
 #define PROGRAM_TITLE_STRING   "Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING  "Holger Schemel"
 #define WINDOW_TITLE_STRING    PROGRAM_TITLE_STRING " " PROGRAM_VERSION_STRING

diff --git a/src/sdl.c b/src/sdl.c
index bcebf7f27b69ae86a845af2305cb26552b7f5b9f..f782961d2a509f9e43ea67d7f729ad32eca3b89f 100644 (file)
--- a/src/sdl.c
+++ b/src/sdl.c
@@ -35,7 +35,9 @@ inline void SDLCopyArea(SDL_Surface *src_surface, SDL_Surface *dst_surface,
   dst_rect.h = height;
 
   SDL_BlitSurface(src_surface, &src_rect, dst_surface, &dst_rect);
+#if 1
   SDL_UpdateRect(dst_surface, dst_x, dst_y, width, height);
+#endif
 }
 
 inline void SDLFillRectangle(SDL_Surface *surface, int x, int y,

diff --git a/src/system.c b/src/system.c
index 6b85ccb38c219d7fe790031bdbf817a355c179d6..ac3375454475790b1ca0e7553fa9feba4fb545e5 100644 (file)
--- a/src/system.c
+++ b/src/system.c
@@ -88,6 +88,10 @@ inline void FlushDisplay()
 {
 #ifndef USE_SDL_LIBRARY
   XFlush(display);
+#else
+#if 0
+  SDL_UpdateRect(window, 0, 0, 0, 0);
+#endif
 #endif
 }