bugfix in end dm level when choosing next map from sv_maplist

1 files changed, 17 insertions, 18 deletions

diff --git a/src/jake2/game/GameBase.java b/src/jake2/game/GameBase.java
index d179952..b711f6e 100644
--- a/src/jake2/game/GameBase.java
+++ b/src/jake2/game/GameBase.java
@@ -20,7 +20,7 @@
 
 // Created on 30.11.2003 by RST.
 
-// $Id: GameBase.java,v 1.11 2005-11-16 22:24:52 salomo Exp $
+// $Id: GameBase.java,v 1.12 2005-12-16 21:15:50 salomo Exp $
 
 /** Father of all GameObjects. */
 
@@ -503,30 +503,30 @@ public class GameBase {
             s = sv_maplist.string;
             f = null;
             StringTokenizer tk = new StringTokenizer(s, seps);
-            t = tk.nextToken();
-            //t = strtok(s, seps);
-            while (t != null) {
-                if (Lib.Q_stricmp(t, level.mapname) == 0) {
+            
+            while (tk.hasMoreTokens()){
+            	t = tk.nextToken();
+     
+            	// store first map
+            	if (f == null)
+            		f = t;
+            	
+                if (t.equalsIgnoreCase(level.mapname)) {
                     // it's in the list, go to the next one
-                    t = tk.nextToken();
-                    if (t == null) { // end of list, go to first one
+                	if (!tk.hasMoreTokens()) {
+                		// end of list, go to first one
                         if (f == null) // there isn't a first one, same level
-                            PlayerHud
-                                    .BeginIntermission(CreateTargetChangeLevel(level.mapname));
+                            PlayerHud.BeginIntermission(CreateTargetChangeLevel(level.mapname));
                         else
-                            PlayerHud
-                                    .BeginIntermission(CreateTargetChangeLevel(f));
+                            PlayerHud.BeginIntermission(CreateTargetChangeLevel(f));
                     } else
-                        PlayerHud.BeginIntermission(CreateTargetChangeLevel(t));
+                        PlayerHud.BeginIntermission(CreateTargetChangeLevel(tk.nextToken()));
                     return;
                 }
-                if (f == null)
-                    f = t;
-                t = tk.nextToken();
             }
-
         }
 
+        //not in the map list
         if (level.nextmap.length() > 0) // go to a specific map
             PlayerHud.BeginIntermission(CreateTargetChangeLevel(level.nextmap));
         else { // search for a changelevel
@@ -535,8 +535,7 @@ public class GameBase {
             if (edit == null) { // the map designer didn't include a
                                 // changelevel,
                 // so create a fake ent that goes back to the same level
-                PlayerHud
-                        .BeginIntermission(CreateTargetChangeLevel(level.mapname));
+                PlayerHud.BeginIntermission(CreateTargetChangeLevel(level.mapname));
                 return;
             }
             ent = edit.o;