From: Holger Schemel <info@artsoft.org>
Date: Thu, 21 Dec 2000 22:43:30 +0000 (+0100)
Subject: rnd-20001221-1-src
X-Git-Tag: 2.0.0^2~4
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=01a911493067452c475a31b76a3b33154b6dd10f;p=rocksndiamonds.git

rnd-20001221-1-src
---

diff --git a/src/game.c b/src/game.c
index f6e10265..43a79def 100644
--- a/src/game.c
+++ b/src/game.c
@@ -960,7 +960,9 @@ void GameWon()
       StopSound(SND_SIRR);
   }
 
+#if 0
   FadeSounds();
+#endif
 
   /* Hero disappears */
   DrawLevelField(ExitX, ExitY);
@@ -981,7 +983,10 @@ void GameWon()
   {
     leveldir_current->handicap_level++;
     SaveLevelSetup_SeriesInfo();
+  }
 
+  if (!level_editor_test_game)
+  {
     if (level_nr < leveldir_current->last_level)
       raise_level = TRUE;
   }
diff --git a/src/init.c b/src/init.c
index e756cc4c..53b8e965 100644
--- a/src/init.c
+++ b/src/init.c
@@ -449,7 +449,7 @@ void InitGfx()
 		src_x, src_y, TILEX, TILEY, 0, 0);
     }
   }
-#endif /* TARGET_X11_ANTIVE */
+#endif /* TARGET_X11_NATIVE */
 #endif /* TARGET_X11 */
 }
 
diff --git a/src/libgame/sound.c b/src/libgame/sound.c
index 757a7bd5..13a7ca04 100644
--- a/src/libgame/sound.c
+++ b/src/libgame/sound.c
@@ -117,6 +117,7 @@ static boolean TestAudioDevices(void)
   return TRUE;
 }
 
+#if !defined(TARGET_SDL)
 static boolean ForkAudioProcess(void)
 {
   if (pipe(audio.soundserver_pipe) < 0)
@@ -143,6 +144,7 @@ static boolean ForkAudioProcess(void)
 
   return TRUE;
 }
+#endif
 
 void UnixOpenAudio(void)
 {
diff --git a/src/libgame/system.h b/src/libgame/system.h
index 55201a9f..55567608 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -42,6 +42,7 @@
 
 /* values for button_status */
 #define MB_NOT_PRESSED		FALSE
+#define MB_NOT_RELEASED		TRUE
 #define MB_RELEASED		FALSE
 #define MB_PRESSED		TRUE
 #define MB_MENU_CHOICE		FALSE
diff --git a/src/libgame/text.c b/src/libgame/text.c
index b0483501..382749e3 100644
--- a/src/libgame/text.c
+++ b/src/libgame/text.c
@@ -148,12 +148,18 @@ void DrawTextExt(DrawBuffer *bitmap, int x, int y,
     else if (c == 'ü' || c == 'Ü')
       c = 93;
 
-    if (c >= 32 && c <= 95)
+    if ((c >= 32 && c <= 95) || c == '°')
     {
       int src_x = ((c - 32) % FONT_CHARS_PER_LINE) * font_width;
       int src_y = ((c - 32) / FONT_CHARS_PER_LINE) * font_height + font_start;
       int dest_x = x, dest_y = y;
 
+      if (c == '°')
+      {
+	src_x = (FONT_CHARS_PER_LINE + 1) * font_width;
+	src_y = 3 * font_height + font_start;
+      }
+
       if (print_inverse)
       {
 	BlitBitmap(font_bitmap, bitmap,
diff --git a/src/screens.c b/src/screens.c
index 556cc29e..f90b6e55 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -71,7 +71,8 @@ static void ToggleFullscreenIfNeeded()
 	       DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
 
     /* toggle fullscreen */
-    setup.fullscreen = ChangeVideoModeIfNeeded(setup.fullscreen);
+    ChangeVideoModeIfNeeded(setup.fullscreen);
+    setup.fullscreen = video.fullscreen_enabled;
 
     /* redraw background to newly created backbuffer */
     BlitBitmap(pix[PIX_BACK], backbuffer, 0,0, WIN_XSIZE,WIN_YSIZE, 0,0);