removed 'inline' keyword (compilers are better at this today)

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index a2eb577274022efd06fddff2b8bc749fa514623d..b53a039c5cab5ecd04b70390a14ce8d61b151054 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -177,7 +177,7 @@ void InitGadgets(void)
   gadgets_initialized = TRUE;
 }
 
-inline static void InitElementSmallImagesScaledUp(int graphic)
+static void InitElementSmallImagesScaledUp(int graphic)
 {
   struct GraphicInfo *g = &graphic_info[graphic];
 
@@ -240,7 +240,7 @@ static void InitElementSmallImages(void)
   print_timestamp_done("InitElementSmallImages");
 }
 
-inline static void InitScaledImagesScaledUp(int graphic)
+static void InitScaledImagesScaledUp(int graphic)
 {
   struct GraphicInfo *g = &graphic_info[graphic];
 
@@ -5113,6 +5113,7 @@ static void InitGameInfo(void)
 {
   game.restart_level = FALSE;
   game.restart_game_message = NULL;
+  game.request_active = FALSE;
 }
 
 static void InitPlayerInfo(void)
@@ -5684,7 +5685,8 @@ void InitNetworkServer(void)
   }
 
   /* short time to recognize result of network initialization */
-  Delay_WithScreenUpdates(1000);
+  if (game_status == GAME_MODE_LOADING)
+    Delay_WithScreenUpdates(1000);
 }
 
 static boolean CheckArtworkConfigForCustomElements(char *filename)