Menu
▾
▴
[Edu2-commits] SF.net SVN: edu2: [442] edu2
|
From: <bl...@us...> - 2008-02-28 03:08:20
|
Revision: 442
http://edu2.svn.sourceforge.net/edu2/?rev=442&view=rev
Author: blackhc
Date: 2008-02-27 19:08:18 -0800 (Wed, 27 Feb 2008)
Log Message:
-----------
Edu2 now launches Edu1 (passing edu1params as parameters).
Add a batch file to start an edu1 dedicated server.
Modified Paths:
--------------
edu2/edu1/quake.rc
edu2/edu2/csprogs.dat
edu2/edu2/csprogs.lno
edu2/edu2/menu.dat
edu2/edu2/menu.lno
edu2/edu2/progs.dat
edu2/edu2/progs.lno
edu2/edu2/quake.rc
edu2/edu2_start.exe
edu2/id1/qcsrc/common/player.qc
edu2/id1/qcsrc/common/player.qh
edu2/id1/qcsrc/common/playermodel.qc
edu2/id1/qcsrc/common/util.qh
edu2/id1/qcsrc/menu/edu2/gamelist.c
Added Paths:
-----------
edu2/start-edu1-server.bat
Modified: edu2/edu1/quake.rc
===================================================================
--- edu2/edu1/quake.rc 2008-02-28 00:31:03 UTC (rev 441)
+++ edu2/edu1/quake.rc 2008-02-28 03:08:18 UTC (rev 442)
@@ -1,3 +1,4 @@
+maxplayers 10
exec default.cfg
exec config.cfg
exec autoexec.cfg
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/progs.dat
===================================================================
(Binary files differ)
Modified: edu2/edu2/progs.lno
===================================================================
(Binary files differ)
Modified: edu2/edu2/quake.rc
===================================================================
--- edu2/edu2/quake.rc 2008-02-28 00:31:03 UTC (rev 441)
+++ edu2/edu2/quake.rc 2008-02-28 03:08:18 UTC (rev 442)
@@ -1,4 +1,8 @@
-set edu2map abg_licht2
+set edu2map test
+set edu1params ""
+set edu2logincommands ""
+// set maxplayers here
+maxplayers 64
exec default.cfg
exec config.cfg
@@ -19,7 +23,9 @@
loadfont menu gfx/vera-sans
loadfont user0 gfx/font_user0
-// use +set edu2logincommands to set what to do after login
+// use +set edu2logincommands to set what to do after login
+// edu1 port 26666
+// +set edu1params (\n seperated list of params to pass to edu1)
// precache the map
map $edu2map
disconnect
Modified: edu2/edu2_start.exe
===================================================================
(Binary files differ)
Modified: edu2/id1/qcsrc/common/player.qc
===================================================================
--- edu2/id1/qcsrc/common/player.qc 2008-02-28 00:31:03 UTC (rev 441)
+++ edu2/id1/qcsrc/common/player.qc 2008-02-28 03:08:18 UTC (rev 442)
@@ -2,8 +2,6 @@
const float PLAYERUPD_NEWMODEL = 2;
const float PLAYERUPD_CLIENTNUM = 4;
-.float clientNum;
-
#ifdef CLIENT
// TODO: instead of requiring the sqc to send so many coords optimize it to send just some flags, maybe? And only send the angles that are necessary
// and use input_angles for the local player?
@@ -201,7 +199,7 @@
if (self.playermodel != viewer.(playermodelCache[self.clientNum]))
{
playerFlags |= PLAYERUPD_NEWMODEL;
- //print( "new model!\n" );
+ //print( "Viewer: ", ftos( viewer.clientNum ), " Other: ", ftos( viewer.clientNum ), " - new model!\n" );
}
WriteByte( MSG_ENTITY, ET_PLAYER );
Modified: edu2/id1/qcsrc/common/player.qh
===================================================================
--- edu2/id1/qcsrc/common/player.qh 2008-02-28 00:31:03 UTC (rev 441)
+++ edu2/id1/qcsrc/common/player.qh 2008-02-28 03:08:18 UTC (rev 442)
@@ -1,6 +1,8 @@
// Enable for clientside player models
#define CLIENTSIDE_PLAYERMODELS
+.float clientNum;
+
#ifdef CLIENT
.vector v_angle;
Modified: edu2/id1/qcsrc/common/playermodel.qc
===================================================================
--- edu2/id1/qcsrc/common/playermodel.qc 2008-02-28 00:31:03 UTC (rev 441)
+++ edu2/id1/qcsrc/common/playermodel.qc 2008-02-28 03:08:18 UTC (rev 442)
@@ -26,7 +26,7 @@
void PlayerModel_SetModel (entity player, string legsModel, float legsSkin, string torsoModel, float torsoSkin, string headModel, float headSkin)
{
local string fullname;
-
+
fullname = PlayerModel_GetSubModelPath( legsModel, PM_LEGS );
precache_model(fullname);
setmodel(player.legs, fullname);
Modified: edu2/id1/qcsrc/common/util.qh
===================================================================
--- edu2/id1/qcsrc/common/util.qh 2008-02-28 00:31:03 UTC (rev 441)
+++ edu2/id1/qcsrc/common/util.qh 2008-02-28 03:08:18 UTC (rev 442)
@@ -49,6 +49,9 @@
float buf_load(string filename);
void buf_save(float buf, string filename);
+string str_load(string filename);
+void str_save(string lContent, string pFilename);
+
// modulo function
#ifndef MENUQC
float mod(float a, float b) { return a - (floor(a / b) * b); }
Modified: edu2/id1/qcsrc/menu/edu2/gamelist.c
===================================================================
--- edu2/id1/qcsrc/menu/edu2/gamelist.c 2008-02-28 00:31:03 UTC (rev 441)
+++ edu2/id1/qcsrc/menu/edu2/gamelist.c 2008-02-28 03:08:18 UTC (rev 442)
@@ -56,9 +56,9 @@
};
void( entity button ) Edu1_Start = {
- entity lDialog;
- lDialog = findstring( NULL, name, "LoginDialog" );
- DialogOpenButton_Click( button, lDialog );
+ registercvar( "edu1params", "", 0 );
+ str_save( strcat( cvar_string( "edu1params" ), "\n" ), "edu1launch.txt" );
+ localcmd( "quit\n" );
};
void( entity button ) DummyGame_Start = {
Added: edu2/start-edu1-server.bat
===================================================================
--- edu2/start-edu1-server.bat (rev 0)
+++ edu2/start-edu1-server.bat 2008-02-28 03:08:18 UTC (rev 442)
@@ -0,0 +1 @@
+@edu1-dedicated.exe -game edu1 -port 26666 +set sv_public 1 +map level1
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
