Menu
▾
▴
jake2-commits — Jake2 cvs commits
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(52) |
Aug
(34) |
Sep
(99) |
Oct
(110) |
Nov
(21) |
Dec
(69) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(117) |
Feb
(90) |
Mar
(1) |
Apr
(22) |
May
(96) |
Jun
(25) |
Jul
(22) |
Aug
|
Sep
|
Oct
(18) |
Nov
(43) |
Dec
(71) |
| 2006 |
Jan
(20) |
Feb
(10) |
Mar
|
Apr
(4) |
May
(2) |
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
(60) |
Nov
(63) |
Dec
(35) |
| 2007 |
Jan
(18) |
Feb
(40) |
Mar
(14) |
Apr
(18) |
May
(33) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
(1) |
Mar
(25) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(5) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(15) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Carsten W. <ca...@us...> - 2005-02-07 17:39:08
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5494/src/jake2/client Modified Files: SCR.java Log Message: intialize the cvar_t fps with a valid instance (dedicated mode) Index: SCR.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/SCR.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** SCR.java 23 Jan 2005 20:04:06 -0000 1.12 --- SCR.java 7 Feb 2005 17:38:57 -0000 1.13 *************** *** 96,100 **** static cvar_t scr_drawall; ! public static cvar_t fps; static dirty_t scr_dirty = new dirty_t(); --- 96,100 ---- static cvar_t scr_drawall; ! public static cvar_t fps = new cvar_t(); static dirty_t scr_dirty = new dirty_t(); |
|
From: Carsten W. <ca...@us...> - 2005-02-07 17:23:59
|
Update of /cvsroot/jake2/jake2/src/jake2/sound In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2579/src/jake2/sound Modified Files: S.java Log Message: solves the "dedicated mode" problem. Index: S.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sound/S.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** S.java 6 Feb 2005 19:19:03 -0000 1.9 --- S.java 7 Feb 2005 17:23:50 -0000 1.10 *************** *** 47,53 **** try { Class.forName("jake2.sound.DummyDriver"); } catch (Throwable e) { Com.DPrintf("could not init dummy sound driver class."); - // ignore the lwjgl driver if runtime not in classpath } --- 47,55 ---- try { Class.forName("jake2.sound.DummyDriver"); + // initialize impl with the default value + // this is necessary for dedicated mode + useDriver("dummy"); } catch (Throwable e) { Com.DPrintf("could not init dummy sound driver class."); } |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:28:26
|
Update of /cvsroot/jake2/jake2/src/jake2/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24275/src/jake2/server Modified Files: SV_USER.java Log Message: cosmetic Index: SV_USER.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_USER.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SV_USER.java 6 Dec 2004 14:23:04 -0000 1.7 --- SV_USER.java 6 Feb 2005 19:28:16 -0000 1.8 *************** *** 166,176 **** // send the serverdata ! MSG ! .WriteByte(SV_MAIN.sv_client.netchan.message, Defines.svc_serverdata); MSG.WriteInt(SV_MAIN.sv_client.netchan.message, Defines.PROTOCOL_VERSION); ! MSG ! .WriteLong(SV_MAIN.sv_client.netchan.message, SV_INIT.svs.spawncount); MSG.WriteByte(SV_MAIN.sv_client.netchan.message, --- 166,175 ---- // send the serverdata ! MSG.WriteByte(SV_MAIN.sv_client.netchan.message, Defines.svc_serverdata); MSG.WriteInt(SV_MAIN.sv_client.netchan.message, Defines.PROTOCOL_VERSION); ! ! MSG.WriteLong(SV_MAIN.sv_client.netchan.message, SV_INIT.svs.spawncount); MSG.WriteByte(SV_MAIN.sv_client.netchan.message, *************** *** 207,211 **** "cmd configstrings " + SV_INIT.svs.spawncount + " 0\n"); } ! } --- 206,210 ---- "cmd configstrings " + SV_INIT.svs.spawncount + " 0\n"); } ! } *************** *** 476,481 **** //ZOID, ss_pic can be nextserver'd in coop mode if (SV_INIT.sv.state == Defines.ss_game ! || (SV_INIT.sv.state == Defines.ss_pic && 0 == Cvar ! .VariableValue("coop"))) return; // can't nextserver while playing a normal game --- 475,480 ---- //ZOID, ss_pic can be nextserver'd in coop mode if (SV_INIT.sv.state == Defines.ss_game ! || (SV_INIT.sv.state == Defines.ss_pic && ! 0 == Cvar.VariableValue("coop"))) return; // can't nextserver while playing a normal game *************** *** 514,517 **** --- 513,518 ---- */ public static void SV_ExecuteUserCommand(String s) { + + Com.dprintln("SV_ExecuteUserCommand:" + s ); SV_USER.ucmd_t u = null; |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:27:33
|
Update of /cvsroot/jake2/jake2/src/jake2/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23895/src/jake2/server Modified Files: SV_INIT.java Log Message: coop game level switching bug. Index: SV_INIT.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_INIT.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** SV_INIT.java 6 Nov 2004 20:58:11 -0000 1.10 --- SV_INIT.java 6 Feb 2005 19:27:24 -0000 1.11 *************** *** 196,201 **** } ! svs.spawncount++; // any partially connected client will be ! // restarted sv.state = Defines.ss_dead; --- 196,201 ---- } ! // any partially connected client will be restarted ! svs.spawncount++; sv.state = Defines.ss_dead; *************** *** 204,208 **** // wipe the entire per-level structure - //memset(sv, 0, sizeof(sv)); sv = new server_t(); --- 204,207 ---- *************** *** 408,418 **** * map tram.cin+jail_e3 ====================== */ ! public static void SV_Map(boolean attractloop, String levelstring, ! boolean loadgame) { ! //char level[MAX_QPATH]; ! //char *ch; ! int l; ! //char spawnpoint[MAX_QPATH]; String level, ch, spawnpoint; --- 407,413 ---- * map tram.cin+jail_e3 ====================== */ ! public static void SV_Map(boolean attractloop, String levelstring, boolean loadgame) { + int l; String level, ch, spawnpoint; *************** *** 448,452 **** //ZOID special hack for end game screen in coop mode ! if (Cvar.VariableValue("coop") != 0 && !level.equals("victory.pcx")) Cvar.Set("nextserver", "gamemap \"*base1\""); --- 443,447 ---- //ZOID special hack for end game screen in coop mode ! if (Cvar.VariableValue("coop") != 0 && level.equals("victory.pcx")) Cvar.Set("nextserver", "gamemap \"*base1\""); |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:26:59
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23676/src/jake2/qcommon Modified Files: SZ.java Log Message: added debug info. SZ.write/print should not be used anymore. Index: SZ.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/SZ.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SZ.java 17 Jan 2005 23:05:57 -0000 1.4 --- SZ.java 6 Feb 2005 19:26:50 -0000 1.5 *************** *** 89,92 **** --- 89,93 ---- // public static void Print(sizebuf_t buf, String data) { + Com.dprintln("SZ.print():<" + data + ">" ); int length = data.length(); byte str[] = data.getBytes(); |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:26:21
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23491/src/jake2/qcommon Modified Files: Qcommon.java Log Message: debug print distinguishes now between client and server messages. Index: Qcommon.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Qcommon.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Qcommon.java 20 Dec 2004 13:20:31 -0000 1.13 --- Qcommon.java 6 Feb 2005 19:26:11 -0000 1.14 *************** *** 92,96 **** Globals.host_speeds= Cvar.Get("host_speeds", "0", 0); Globals.log_stats= Cvar.Get("log_stats", "0", 0); ! Globals.developer= Cvar.Get("developer", "0", 0); Globals.timescale= Cvar.Get("timescale", "0", 0); Globals.fixedtime= Cvar.Get("fixedtime", "0", 0); --- 92,96 ---- Globals.host_speeds= Cvar.Get("host_speeds", "0", 0); Globals.log_stats= Cvar.Get("log_stats", "0", 0); ! Globals.developer= Cvar.Get("developer", "0", CVAR_ARCHIVE); Globals.timescale= Cvar.Get("timescale", "0", 0); Globals.fixedtime= Cvar.Get("fixedtime", "0", 0); *************** *** 207,216 **** if (Globals.host_speeds.value != 0.0f) time_before= Sys.Milliseconds(); ! SV_MAIN.SV_Frame(msec); if (Globals.host_speeds.value != 0.0f) time_between= Sys.Milliseconds(); ! CL.Frame(msec); --- 207,218 ---- if (Globals.host_speeds.value != 0.0f) time_before= Sys.Milliseconds(); ! ! Com.debugContext = "SV:"; SV_MAIN.SV_Frame(msec); if (Globals.host_speeds.value != 0.0f) time_between= Sys.Milliseconds(); ! ! Com.debugContext = "CL:"; CL.Frame(msec); |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:26:03
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23403/src/jake2/qcommon Modified Files: Com.java Log Message: debug print distinguishes now between client and server messages. Index: Com.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Com.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Com.java 23 Jan 2005 20:04:02 -0000 1.10 --- Com.java 6 Feb 2005 19:25:55 -0000 1.11 *************** *** 44,47 **** --- 44,50 ---- { + static String debugContext = ""; + static String _debugContext = ""; + static int com_argc; static String[] com_argv= new String[Defines.MAX_NUM_ARGVS]; *************** *** 340,349 **** public static void DPrintf(String fmt) { DPrintf(fmt, null); } public static void Printf(String fmt) { ! Printf(fmt, null); } --- 343,359 ---- public static void DPrintf(String fmt) { + _debugContext = debugContext; DPrintf(fmt, null); + _debugContext = ""; + } + + public static void dprintln(String fmt) + { + DPrintf(_debugContext + fmt + "\n", null); } public static void Printf(String fmt) { ! Printf(_debugContext + fmt, null); } *************** *** 352,363 **** if (Globals.developer == null || Globals.developer.value == 0) return; // don't confuse non-developers with techie stuff... ! Printf(fmt, vargs); } public static void Printf(String fmt, Vargs vargs) { ! // TODO Com.Printf ist nur zum testen ! String msg= sprintf(fmt, vargs); if (rd_target != 0) --- 362,374 ---- if (Globals.developer == null || Globals.developer.value == 0) return; // don't confuse non-developers with techie stuff... ! _debugContext = debugContext; Printf(fmt, vargs); + _debugContext=""; } public static void Printf(String fmt, Vargs vargs) { ! // Com.Printf is for testing only. ! String msg= sprintf(_debugContext + fmt, vargs); if (rd_target != 0) *************** *** 425,429 **** public static void Println(String fmt) { ! Printf(fmt + "\n"); } --- 436,440 ---- public static void Println(String fmt) { ! Printf(_debugContext + fmt + "\n"); } |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:25:24
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23210/src/jake2/qcommon Modified Files: CM.java Log Message: cosmetic Index: CM.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/CM.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CM.java 21 Jan 2005 00:46:54 -0000 1.9 --- CM.java 6 Feb 2005 19:25:14 -0000 1.10 *************** *** 217,221 **** public static cmodel_t CM_LoadMap(String name, boolean clientload, int checksum[]) { ! Com.DPrintf("CM_LoadMap...\n"); byte buf[]; int i; --- 217,221 ---- public static cmodel_t CM_LoadMap(String name, boolean clientload, int checksum[]) { ! Com.DPrintf("CM_LoadMap(" + name + ")...\n"); byte buf[]; int i; *************** *** 280,284 **** // load into heap ! CMod_LoadSurfaces(header.lumps[Defines.LUMP_TEXINFO]); // ok. CMod_LoadLeafs(header.lumps[Defines.LUMP_LEAFS]); CMod_LoadLeafBrushes(header.lumps[Defines.LUMP_LEAFBRUSHES]); --- 280,284 ---- // load into heap ! CMod_LoadSurfaces(header.lumps[Defines.LUMP_TEXINFO]); // ok CMod_LoadLeafs(header.lumps[Defines.LUMP_LEAFS]); CMod_LoadLeafBrushes(header.lumps[Defines.LUMP_LEAFBRUSHES]); *************** *** 289,297 **** CMod_LoadNodes(header.lumps[Defines.LUMP_NODES]); ! CMod_LoadAreas(header.lumps[Defines.LUMP_AREAS]); ! CMod_LoadAreaPortals(header.lumps[Defines.LUMP_AREAPORTALS]); CMod_LoadVisibility(header.lumps[Defines.LUMP_VISIBILITY]); CMod_LoadEntityString(header.lumps[Defines.LUMP_ENTITIES]); ! FS.FreeFile(buf); --- 289,297 ---- CMod_LoadNodes(header.lumps[Defines.LUMP_NODES]); ! CMod_LoadAreas(header.lumps[Defines.LUMP_AREAS]); ! CMod_LoadAreaPortals(header.lumps[Defines.LUMP_AREAPORTALS]); CMod_LoadVisibility(header.lumps[Defines.LUMP_VISIBILITY]); CMod_LoadEntityString(header.lumps[Defines.LUMP_ENTITIES]); ! FS.FreeFile(buf); *************** *** 319,323 **** */ public static void CMod_LoadSubmodels(lump_t l) { ! Com.DPrintf("CMod_LoadSubmodels...\n"); qfiles.dmodel_t in; cmodel_t out; --- 319,323 ---- */ public static void CMod_LoadSubmodels(lump_t l) { ! Com.DPrintf("CMod_LoadSubmodels()\n"); qfiles.dmodel_t in; cmodel_t out; *************** *** 325,329 **** if ((l.filelen % qfiles.dmodel_t.SIZE) != 0) ! Com.Error(Defines.ERR_DROP, "MOD_LoadBmodel: funny lump size"); count = l.filelen / qfiles.dmodel_t.SIZE; --- 325,329 ---- if ((l.filelen % qfiles.dmodel_t.SIZE) != 0) ! Com.Error(Defines.ERR_DROP, "CMod_LoadBmodel: funny lump size"); count = l.filelen / qfiles.dmodel_t.SIZE; *************** *** 334,338 **** Com.Error(Defines.ERR_DROP, "Map has too many models"); ! Com.DPrintf(" numcmodels=" + count + "\n"); numcmodels = count; --- 334,338 ---- Com.Error(Defines.ERR_DROP, "Map has too many models"); ! Com.DPrintf(" numcmodels=" + count + "\n"); numcmodels = count; *************** *** 371,375 **** */ public static void CMod_LoadSurfaces(lump_t l) { ! Com.DPrintf("CMod_LoadSurfaces...\n"); texinfo_t in; mapsurface_t out; --- 371,375 ---- */ public static void CMod_LoadSurfaces(lump_t l) { ! Com.DPrintf("CMod_LoadSurfaces()\n"); texinfo_t in; mapsurface_t out; *************** *** 386,390 **** numtexinfo = count; ! Com.DPrintf("numtexinfo=" + count + "\n"); if (debugloadmap) Com.DPrintf("surfaces:\n"); --- 386,390 ---- numtexinfo = count; ! Com.DPrintf(" numtexinfo=" + count + "\n"); if (debugloadmap) Com.DPrintf("surfaces:\n"); *************** *** 415,419 **** */ public static void CMod_LoadNodes(lump_t l) { ! Com.DPrintf("CMod_LoadNodes...\n"); qfiles.dnode_t in; int child; --- 415,419 ---- */ public static void CMod_LoadNodes(lump_t l) { ! Com.DPrintf("CMod_LoadNodes()\n"); qfiles.dnode_t in; int child; *************** *** 432,436 **** numnodes = count; ! Com.DPrintf(" numnodes=" + count + "\n"); if (debugloadmap) { --- 432,436 ---- numnodes = count; ! Com.DPrintf(" numnodes=" + count + "\n"); if (debugloadmap) { *************** *** 461,465 **** */ public static void CMod_LoadBrushes(lump_t l) { ! Com.DPrintf("CMod_LoadBrushes...\n"); qfiles.dbrush_t in; cbrush_t out; --- 461,465 ---- */ public static void CMod_LoadBrushes(lump_t l) { ! Com.DPrintf("CMod_LoadBrushes()\n"); qfiles.dbrush_t in; cbrush_t out; *************** *** 475,479 **** numbrushes = count; ! Com.DPrintf(" numbrushes=" + count + "\n"); if (debugloadmap) { Com.DPrintf("brushes:(firstbrushside, numsides, contents)\n"); --- 475,479 ---- numbrushes = count; ! Com.DPrintf(" numbrushes=" + count + "\n"); if (debugloadmap) { Com.DPrintf("brushes:(firstbrushside, numsides, contents)\n"); *************** *** 500,504 **** */ public static void CMod_LoadLeafs(lump_t l) { ! Com.DPrintf("CMod_LoadLeafs...\n"); int i; cleaf_t out; --- 500,504 ---- */ public static void CMod_LoadLeafs(lump_t l) { ! Com.DPrintf("CMod_LoadLeafs()\n"); int i; cleaf_t out; *************** *** 518,528 **** Com.Error(Defines.ERR_DROP, "Map has too many planes"); ! Com.DPrintf(" numleafes=" + count + "\n"); numleafs = count; numclusters = 0; if (debugloadmap) ! Com ! .DPrintf("cleaf-list:(contents, cluster, area, firstleafbrush, numleafbrushes)\n"); for (i = 0; i < count; i++) { in = new qfiles.dleaf_t(cmod_base, i * qfiles.dleaf_t.SIZE --- 518,527 ---- Com.Error(Defines.ERR_DROP, "Map has too many planes"); ! Com.DPrintf(" numleafes=" + count + "\n"); numleafs = count; numclusters = 0; if (debugloadmap) ! Com.DPrintf("cleaf-list:(contents, cluster, area, firstleafbrush, numleafbrushes)\n"); for (i = 0; i < count; i++) { in = new qfiles.dleaf_t(cmod_base, i * qfiles.dleaf_t.SIZE *************** *** 548,552 **** } ! Com.DPrintf(" numclusters=" + numclusters + "\n"); if (map_leafs[0].contents != Defines.CONTENTS_SOLID) --- 547,551 ---- } ! Com.DPrintf(" numclusters=" + numclusters + "\n"); if (map_leafs[0].contents != Defines.CONTENTS_SOLID) *************** *** 571,575 **** */ public static void CMod_LoadPlanes(lump_t l) { ! Com.DPrintf("CMod_LoadPlanes...\n"); int i, j; cplane_t out; --- 570,574 ---- */ public static void CMod_LoadPlanes(lump_t l) { ! Com.DPrintf("CMod_LoadPlanes()\n"); int i, j; cplane_t out; *************** *** 590,594 **** Com.Error(Defines.ERR_DROP, "Map has too many planes"); ! Com.DPrintf(" numplanes=" + count + "\n"); numplanes = count; --- 589,593 ---- Com.Error(Defines.ERR_DROP, "Map has too many planes"); ! Com.DPrintf(" numplanes=" + count + "\n"); numplanes = count; *************** *** 629,633 **** */ public static void CMod_LoadLeafBrushes(lump_t l) { ! Com.DPrintf("CMod_LoadLeafBrushes...\n"); int i; int out[]; --- 628,632 ---- */ public static void CMod_LoadLeafBrushes(lump_t l) { ! Com.DPrintf("CMod_LoadLeafBrushes()\n"); int i; int out[]; *************** *** 640,644 **** count = l.filelen / 2; ! Com.DPrintf(" numbrushes=" + count + "\n"); if (count < 1) --- 639,643 ---- count = l.filelen / 2; ! Com.DPrintf(" numbrushes=" + count + "\n"); if (count < 1) *************** *** 671,675 **** */ public static void CMod_LoadBrushSides(lump_t l) { ! Com.DPrintf("CMod_LoadBrushSides...\n"); int i, j; cbrushside_t out; --- 670,674 ---- */ public static void CMod_LoadBrushSides(lump_t l) { ! Com.DPrintf("CMod_LoadBrushSides()\n"); int i, j; cbrushside_t out; *************** *** 688,692 **** numbrushsides = count; ! Com.DPrintf(" numbrushsides=" + count + "\n"); if (debugloadmap) { --- 687,691 ---- numbrushsides = count; ! Com.DPrintf(" numbrushsides=" + count + "\n"); if (debugloadmap) { *************** *** 728,732 **** */ public static void CMod_LoadAreas(lump_t l) { ! Com.DPrintf("CMod_LoadAreas...\n"); int i; carea_t out; --- 727,731 ---- */ public static void CMod_LoadAreas(lump_t l) { ! Com.DPrintf("CMod_LoadAreas()\n"); int i; carea_t out; *************** *** 742,746 **** Com.Error(Defines.ERR_DROP, "Map has too many areas"); ! Com.DPrintf(" numareas=" + count + "\n"); numareas = count; --- 741,745 ---- Com.Error(Defines.ERR_DROP, "Map has too many areas"); ! Com.DPrintf(" numareas=" + count + "\n"); numareas = count; *************** *** 770,774 **** */ public static void CMod_LoadAreaPortals(lump_t l) { ! Com.DPrintf("CMod_LoadAreaPortals...\n"); int i; qfiles.dareaportal_t out; --- 769,773 ---- */ public static void CMod_LoadAreaPortals(lump_t l) { ! Com.DPrintf("CMod_LoadAreaPortals()\n"); int i; qfiles.dareaportal_t out; *************** *** 784,788 **** numareaportals = count; ! Com.DPrintf(" numareaportals=" + count + "\n"); if (debugloadmap) { Com.DPrintf("areaportals(portalnum, otherarea)\n"); --- 783,787 ---- numareaportals = count; ! Com.DPrintf(" numareaportals=" + count + "\n"); if (debugloadmap) { Com.DPrintf("areaportals(portalnum, otherarea)\n"); *************** *** 809,818 **** */ public static void CMod_LoadVisibility(lump_t l) { ! Com.DPrintf("CMod_LoadVisibility...\n"); int i; numvisibility = l.filelen; ! Com.DPrintf(" numvisibility=" + numvisibility + "\n"); if (l.filelen > Defines.MAX_MAP_VISIBILITY) --- 808,817 ---- */ public static void CMod_LoadVisibility(lump_t l) { ! Com.DPrintf("CMod_LoadVisibility()\n"); int i; numvisibility = l.filelen; ! Com.DPrintf(" numvisibility=" + numvisibility + "\n"); if (l.filelen > Defines.MAX_MAP_VISIBILITY) *************** *** 832,836 **** */ public static void CMod_LoadEntityString(lump_t l) { ! Com.DPrintf("CMod_LoadEntityString...\n"); numentitychars = l.filelen; --- 831,835 ---- */ public static void CMod_LoadEntityString(lump_t l) { ! Com.DPrintf("CMod_LoadEntityString()\n"); numentitychars = l.filelen; *************** *** 840,847 **** int x = 0; ! for (; x < l.filelen && cmod_base[x + l.fileofs] != 0; x++) ! ; map_entitystring = new String(cmod_base, l.fileofs, x).trim(); } --- 839,848 ---- int x = 0; ! for (; x < l.filelen && cmod_base[x + l.fileofs] != 0; x++); map_entitystring = new String(cmod_base, l.fileofs, x).trim(); + Com.dprintln("entitystring=" + map_entitystring.length() + + " bytes, [" + map_entitystring.substring(0, Math.min ( + map_entitystring.length(), 15)) + "...]" ); } |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:24:40
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22847/src/jake2/client Modified Files: CL.java Log Message: recording demos now work. Index: CL.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** CL.java 23 Jan 2005 19:08:57 -0000 1.17 --- CL.java 6 Feb 2005 19:24:31 -0000 1.18 *************** *** 108,112 **** // finish up len = -1; ! Globals.cls.demofile.writeInt(len); Globals.cls.demofile.close(); Globals.cls.demofile = null; --- 108,112 ---- // finish up len = -1; ! Globals.cls.demofile.writeInt(EndianHandler.swapInt(len)); Globals.cls.demofile.close(); Globals.cls.demofile = null; *************** *** 188,196 **** if (Globals.cl.configstrings[i].length() > 0) { if (buf.cursize + Globals.cl.configstrings[i].length() ! + 32 > buf.maxsize) { // write it out ! //len = LittleLong(buf.cursize); ! //fwrite(& len, 4, 1, cls.demofile); ! Globals.cls.demofile.writeInt(buf.cursize); ! //fwrite(buf.data, buf.cursize, 1, cls.demofile); Globals.cls.demofile .write(buf.data, 0, buf.cursize); --- 188,194 ---- if (Globals.cl.configstrings[i].length() > 0) { if (buf.cursize + Globals.cl.configstrings[i].length() ! + 32 > buf.maxsize) { ! // write it out ! Globals.cls.demofile.writeInt(EndianHandler.swapInt(buf.cursize)); Globals.cls.demofile .write(buf.data, 0, buf.cursize); *************** *** 206,210 **** // baselines - //memset( nullstate, 0, sizeof(nullstate)); nullstate.clear(); for (i = 0; i < Defines.MAX_EDICTS; i++) { --- 204,207 ---- *************** *** 214,221 **** if (buf.cursize + 64 > buf.maxsize) { // write it out ! //len = LittleLong(buf.cursize); ! //fwrite(& len, 4, 1, cls.demofile); ! Globals.cls.demofile.writeInt(buf.cursize); ! //fwrite(buf.data, buf.cursize, 1, cls.demofile); Globals.cls.demofile.write(buf.data, 0, buf.cursize); buf.cursize = 0; --- 211,215 ---- if (buf.cursize + 64 > buf.maxsize) { // write it out ! Globals.cls.demofile.writeInt(EndianHandler.swapInt(buf.cursize)); Globals.cls.demofile.write(buf.data, 0, buf.cursize); buf.cursize = 0; *************** *** 231,239 **** // write it to the demo file ! ! //len = LittleLong(buf.cursize); ! //fwrite(& len, 4, 1, cls.demofile); ! Globals.cls.demofile.writeInt(buf.cursize); ! //fwrite(buf.data, buf.cursize, 1, cls.demofile); Globals.cls.demofile.write(buf.data, 0, buf.cursize); // the rest of the demo file will be individual frames --- 225,229 ---- // write it to the demo file ! Globals.cls.demofile.writeInt(EndianHandler.swapInt(buf.cursize)); Globals.cls.demofile.write(buf.data, 0, buf.cursize); // the rest of the demo file will be individual frames *************** *** 627,634 **** try { ! Globals.cls.demofile.writeInt(swlen); ! //fwrite (&swlen, 4, 1, cls.demofile); Globals.cls.demofile.write(Globals.net_message.data, 8, swlen); - //fwrite (net_message.data+8, len, 1, cls.demofile); } catch (IOException e) { } --- 617,622 ---- try { ! Globals.cls.demofile.writeInt(EndianHandler.swapInt(swlen)); Globals.cls.demofile.write(Globals.net_message.data, 8, swlen); } catch (IOException e) { } |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:22:22
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22052/src/jake2/client Modified Files: CL_parse.java Log Message: added debug infos Index: CL_parse.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_parse.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** CL_parse.java 17 Jan 2005 21:49:40 -0000 1.19 --- CL_parse.java 6 Feb 2005 19:22:13 -0000 1.20 *************** *** 295,299 **** int i; ! Com.DPrintf("Serverdata packet received.\n"); // // wipe the client_state_t struct --- 295,299 ---- int i; ! Com.DPrintf("ParseServerData():Serverdata packet received.\n"); // // wipe the client_state_t struct *************** *** 318,321 **** --- 318,322 ---- str = MSG.ReadString(Globals.net_message); Globals.cl.gamedir = str; + Com.dprintln("gamedir=" + str); // set gamedir *************** *** 330,336 **** // parse player entity number Globals.cl.playernum = MSG.ReadShort(Globals.net_message); ! // get the full level name str = MSG.ReadString(Globals.net_message); if (Globals.cl.playernum == -1) { // playing a cinematic or showing a --- 331,338 ---- // parse player entity number Globals.cl.playernum = MSG.ReadShort(Globals.net_message); ! Com.dprintln("numplayers=" + Globals.cl.playernum); // get the full level name str = MSG.ReadString(Globals.net_message); + Com.dprintln("levelname=" + str); if (Globals.cl.playernum == -1) { // playing a cinematic or showing a *************** *** 409,412 **** --- 411,415 ---- ci.skin = Globals.re.RegisterSkin(skin_filename); ci.icon = Globals.re.RegisterPic(ci.iconname); + } else { // isolate the model name *************** *** 528,531 **** --- 531,536 ---- olds = Globals.cl.configstrings[i]; Globals.cl.configstrings[i] = s; + + Com.dprintln("ParseConfigString(): configstring[" + i + "]=<"+s+">"); // do something apropriate *************** *** 533,539 **** if (i >= Defines.CS_LIGHTS && i < Defines.CS_LIGHTS + Defines.MAX_LIGHTSTYLES) { CL_fx.SetLightstyle(i - Defines.CS_LIGHTS); ! } else if (i >= Defines.CS_MODELS ! && i < Defines.CS_MODELS + Defines.MAX_MODELS) { if (Globals.cl.refresh_prepped) { Globals.cl.model_draw[i - Defines.CS_MODELS] = Globals.re --- 538,545 ---- if (i >= Defines.CS_LIGHTS && i < Defines.CS_LIGHTS + Defines.MAX_LIGHTSTYLES) { + CL_fx.SetLightstyle(i - Defines.CS_LIGHTS); ! ! } else if (i >= Defines.CS_MODELS && i < Defines.CS_MODELS + Defines.MAX_MODELS) { if (Globals.cl.refresh_prepped) { Globals.cl.model_draw[i - Defines.CS_MODELS] = Globals.re |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:19:13
|
Update of /cvsroot/jake2/jake2/src/jake2/sound In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20923/src/jake2/sound Modified Files: S.java Log Message: init now safer, throwables catched. Index: S.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sound/S.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** S.java 12 Jan 2005 01:21:34 -0000 1.8 --- S.java 6 Feb 2005 19:19:03 -0000 1.9 *************** *** 43,66 **** static Vector drivers = new Vector(3); ! static { ! try { // dummy driver (no sound) ! Class.forName("jake2.sound.DummyDriver"); try { Class.forName("org.lwjgl.openal.AL"); Class.forName("jake2.sound.lwjgl.LWJGLSoundImpl"); ! } catch (ClassNotFoundException e) { // ignore the lwjgl driver if runtime not in classpath } // prefered driver try { Class.forName("net.java.games.joal.AL"); Class.forName("jake2.sound.joal.JOALSoundImpl"); ! } catch (ClassNotFoundException e) { // ignore the joal driver if runtime not in classpath } ! } ! catch (Throwable e) { ! } }; --- 43,72 ---- static Vector drivers = new Vector(3); ! static { // dummy driver (no sound) ! try { ! Class.forName("jake2.sound.DummyDriver"); ! } catch (Throwable e) { ! Com.DPrintf("could not init dummy sound driver class."); ! // ignore the lwjgl driver if runtime not in classpath ! } ! try { Class.forName("org.lwjgl.openal.AL"); Class.forName("jake2.sound.lwjgl.LWJGLSoundImpl"); ! } catch (Throwable e) { // ignore the lwjgl driver if runtime not in classpath + Com.DPrintf("could not init lwjgl sound driver class."); } + // prefered driver try { Class.forName("net.java.games.joal.AL"); Class.forName("jake2.sound.joal.JOALSoundImpl"); ! } catch (Throwable e) { // ignore the joal driver if runtime not in classpath + Com.DPrintf("could not init joal sound driver class."); } ! }; |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:18:20
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20366/src/jake2/client Modified Files: CL_fx.java Log Message: import statement added for monster package Index: CL_fx.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_fx.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CL_fx.java 17 Jan 2005 21:50:42 -0000 1.8 --- CL_fx.java 6 Feb 2005 19:18:10 -0000 1.9 *************** *** 28,33 **** import jake2.Defines; import jake2.Globals; - import jake2.game.M_Flash; import jake2.game.entity_state_t; import jake2.qcommon.Com; import jake2.qcommon.MSG; --- 28,33 ---- import jake2.Defines; import jake2.Globals; import jake2.game.entity_state_t; + import jake2.game.monsters.M_Flash; import jake2.qcommon.Com; import jake2.qcommon.MSG; |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:17:28
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20053/src/jake2/client Modified Files: CL_ents.java Log Message: cosmetic Index: CL_ents.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_ents.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CL_ents.java 20 Jan 2005 23:15:22 -0000 1.9 --- CL_ents.java 6 Feb 2005 19:17:03 -0000 1.10 *************** *** 61,72 **** --- 61,75 ---- total = MSG.ReadByte(Globals.net_message); if ((total & Defines.U_MOREBITS1) != 0) { + b = MSG.ReadByte(Globals.net_message); total |= b << 8; } if ((total & Defines.U_MOREBITS2) != 0) { + b = MSG.ReadByte(Globals.net_message); total |= b << 16; } if ((total & Defines.U_MOREBITS3) != 0) { + b = MSG.ReadByte(Globals.net_message); total |= b << 24; |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:15:19
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19471/src/jake2/game Modified Files: SuperAdapter.java Log Message: debug info added. Index: SuperAdapter.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/SuperAdapter.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SuperAdapter.java 28 Sep 2004 22:47:41 -0000 1.5 --- SuperAdapter.java 6 Feb 2005 19:15:07 -0000 1.6 *************** *** 53,57 **** // load class and instantiate try { ! //Com.DPrintf("SuperAdapter.getFromID():loading class->" + classname + "\n"); Class.forName(classname); } --- 53,57 ---- // load class and instantiate try { ! Com.DPrintf("SuperAdapter.getFromID():loading class->" + classname + "\n"); Class.forName(classname); } |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:14:15
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19059/src/jake2/game Modified Files: PlayerView.java Log Message: import statement added for monster package Index: PlayerView.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/PlayerView.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PlayerView.java 22 Sep 2004 19:22:03 -0000 1.2 --- PlayerView.java 6 Feb 2005 19:13:56 -0000 1.3 *************** *** 25,28 **** --- 25,29 ---- import jake2.Defines; import jake2.Globals; + import jake2.game.monsters.M_Player; import jake2.util.Lib; import jake2.util.Math3D; |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:13:11
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18717/src/jake2/game Modified Files: PlayerHud.java Log Message: coop, out of bounds fixed, score board bugs fixed. Index: PlayerHud.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/PlayerHud.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PlayerHud.java 22 Sep 2004 19:22:03 -0000 1.6 --- PlayerHud.java 6 Feb 2005 19:13:01 -0000 1.7 *************** *** 21,24 **** --- 21,25 ---- // Created on 28.12.2003 by RST. // $Id$ + package jake2.game; *************** *** 110,116 **** continue; // strip players of all keys between units ! for (n = 1; n < Defines.MAX_ITEMS; n++) { ! if ((GameAI.itemlist[n].flags & Defines.IT_KEY) != 0) ! client.client.pers.inventory[n] = 0; } } --- 111,119 ---- continue; // strip players of all keys between units ! for (n = 1; n < GameAI.itemlist.length; n++) { ! // null pointer exception fixed. (RST) ! if (GameAI.itemlist[n] != null) ! if ((GameAI.itemlist[n].flags & Defines.IT_KEY) != 0) ! client.client.pers.inventory[n] = 0; } } *************** *** 147,151 **** continue; ent = es.o; - } } --- 150,153 ---- *************** *** 203,213 **** // print level name and exit rules - //string[0] = 0; - //stringlength = strlen(string); // add the clients in sorted order if (total > 12) total = 12; ! for (i = 0; i < total; i++) { cl = GameBase.game.clients[sorted[i]]; --- 205,213 ---- // print level name and exit rules // add the clients in sorted order if (total > 12) total = 12; ! for (i = 0; i < total; i++) { cl = GameBase.game.clients[sorted[i]]; *************** *** 229,243 **** string.append("xv ").append(x + 32).append(" yv ").append(y) .append(" picn ").append(tag); - /* - * //Com_sprintf(entry, sizeof(entry), "xv %i yv %i picn %s ", x + - * 32, y, tag); j = strlen(entry); if (stringlength + j > 1024) - * break; strcpy(string + stringlength, entry); stringlength += - * j; - */ } // send the layout string ! .append("client ") .append(x) .append(" ") --- 229,237 ---- string.append("xv ").append(x + 32).append(" yv ").append(y) .append(" picn ").append(tag); } // send the layout string ! .append(" client ") .append(x) .append(" ") *************** *** 251,264 **** .append(" ") .append( ! (GameBase.level.framenum - cl.resp.enterframe) / 600); ! ! /* ! * Com_sprintf( entry, sizeof(entry), "client %i %i %i %i %i %i ", ! * x, y, sorted[i], cl.resp.score, cl.ping, (level.framenum - ! * cl.resp.enterframe) / 600); j = strlen(entry); if (stringlength + ! * j > 1024) break; strcpy(string + stringlength, entry); ! * stringlength += j; ! */ ! } --- 245,249 ---- .append(" ") .append( ! (GameBase.level.framenum - cl.resp.enterframe) / 600); } |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:11:05
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18126/src/jake2/game Modified Files: PlayerClient.java Log Message: find spawn point nullpointer bug fixed. Index: PlayerClient.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/PlayerClient.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PlayerClient.java 22 Sep 2004 19:22:06 -0000 1.6 --- PlayerClient.java 6 Feb 2005 19:10:48 -0000 1.7 *************** *** 521,526 **** while (true) { ! spot = (es = GameBase.G_Find(es, GameBase.findByClass, ! "info_player_coop")).o; if (spot == null) return null; // we didn't have enough... --- 521,533 ---- while (true) { ! es = GameBase.G_Find(es, GameBase.findByClass, ! "info_player_coop"); ! ! // nullpointer exi fixed (RST). ! if (es == null) ! return null; ! ! spot = es.o; ! if (spot == null) return null; // we didn't have enough... *************** *** 793,820 **** // deathmatch wipes most client data every spawn ! if (GameBase.deathmatch.value != 0) { ! String userinfo; ! //char userinfo[MAX_INFO_STRING]; resp.set(client.resp); ! userinfo = client.pers.userinfo; ! ! //memcpy(userinfo, client.pers.userinfo, sizeof(userinfo)); InitClientPersistant(client); userinfo = ClientUserinfoChanged(ent, userinfo); } else if (GameBase.coop.value != 0) { - // int n; - //char userinfo[MAX_INFO_STRING]; - String userinfo; resp.set(client.resp); ! //memcpy(userinfo, client.pers.userinfo, sizeof(userinfo)); ! userinfo = client.pers.userinfo; ! // this is kind of ugly, but it's how we want to handle keys in coop ! // for (n = 0; n < game.num_items; n++) ! // { ! // if (itemlist[n].flags & IT_KEY) ! // resp.coop_respawn.inventory[n] = client.pers.inventory[n]; ! // } resp.coop_respawn.game_helpchanged = client.pers.game_helpchanged; resp.coop_respawn.helpchanged = client.pers.helpchanged; --- 800,817 ---- // deathmatch wipes most client data every spawn ! if (GameBase.deathmatch.value != 0) { resp.set(client.resp); ! String userinfo = client.pers.userinfo; InitClientPersistant(client); + userinfo = ClientUserinfoChanged(ent, userinfo); + } else if (GameBase.coop.value != 0) { resp.set(client.resp); ! ! String userinfo = client.pers.userinfo; ! resp.coop_respawn.game_helpchanged = client.pers.game_helpchanged; resp.coop_respawn.helpchanged = client.pers.helpchanged; *************** *** 824,828 **** client.pers.score = resp.score; } else { - //memset(& resp, 0, sizeof(resp)); resp.clear(); } --- 821,824 ---- *************** *** 830,834 **** // clear everything but the persistant data saved.set(client.pers); - //memset(client, 0, sizeof(* client)); client.clear(); client.pers.set(saved); --- 826,829 ---- *************** *** 867,872 **** // clear playerstate values ! ent.client.ps.clear(); ! //memset(& ent.client.ps, 0, sizeof(client.ps)); client.ps.pmove.origin[0] = (short) (spawn_origin[0] * 8); --- 862,866 ---- // clear playerstate values ! ent.client.ps.clear(); client.ps.pmove.origin[0] = (short) (spawn_origin[0] * 8); *************** *** 1014,1018 **** if (GameBase.game.maxclients > 1) { GameBase.gi.WriteByte(Defines.svc_muzzleflash); - //gi.WriteShort(ent - g_edicts); GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_LOGIN); --- 1008,1011 ---- *************** *** 1042,1046 **** // check for malformed or illegal info strings if (!Info.Info_Validate(userinfo)) { - //strcpy(userinfo, "\\name\\badinfo\\skin\\male/grunt"); return "\\name\\badinfo\\skin\\male/grunt"; } --- 1035,1038 ---- *************** *** 1049,1054 **** s = Info.Info_ValueForKey(userinfo, "name"); - //strncpy(ent.client.pers.netname, s, sizeof(ent.client.pers.netname) - - // 1); ent.client.pers.netname = s; --- 1041,1044 ---- *************** *** 1090,1095 **** // save off the userinfo in case we want to check something later - //strncpy(ent.client.pers.userinfo, userinfo, - // sizeof(ent.client.pers.userinfo) - 1); ent.client.pers.userinfo = userinfo; --- 1080,1083 ---- |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:08:11
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17212/src/jake2/game Modified Files: gitem_t.java Log Message: main (test) method removed. Index: gitem_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/gitem_t.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gitem_t.java 22 Sep 2004 19:22:04 -0000 1.4 --- gitem_t.java 6 Feb 2005 19:08:00 -0000 1.5 *************** *** 108,127 **** // use - public static void main(String args[]) { - gitem_t xxx = new gitem_t(123); - gitem_t i2 = new gitem_t("item_armor_combat", GameAI.Pickup_Armor, - null, null, null, "misc/ar1_pkup.wav", - "models/items/armor/combat/tris.md2", Defines.EF_ROTATE, null, - /* icon */ - "i_combatarmor", - /* pickup */ - "Combat Armor", - /* width */ - 3, 0, null, Defines.IT_ARMOR, 0, GameAI.combatarmor_info, - Defines.ARMOR_COMBAT, - /* precache */ - ""); - } - public int index; } \ No newline at end of file --- 108,111 ---- |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:06:47
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16865/src/jake2/game Modified Files: gclient_t.java Log Message: scoreboard bug fixed Index: gclient_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/gclient_t.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gclient_t.java 10 Sep 2004 19:02:56 -0000 1.4 --- gclient_t.java 6 Feb 2005 19:06:37 -0000 1.5 *************** *** 132,139 **** --- 132,148 ---- { player_state_t ps = new player_state_t(); + ping =0; + pers = new client_persistant_t(); resp = new client_respawn_t(); old_pmove = new pmove_state_t(); + + showscores = false; // set layout stat + showinventory = false; // set layout stat + showhelp = false; + showhelpicon = false; + ammo_index = 0; + buttons = oldbuttons = latched_buttons = 0; weapon_thunk = false; *************** *** 143,148 **** --- 152,159 ---- damage_blood = 0; damage_knockback = 0; + killer_yaw = 0; damage_from = new float[3]; + weaponstate = 0; kick_angles = new float[3]; kick_origin = new float[3]; *************** *** 162,170 **** --- 173,206 ---- old_waterlevel = 0; + + breather_sound = 0; + machinegun_shots = 0; + anim_end = 0; anim_priority = 0; anim_duck = false; anim_run = false; + + // powerup timers + quad_framenum = 0; + invincible_framenum = 0; + breather_framenum = 0; + enviro_framenum = 0; + + grenade_blew_up = false; + grenade_time = 0; + silencer_shots = 0; + weapon_sound = 0; + + pickup_msg_time = 0; + + flood_locktill = 0; // locked from talking + flood_when = new float[10]; // when messages were said + flood_whenhead = 0; // head pointer for when said + respawn_time = 0; // can respawn when time > this + + edict_t chase_target = null; // player we are chasing + boolean update_chase = false; // need to update chase info? } |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:05:06
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16462/src/jake2/game Modified Files: GameUtil.java Log Message: some methods public, because of monster refactoring / coming bot interface Index: GameUtil.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameUtil.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** GameUtil.java 12 Jan 2005 12:14:17 -0000 1.8 --- GameUtil.java 6 Feb 2005 19:04:55 -0000 1.9 *************** *** 782,786 **** * triggered by damage ============= */ ! static int range(edict_t self, edict_t other) { float[] v = { 0, 0, 0 }; float len; --- 782,786 ---- * triggered by damage ============= */ ! public static int range(edict_t self, edict_t other) { float[] v = { 0, 0, 0 }; float len; *************** *** 901,905 **** * returns true if the entity is in front (in sight) of self ============= */ ! static boolean infront(edict_t self, edict_t other) { float[] vec = { 0, 0, 0 }; float dot; --- 901,905 ---- * returns true if the entity is in front (in sight) of self ============= */ ! public static boolean infront(edict_t self, edict_t other) { float[] vec = { 0, 0, 0 }; float dot; *************** *** 1685,1689 **** // } // ============================================================================ ! static EntThinkAdapter M_CheckAttack = new EntThinkAdapter() { public boolean think(edict_t self) { --- 1685,1689 ---- // } // ============================================================================ ! public static EntThinkAdapter M_CheckAttack = new EntThinkAdapter() { public boolean think(edict_t self) { |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:04:04
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16223/src/jake2/game Modified Files: GameTurret.java Log Message: import statement added for monster package Index: GameTurret.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameTurret.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GameTurret.java 22 Sep 2004 19:22:05 -0000 1.3 --- GameTurret.java 6 Feb 2005 19:03:54 -0000 1.4 *************** *** 25,28 **** --- 25,29 ---- import jake2.*; import jake2.client.*; + import jake2.game.monsters.M_Infantry; import jake2.qcommon.*; import jake2.render.*; |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:02:48
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15958/src/jake2/game Modified Files: GameSpawn.java Log Message: debug infos added. Index: GameSpawn.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameSpawn.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** GameSpawn.java 12 Jan 2005 12:14:17 -0000 1.10 --- GameSpawn.java 6 Feb 2005 19:02:34 -0000 1.11 *************** *** 24,27 **** --- 24,29 ---- import jake2.Defines; + import jake2.Globals; + import jake2.game.monsters.*; import jake2.qcommon.Com; import jake2.util.Lib; *************** *** 508,513 **** Com.ParseHelp ph = new Com.ParseHelp(entities); - //Com.DPrintf("* * * die scheiss edict- nummer stimmen nicht ??? * * * - // \n"); while (true) { // parse the opening brace --- 510,513 ---- *************** *** 524,534 **** ent = GameUtil.G_Spawn(); - Com.DPrintf("===\n"); - - Com.DPrintf("allocated new edict:" + ent.index + "\n"); ED_ParseEdict(ph, ent); ! Com.DPrintf("ent.classname:" + ent.classname + "\n"); ! Com.DPrintf("ent.spawnflags:" + Integer.toHexString(ent.spawnflags) ! + "\n"); // yet another map hack if (0 == Lib.Q_stricmp(GameBase.level.mapname, "command") --- 524,531 ---- ent = GameUtil.G_Spawn(); ED_ParseEdict(ph, ent); ! Com.DPrintf("spawning ent[" + ent.index + "], classname=" + ! ent.classname + ", flags= " + Integer.toHexString(ent.spawnflags)); ! // yet another map hack if (0 == Lib.Q_stricmp(GameBase.level.mapname, "command") *************** *** 542,545 **** --- 539,544 ---- if (GameBase.deathmatch.value != 0) { if ((ent.spawnflags & Defines.SPAWNFLAG_NOT_DEATHMATCH) != 0) { + + Com.DPrintf("->inhibited.\n"); GameUtil.G_FreeEdict(ent); inhibit++; *************** *** 565,573 **** | Defines.SPAWNFLAG_NOT_COOP | Defines.SPAWNFLAG_NOT_DEATHMATCH); } - ED_CallSpawn(ent); } ! //gi.dprintf("player skill level:" +skill.value + "\n"); ! //gi.dprintf(inhibit + " entities inhibited\n"); i = 1; G_FindTeams(); --- 564,572 ---- | Defines.SPAWNFLAG_NOT_COOP | Defines.SPAWNFLAG_NOT_DEATHMATCH); } ED_CallSpawn(ent); + Com.DPrintf("\n"); } ! Com.DPrintf("player skill level:" + GameBase.skill.value + "\n"); ! Com.DPrintf(inhibit + " entities inhibited.\n"); i = 1; G_FindTeams(); |
|
From: Rene S. <sa...@us...> - 2005-02-06 19:01:55
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15734/src/jake2/game Modified Files: GamePWeapon.java Log Message: import statement added for monsters. Index: GamePWeapon.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GamePWeapon.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GamePWeapon.java 22 Sep 2004 19:22:03 -0000 1.6 --- GamePWeapon.java 6 Feb 2005 19:01:45 -0000 1.7 *************** *** 25,28 **** --- 25,30 ---- import jake2.Defines; import jake2.Globals; + import jake2.game.monsters.M_Player; + import jake2.qcommon.Com; import jake2.util.Lib; import jake2.util.Math3D; *************** *** 756,759 **** --- 758,762 ---- if (item.ammo != null && 0 == GameBase.g_select_empty.value && 0 == (item.flags & Defines.IT_AMMO)) { + ammo_item = GameUtil.FindItem(item.ammo); ammo_index = GameUtil.ITEM_INDEX(ammo_item); *************** *** 1073,1076 **** --- 1076,1080 ---- if (ent.client.pers.weapon != null && ent.client.pers.weapon.ammo != null) + ent.client.ammo_index = GameUtil.ITEM_INDEX(GameUtil .FindItem(ent.client.pers.weapon.ammo)); |
|
From: Rene S. <sa...@us...> - 2005-02-06 18:59:00
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14932/src/jake2/game Modified Files: GameAI.java Log Message: eliminated ScoreBoard functions (are in PlayerHud.java). Index: GameAI.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameAI.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GameAI.java 22 Sep 2004 19:22:06 -0000 1.5 --- GameAI.java 6 Feb 2005 18:58:51 -0000 1.6 *************** *** 26,29 **** --- 26,30 ---- import jake2.Globals; import jake2.client.M; + import jake2.game.monsters.M_Player; import jake2.qcommon.Com; import jake2.server.SV_WORLD; *************** *** 1357,1361 **** boolean ff; ! if (GameBase.coop.value != 0 && attacker.client != null) GameBase.meansOfDeath |= Defines.MOD_FRIENDLY_FIRE; --- 1358,1363 ---- boolean ff; ! // attacker can be null by some mods! bug fix by rene stoeckel ! if (GameBase.coop.value != 0 && attacker != null && attacker.client != null) GameBase.meansOfDeath |= Defines.MOD_FRIENDLY_FIRE; *************** *** 1543,1656 **** } ! /* ! * ================== DeathmatchScoreboardMessage ! * ! * ================== ! */ ! public static void DeathmatchScoreboardMessage(edict_t ent, edict_t killer) { ! String entry; ! String string; ! int stringlength; ! int i, j, k; ! int sorted[] = new int[Defines.MAX_CLIENTS]; ! int sortedscores[] = new int[Defines.MAX_CLIENTS]; ! int score, total; ! int picnum; ! int x, y; ! gclient_t cl; ! edict_t cl_ent; ! String tag; ! ! // sort the clients by score ! total = 0; ! for (i = 0; i < GameBase.game.maxclients; i++) { ! cl_ent = GameBase.g_edicts[1 + i]; ! if (!cl_ent.inuse || GameBase.game.clients[i].resp.spectator) ! continue; ! score = GameBase.game.clients[i].resp.score; ! for (j = 0; j < total; j++) { ! if (score > sortedscores[j]) ! break; ! } ! for (k = total; k > j; k--) { ! sorted[k] = sorted[k - 1]; ! sortedscores[k] = sortedscores[k - 1]; ! } ! sorted[j] = i; ! sortedscores[j] = score; ! total++; ! } ! ! // print level name and exit rules ! string = ""; ! ! stringlength = string.length(); ! ! // add the clients in sorted order ! if (total > 12) ! total = 12; ! ! for (i = 0; i < total; i++) { ! cl = GameBase.game.clients[sorted[i]]; ! cl_ent = GameBase.g_edicts[1 + sorted[i]]; ! ! picnum = GameBase.gi.imageindex("i_fixme"); ! x = (i >= 6) ? 160 : 0; ! y = 32 + 32 * (i % 6); ! ! // add a dogtag ! if (cl_ent == ent) ! tag = "tag1"; ! else if (cl_ent == killer) ! tag = "tag2"; ! else ! tag = null; ! if (tag != null) { ! entry = "xv " + (x + 32) + " yv " + y + " picn " + tag + " "; ! j = entry.length(); ! if (stringlength + j > 1024) ! break; ! ! string = string + entry; ! ! //was: strcpy (string + stringlength, entry); ! stringlength += j; ! } ! ! // send the layout ! entry = "client " + x + " " + y + " " + sorted[i] + " " ! + cl.resp.score + " " + cl.ping + " " ! + (GameBase.level.framenum - cl.resp.enterframe) / 600f ! + " "; ! ! j = entry.length(); ! ! if (stringlength + j > 1024) ! break; ! ! string += entry; ! // was: strcpy(string + stringlength, entry); ! stringlength += j; ! } ! ! GameBase.gi.WriteByte(Defines.svc_layout); ! GameBase.gi.WriteString(string); ! } ! ! /* ! * ================== DeathmatchScoreboard ! * ! * Draw instead of help message. Note that it isn't that hard to overflow ! * the 1400 byte message limit! ================== ! */ ! public static void DeathmatchScoreboard(edict_t ent) { ! DeathmatchScoreboardMessage(ent, ent.enemy); ! GameBase.gi.unicast(ent, true); ! } ! ! /* ! * ================== HelpComputer ! * ! * Draw help computer. ================== */ public static void HelpComputer(edict_t ent) { --- 1545,1550 ---- } ! /** ! * HelpComputer. Draws the help computer. */ public static void HelpComputer(edict_t ent) { *************** *** 3438,3441 **** } }; ! ! } \ No newline at end of file --- 3332,3334 ---- } }; ! } |
|
From: Rene S. <sa...@us...> - 2005-02-06 18:55:25
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14274/src/jake2/game Modified Files: EdictIterator.java Log Message: opened object access. this class is will be obsolete next time. Index: EdictIterator.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/EdictIterator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EdictIterator.java 8 Jul 2004 15:58:44 -0000 1.2 --- EdictIterator.java 6 Feb 2005 18:55:16 -0000 1.3 *************** *** 32,36 **** this.i = i; } ! edict_t o; int i; } \ No newline at end of file --- 32,36 ---- this.i = i; } ! public edict_t o; int i; } \ No newline at end of file |
2 messages has been excluded from this view by a project administrator.
