X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=3f95c2b01bae1a95797b78d3773e667595ed9bb6;hb=1465ca1ffdf2104d25b9a46ca9bf8a3f175403fd;hp=1f3aca0024d71c3808c3be9853326d37586b7f1b;hpb=1150bdce04915bf329bd816307fb2507eba80e15;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index 1f3aca00..3f95c2b0 100644
--- a/src/game.c
+++ b/src/game.c
@@ -11,13 +11,12 @@
 *  game.c                                                  *
 ***********************************************************/
 
+#include "libgame/libgame.h"
+
 #include "game.h"
-#include "misc.h"
 #include "tools.h"
 #include "screens.h"
-#include "sound.h"
 #include "init.h"
-#include "buttons.h"
 #include "files.h"
 #include "tape.h"
 #include "joystick.h"
@@ -167,16 +166,16 @@ static unsigned int getStateCheckSum(int counter)
 
 void GetPlayerConfig()
 {
-  if (!sysinfo.audio_available)
+  if (!audio.sound_available)
     setup.sound = FALSE;
 
-  if (!sysinfo.audio_loops_available)
+  if (!audio.loops_available)
   {
     setup.sound_loops = FALSE;
     setup.sound_music = FALSE;
   }
 
-  if (!fullscreen_available)
+  if (!video.fullscreen_available)
     setup.fullscreen = FALSE;
 
   setup.sound_simple = setup.sound;
@@ -731,7 +730,7 @@ void InitGame()
 	     int2str(level_nr, 2), FS_SMALL, FC_YELLOW);
   else
   {
-    DrawTextExt(drawto, gc, DX + XX_EMERALDS, DY + YY_EMERALDS,
+    DrawTextExt(drawto, DX + XX_EMERALDS, DY + YY_EMERALDS,
 		int2str(level_nr, 3), FS_SMALL, FC_SPECIAL3);
     BlitBitmap(drawto, drawto,
 	       DX + XX_EMERALDS, DY + YY_EMERALDS + 1,
@@ -5403,12 +5402,10 @@ int DigField(struct PlayerInfo *player,
       RemoveField(x, y);
       player->key[key_nr] = TRUE;
       RaiseScoreElement(EL_SCHLUESSEL);
-      DrawMiniGraphicExt(drawto, gc,
-			 DX_KEYS+key_nr*MINI_TILEX, DY_KEYS,
-			 GFX_SCHLUESSEL1+key_nr);
-      DrawMiniGraphicExt(window, gc,
-			 DX_KEYS+key_nr*MINI_TILEX, DY_KEYS,
-			 GFX_SCHLUESSEL1+key_nr);
+      DrawMiniGraphicExt(drawto, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
+			 GFX_SCHLUESSEL1 + key_nr);
+      DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
+			 GFX_SCHLUESSEL1 + key_nr);
       PlaySoundLevel(x, y, SND_PONG);
       break;
     }
@@ -5423,12 +5420,10 @@ int DigField(struct PlayerInfo *player,
       RemoveField(x, y);
       player->key[key_nr] = TRUE;
       RaiseScoreElement(EL_SCHLUESSEL);
-      DrawMiniGraphicExt(drawto, gc,
-			 DX_KEYS+key_nr*MINI_TILEX, DY_KEYS,
-			 GFX_SCHLUESSEL1+key_nr);
-      DrawMiniGraphicExt(window, gc,
-			 DX_KEYS+key_nr*MINI_TILEX, DY_KEYS,
-			 GFX_SCHLUESSEL1+key_nr);
+      DrawMiniGraphicExt(drawto, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
+			 GFX_SCHLUESSEL1 + key_nr);
+      DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
+			 GFX_SCHLUESSEL1 + key_nr);
       PlaySoundLevel(x, y, SND_PONG);
       break;
     }
@@ -6233,7 +6228,7 @@ static void HandleGameButtons(struct GadgetInfo *gi)
 	setup.sound_music = FALSE;
 	FadeSound(background_loop[level_nr % num_bg_loops]);
       }
-      else if (sysinfo.audio_loops_available)
+      else if (audio.loops_available)
       { 
 	setup.sound = setup.sound_music = TRUE;
 	PlaySoundLoop(background_loop[level_nr % num_bg_loops]);
@@ -6243,14 +6238,14 @@ static void HandleGameButtons(struct GadgetInfo *gi)
     case SOUND_CTRL_ID_LOOPS:
       if (setup.sound_loops)
 	setup.sound_loops = FALSE;
-      else if (sysinfo.audio_loops_available)
+      else if (audio.loops_available)
 	setup.sound = setup.sound_loops = TRUE;
       break;
 
     case SOUND_CTRL_ID_SIMPLE:
       if (setup.sound_simple)
 	setup.sound_simple = FALSE;
-      else if (sysinfo.audio_available)
+      else if (audio.sound_available)
 	setup.sound = setup.sound_simple = TRUE;
       break;