Update of /cvsroot/jake2/jake2/src/jake2/game
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4061/src/jake2/game
Modified Files:
GameBase.java
Log Message:
bugfix in end dm level when choosing next map from sv_maplist
Index: GameBase.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameBase.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** GameBase.java 16 Nov 2005 22:24:52 -0000 1.11
--- GameBase.java 16 Dec 2005 21:15:50 -0000 1.12
***************
*** 504,531 ****
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) {
// it's in the list, go to the next one
! t = tk.nextToken();
! if (t == null) { // end of list, go to first one
if (f == null) // there isn't a first one, same level
! PlayerHud
! .BeginIntermission(CreateTargetChangeLevel(level.mapname));
else
! PlayerHud
! .BeginIntermission(CreateTargetChangeLevel(f));
} else
! PlayerHud.BeginIntermission(CreateTargetChangeLevel(t));
return;
}
- if (f == null)
- f = t;
- t = tk.nextToken();
}
-
}
if (level.nextmap.length() > 0) // go to a specific map
PlayerHud.BeginIntermission(CreateTargetChangeLevel(level.nextmap));
--- 504,531 ----
f = null;
StringTokenizer tk = new StringTokenizer(s, seps);
!
! 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
! 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));
else
! PlayerHud.BeginIntermission(CreateTargetChangeLevel(f));
} else
! PlayerHud.BeginIntermission(CreateTargetChangeLevel(tk.nextToken()));
return;
}
}
}
+ //not in the map list
if (level.nextmap.length() > 0) // go to a specific map
PlayerHud.BeginIntermission(CreateTargetChangeLevel(level.nextmap));
***************
*** 536,541 ****
// changelevel,
// so create a fake ent that goes back to the same level
! PlayerHud
! .BeginIntermission(CreateTargetChangeLevel(level.mapname));
return;
}
--- 536,540 ----
// changelevel,
// so create a fake ent that goes back to the same level
! PlayerHud.BeginIntermission(CreateTargetChangeLevel(level.mapname));
return;
}
|
