X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame.c;h=89e0c110a1e0255bbd22f5d55040666ff66ea1ff;hp=1a204ba844a32892dfbe820aef484ab388aef870;hb=0d214d4e314f6f42df24be140bb433e980319767;hpb=ac4a42adeff6a373443318fca499eb8c9424fd5d

diff --git a/src/game.c b/src/game.c
index 1a204ba8..89e0c110 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1619,7 +1619,6 @@ void GetPlayerConfig()
   setup.sound = (setup.sound_simple || setup.sound_loops || setup.sound_music);
 
   SetAudioMode(setup.sound);
-  InitJoysticks();
 }
 
 int GetElementFromGroupElement(int element)
@@ -4461,7 +4460,8 @@ void GameEnd()
     SaveLevelSetup_SeriesInfo();
   }
 
-  if (level_nr < leveldir_current->last_level)
+  if (setup.increment_levels &&
+      level_nr < leveldir_current->last_level)
     raise_level = TRUE;			/* advance to next level */
 
   if ((hi_pos = NewHiScore()) >= 0) 
@@ -4494,6 +4494,7 @@ int NewHiScore()
 {
   int k, l;
   int position = -1;
+  boolean one_score_entry_per_name = !program.many_scores_per_name;
 
   LoadScore(level_nr);
 
@@ -4511,13 +4512,15 @@ int NewHiScore()
       {
 	int m = MAX_SCORE_ENTRIES - 1;
 
-#ifdef ONE_PER_NAME
-	for (l = k; l < MAX_SCORE_ENTRIES; l++)
-	  if (strEqual(setup.player_name, highscore[l].Name))
-	    m = l;
-	if (m == k)	/* player's new highscore overwrites his old one */
-	  goto put_into_list;
-#endif
+	if (one_score_entry_per_name)
+	{
+	  for (l = k; l < MAX_SCORE_ENTRIES; l++)
+	    if (strEqual(setup.player_name, highscore[l].Name))
+	      m = l;
+
+	  if (m == k)	/* player's new highscore overwrites his old one */
+	    goto put_into_list;
+	}
 
 	for (l = m; l > k; l--)
 	{
@@ -4526,22 +4529,19 @@ int NewHiScore()
 	}
       }
 
-#ifdef ONE_PER_NAME
       put_into_list:
-#endif
+
       strncpy(highscore[k].Name, setup.player_name, MAX_PLAYER_NAME_LEN);
       highscore[k].Name[MAX_PLAYER_NAME_LEN] = '\0';
       highscore[k].Score = local_player->score_final; 
       position = k;
+
       break;
     }
-
-#ifdef ONE_PER_NAME
-    else if (!strncmp(setup.player_name, highscore[k].Name,
+    else if (one_score_entry_per_name &&
+	     !strncmp(setup.player_name, highscore[k].Name,
 		      MAX_PLAYER_NAME_LEN))
       break;	/* player already there with a higher score */
-#endif
-
   }
 
   if (position >= 0)