Update of /cvsroot/jake2/jake2/src/jake2/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24013/src/jake2/server
Modified Files:
SV_INIT.java
Log Message:
fixed bug with ending server in coop mode (always tried to load base1)
Index: SV_INIT.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_INIT.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** SV_INIT.java 4 Dec 2005 23:35:20 -0000 1.15
--- SV_INIT.java 5 Dec 2005 00:11:47 -0000 1.16
***************
*** 392,395 ****
--- 392,397 ----
}
+ private static String firstmap = "";
+
/*
* ====================== SV_Map
***************
*** 432,437 ****
int c = level.indexOf('+');
if (c != -1) {
! Cvar.Set("nextserver", "gamemap \"" + level.substring(c + 1)
! + "\"");
level = level.substring(0, c);
} else {
--- 434,438 ----
int c = level.indexOf('+');
if (c != -1) {
! Cvar.Set("nextserver", "gamemap \"" + level.substring(c + 1) + "\"");
level = level.substring(0, c);
} else {
***************
*** 439,455 ****
}
! // rst: base1 works for full, damo1 works for demo, so we need to check the
! // dedicated_start variable
! String nextlevel = "base1";
! String dedicated_start = Cvar.VariableString("dedicated_start");
!
! String tmp[] = dedicated_start.split(" ");
!
! if (tmp.length == 2)
! nextlevel = tmp[1];
//ZOID special hack for end game screen in coop mode
if (Cvar.VariableValue("coop") != 0 && level.equals("victory.pcx"))
! Cvar.Set("nextserver", "gamemap \"*" + nextlevel + "\"");
// if there is a $, use the remainder as a spawnpoint
--- 440,456 ----
}
! // rst: base1 works for full, damo1 works for demo, so we need to store first map.
! if (firstmap.length() == 0)
! {
! if (!levelstring.endsWith(".cin") && !levelstring.endsWith(".pcx") && !levelstring.endsWith(".dm2"))
! {
! int pos = levelstring.indexOf('+');
! firstmap = levelstring.substring(pos + 1);
! }
! }
//ZOID special hack for end game screen in coop mode
if (Cvar.VariableValue("coop") != 0 && level.equals("victory.pcx"))
! Cvar.Set("nextserver", "gamemap \"*" + firstmap + "\"");
// if there is a $, use the remainder as a spawnpoint
|
