[Edu2-commits] SF.net SVN: edu2: [447] edu2

[<bl...@us...>]

Revision: 447
          http://edu2.svn.sourceforge.net/edu2/?rev=447&view=rev
Author:   blackhc
Date:     2008-03-01 12:12:29 -0800 (Sat, 01 Mar 2008)

Log Message:
-----------
Disable the update notification for Nexuiz (tehee).
edu2-launcher.bat passes parameters on now.
Fix gecko_navigateex a bit.

Modified Paths:
--------------
    edu2/_edu2_start.bat
    edu2/edu2/csprogs.dat
    edu2/edu2/csprogs.lno
    edu2/edu2/menu.dat
    edu2/edu2/menu.lno
    edu2/edu2-launcher.bat
    edu2/id1/qcsrc/common/gecko_navigateex.qc
    edu2/id1/qcsrc/menu/nexuiz/util.qc

Modified: edu2/_edu2_start.bat
===================================================================
--- edu2/_edu2_start.bat	2008-03-01 15:41:47 UTC (rev 446)
+++ edu2/_edu2_start.bat	2008-03-01 20:12:29 UTC (rev 447)
@@ -1,6 +1,6 @@
+@echo off
 :eduloop
-@del edu2\da
-ta\edu1launch.txt
+@del edu2\data\edu1launch.txt
 @call _start-edu2 %*
 
 @if exist edu2\data\edu1launch.txt goto :launchedu1

Modified: edu2/edu2/csprogs.dat
===================================================================
(Binary files differ)

Modified: edu2/edu2/csprogs.lno
===================================================================
(Binary files differ)

Modified: edu2/edu2/menu.dat
===================================================================
(Binary files differ)

Modified: edu2/edu2/menu.lno
===================================================================
(Binary files differ)

Modified: edu2/edu2-launcher.bat
===================================================================
--- edu2/edu2-launcher.bat	2008-03-01 15:41:47 UTC (rev 446)
+++ edu2/edu2-launcher.bat	2008-03-01 20:12:29 UTC (rev 447)
@@ -16,13 +16,13 @@
 @goto :eof
 
 :localclients
-@call _edu2_start +set edu1params "map $edu1map"
+@call _edu2_start +set edu1params "map $edu1map" %*
 @goto :eof
 
 :localservers
 @call :dedicatedservers
 
-@_edu2_start +set edu1params "connect 127.0.0.1:26666" +set edu2logincommands "connect 127.0.0.1"
+@_edu2_start +set edu1params "connect 127.0.0.1:26666" +set edu2logincommands "connect 127.0.0.1" %*
 @goto :eof
 
 :dedicatedservers
@@ -43,6 +43,6 @@
 @set SERVERIP
 @echo.
 
-@_edu2_start +set edu1params "connect %SERVERIP%:26666" +set edu2logincommands "connect %SERVERIP%"
+@_edu2_start +set edu1params "connect %SERVERIP%:26666" +set edu2logincommands "connect %SERVERIP%" %*
 @goto :eof
 

Modified: edu2/id1/qcsrc/common/gecko_navigateex.qc
===================================================================
--- edu2/id1/qcsrc/common/gecko_navigateex.qc	2008-03-01 15:41:47 UTC (rev 446)
+++ edu2/id1/qcsrc/common/gecko_navigateex.qc	2008-03-01 20:12:29 UTC (rev 447)
@@ -11,8 +11,10 @@
 	string lURI;
 	lURI = URL;
 	if( lOfflinePath != "" ) {
-		lOfflinePath = strreplace( "/", "\\", lOfflinePath );
-		lURI = strreplace( strcat( "file:///", lOfflinePath ), "http:/", lURI ); // only one / because the other one is used as dir separator
+		lOfflinePath = strreplace( "\\", "/", lOfflinePath );
+		lURI = strreplace( "http:/", strcat( "file:///", lOfflinePath ), lURI ); // only one / because the other one is used as dir separator
+		lURI = strcat( lURI, "/index.html" );
 	}
+	print( "NavigateEx to ", lURI, "\n" );
 	gecko_navigate( instanceName, lURI );
 }

Modified: edu2/id1/qcsrc/menu/nexuiz/util.qc
===================================================================
--- edu2/id1/qcsrc/menu/nexuiz/util.qc	2008-03-01 15:41:47 UTC (rev 446)
+++ edu2/id1/qcsrc/menu/nexuiz/util.qc	2008-03-01 20:12:29 UTC (rev 447)
@@ -215,6 +215,7 @@
 }
 void preMenuDraw()
 {
+	return;
 	vector fs, sz, line, mid;
 	Item_Nex_ExtResponseSystem_CheckForResponse();
 	if(!_Nex_ExtResponseSystem_VersionHandled)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.