X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=210594fcded4aa7e712a7f48680c0fbeb248c822;hb=8ab1a8040e3d3615ac2f6656f38fef8a809364a8;hp=d126103a47d662fa6b7c4ece63852b4aa142632d;hpb=a99a1803e5097bc598b4c6f73259715da148ab27;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index d126103a..210594fc 100644
--- a/src/init.c
+++ b/src/init.c
@@ -333,6 +333,8 @@ static int getFontBitmapID(int font_nr)
     special = game_status;
   else if (game_status == GAME_MODE_PSEUDO_TYPENAME)
     special = GFX_SPECIAL_ARG_MAIN;
+  else if (game_status == GAME_MODE_PSEUDO_TYPENAMES)
+    special = GFX_SPECIAL_ARG_NAMES;
 
   if (special != -1)
     return font_info[font_nr].special_bitmap_id[special];
@@ -1655,7 +1657,7 @@ static void set_cloned_graphic_parameters(int graphic)
     Warn("custom graphic rejected for this element/action");
 
     if (graphic == fallback_graphic)
-      Error(ERR_EXIT, "no fallback graphic available");
+      Fail("no fallback graphic available");
 
     Warn("fallback done to 'char_exclam' for this graphic");
     Warn("---");
@@ -1695,6 +1697,7 @@ static void InitGraphicInfo(void)
     IMG_BACKGROUND_TITLE_INITIAL,
     IMG_BACKGROUND_TITLE,
     IMG_BACKGROUND_MAIN,
+    IMG_BACKGROUND_NAMES,
     IMG_BACKGROUND_LEVELS,
     IMG_BACKGROUND_LEVELNR,
     IMG_BACKGROUND_SCORES,
@@ -1808,7 +1811,7 @@ static void InitGraphicInfo(void)
       Warn("custom graphic rejected for this element/action");
 
       if (i == fallback_graphic)
-	Error(ERR_EXIT, "no fallback graphic available");
+	Fail("no fallback graphic available");
 
       Warn("fallback done to 'char_exclam' for this graphic");
       Warn("---");
@@ -1839,7 +1842,7 @@ static void InitGraphicInfo(void)
       Warn("custom graphic rejected for this element/action");
 
       if (i == fallback_graphic)
-	Error(ERR_EXIT, "no fallback graphic available");
+	Fail("no fallback graphic available");
 
       Warn("fallback done to 'char_exclam' for this graphic");
       Warn("---");
@@ -4782,7 +4785,7 @@ static void InitGlobal(void)
   {
     // check if element_name_info entry defined for each element in "main.h"
     if (i < MAX_NUM_ELEMENTS && element_name_info[i].token_name == NULL)
-      Error(ERR_EXIT, "undefined 'element_name_info' entry for element %d", i);
+      Fail("undefined 'element_name_info' entry for element %d", i);
 
     element_info[i].token_name = element_name_info[i].token_name;
     element_info[i].class_name = element_name_info[i].class_name;
@@ -4794,7 +4797,7 @@ static void InitGlobal(void)
     // check if global_anim_name_info defined for each entry in "main.h"
     if (i < NUM_GLOBAL_ANIM_TOKENS &&
 	global_anim_name_info[i].token_name == NULL)
-      Error(ERR_EXIT, "undefined 'global_anim_name_info' entry for anim %d", i);
+      Fail("undefined 'global_anim_name_info' entry for anim %d", i);
 
     global_anim_info[i].token_name = global_anim_name_info[i].token_name;
   }
@@ -4909,6 +4912,8 @@ static void InitGlobal(void)
   global.anim_status = global.anim_status_next = GAME_MODE_LOADING;
 
   global.use_envelope_request = FALSE;
+
+  global.user_names = NULL;
 }
 
 static void Execute_Command(char *command)
@@ -5011,7 +5016,7 @@ static void Execute_Command(char *command)
     char *filename = &command[11];
 
     if (!fileExists(filename))
-      Error(ERR_EXIT, "cannot open file '%s'", filename);
+      Fail("cannot open file '%s'", filename);
 
     LoadLevelFromFilename(&level, filename);
     DumpLevel(&level);
@@ -5023,7 +5028,7 @@ static void Execute_Command(char *command)
     char *filename = &command[10];
 
     if (!fileExists(filename))
-      Error(ERR_EXIT, "cannot open file '%s'", filename);
+      Fail("cannot open file '%s'", filename);
 
     LoadTapeFromFilename(filename);
     DumpTape(&tape);
@@ -5090,7 +5095,7 @@ static void Execute_Command(char *command)
       str_ptr++;
 
     if (*str_ptr == '\0')
-      Error(ERR_EXIT, "cannot find MODE in command '%s'", command);
+      Fail("cannot find MODE in command '%s'", command);
 
     global.patchtapes_mode = str_ptr;		// store patch mode
 
@@ -5135,7 +5140,7 @@ static void Execute_Command(char *command)
       if (strEqual(global.patchtapes_mode, "help"))
 	global.patchtapes_leveldir = UNDEFINED_LEVELSET;
       else
-	Error(ERR_EXIT, "cannot find LEVELDIR in command '%s'", command);
+	Fail("cannot find LEVELDIR in command '%s'", command);
     }
 
     program.headless = TRUE;
@@ -5161,8 +5166,8 @@ static void Execute_Command(char *command)
     global.create_images_dir = getStringCopy(&command[14]);
 
     if (access(global.create_images_dir, W_OK) != 0)
-      Error(ERR_EXIT, "image target directory '%s' not found or not writable",
-	    global.create_images_dir);
+      Fail("image target directory '%s' not found or not writable",
+	   global.create_images_dir);
   }
   else if (strPrefix(command, "create CE image "))
   {
@@ -5172,7 +5177,7 @@ static void Execute_Command(char *command)
   }
   else
   {
-    Error(ERR_EXIT_HELP, "unrecognized command '%s'", command);
+    FailWithHelp("unrecognized command '%s'", command);
   }
 
   // disable networking if any valid command was recognized
@@ -5181,6 +5186,9 @@ static void Execute_Command(char *command)
 
 static void InitSetup(void)
 {
+  LoadUserNames();				// global user names
+  LoadUserSetup();				// global user number
+
   LoadSetup();					// global setup info
   LoadSetup_AutoSetup();			// global auto setup info
 
@@ -5197,7 +5205,9 @@ static void InitGameInfo(void)
 {
   game.restart_level = FALSE;
   game.restart_game_message = NULL;
+
   game.request_active = FALSE;
+  game.request_active_or_moving = FALSE;
 }
 
 static void InitPlayerInfo(void)
@@ -5463,7 +5473,7 @@ static void InitGfx(void)
   }
 
   if (filename_font_initial == NULL)	// should not happen
-    Error(ERR_EXIT, "cannot get filename for '%s'", CONFIG_TOKEN_FONT_INITIAL);
+    Fail("cannot get filename for '%s'", CONFIG_TOKEN_FONT_INITIAL);
 
   InitGfxBuffers();
   InitGfxCustomArtworkInfo();
@@ -5549,7 +5559,7 @@ static void InitGfx(void)
   }
 
   if (filename_anim_initial == NULL)	// should not happen
-    Error(ERR_EXIT, "cannot get filename for '%s'", CONFIG_TOKEN_GLOBAL_BUSY);
+    Fail("cannot get filename for '%s'", CONFIG_TOKEN_GLOBAL_BUSY);
 
   anim_initial.bitmaps =
     checked_calloc(sizeof(Bitmap *) * NUM_IMG_BITMAP_POINTERS);
@@ -5901,7 +5911,8 @@ static void InitOverrideArtwork(void)
 
 static char *getNewArtworkIdentifier(int type)
 {
-  static char *leveldir_current_identifier[3] = { NULL, NULL, NULL };
+  static char *last_leveldir_identifier[3] = { NULL, NULL, NULL };
+  static char *last_artwork_identifier[3] = { NULL, NULL, NULL };
   static boolean last_override_level_artwork[3] = { FALSE, FALSE, FALSE };
   static boolean last_has_level_artwork_set[3] = { FALSE, FALSE, FALSE };
   static boolean initialized[3] = { FALSE, FALSE, FALSE };
@@ -5936,16 +5947,15 @@ static char *getNewArtworkIdentifier(int type)
   else
     artwork_current_identifier = setup_artwork_set;
 
-
   /* 2nd step: check if it is really needed to reload artwork set
      ------------------------------------------------------------ */
 
   // ---------- reload if level set and also artwork set has changed ----------
-  if (leveldir_current_identifier[type] != leveldir_identifier &&
+  if (last_leveldir_identifier[type] != leveldir_identifier &&
       (last_has_level_artwork_set[type] || has_level_artwork_set))
     artwork_new_identifier = artwork_current_identifier;
 
-  leveldir_current_identifier[type] = leveldir_identifier;
+  last_leveldir_identifier[type] = leveldir_identifier;
   last_has_level_artwork_set[type] = has_level_artwork_set;
 
   // ---------- reload if "override artwork" setting has changed --------------
@@ -5955,11 +5965,13 @@ static char *getNewArtworkIdentifier(int type)
   last_override_level_artwork[type] = setup_override_artwork;
 
   // ---------- reload if current artwork identifier has changed --------------
-  if (!strEqual(ARTWORK_CURRENT_IDENTIFIER(artwork, type),
-		artwork_current_identifier))
+  if (!strEqual(last_artwork_identifier[type], artwork_current_identifier))
     artwork_new_identifier = artwork_current_identifier;
 
-  *(ARTWORK_CURRENT_IDENTIFIER_PTR(artwork, type))= artwork_current_identifier;
+  // (we cannot compare string pointers here, so copy string content itself)
+  setString(&last_artwork_identifier[type], artwork_current_identifier);
+
+  *(ARTWORK_CURRENT_IDENTIFIER_PTR(artwork, type)) = artwork_current_identifier;
 
   // ---------- do not reload directly after starting -------------------------
   if (!initialized[type])
@@ -5983,8 +5995,8 @@ void ReloadCustomArtwork(int force_reload)
 
   InitOverrideArtwork();
 
-  force_reload_gfx |= AdjustGraphicsForEMC();
-  force_reload_snd |= AdjustSoundsForEMC();
+  AdjustGraphicsForEMC();
+  AdjustSoundsForEMC();
 
   gfx_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_GRAPHICS);
   snd_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_SOUNDS);
@@ -6302,8 +6314,8 @@ void CloseAllAndExit(int exit_value)
   // using SDL_WaitThread()
   //
   // Code used with SDL 1.2:
-  // if (network_server)	// terminate network server
-  //   SDL_KillThread(server_thread);
+  // if (network.server_thread)	// terminate network server
+  //   SDL_KillThread(network.server_thread);
 
   CloseVideoDisplay();
   ClosePlatformDependentStuff();