[Jake2-commits] jake2/src/jake2/server SV_INIT.java,1.14,1.15

[Rene S. <sa...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11196/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.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** SV_INIT.java	3 Dec 2005 19:46:41 -0000	1.14
--- SV_INIT.java	4 Dec 2005 23:35:20 -0000	1.15
***************
*** 438,445 ****
              Cvar.Set("nextserver", "");
          }
  
          //ZOID special hack for end game screen in coop mode
          if (Cvar.VariableValue("coop") != 0 && level.equals("victory.pcx"))
!             Cvar.Set("nextserver", "gamemap \"*base1\"");
  
          // if there is a $, use the remainder as a spawnpoint
--- 438,455 ----
              Cvar.Set("nextserver", "");
          }
+         
+         // 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