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: Rene S. <sa...@us...> - 2005-02-20 21:49:55
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17215/src/jake2/game Modified Files: GameTrigger.java Log Message: bugfix for space throw in level space Index: GameTrigger.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameTrigger.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GameTrigger.java 22 Sep 2004 19:22:06 -0000 1.3 --- GameTrigger.java 20 Feb 2005 21:49:46 -0000 1.4 *************** *** 34,38 **** public static void InitTrigger(edict_t self) { ! if (Math3D.VectorCompare(self.s.angles, Globals.vec3_origin) != 0) GameBase.G_SetMovedir(self.s.angles, self.movedir); --- 34,38 ---- public static void InitTrigger(edict_t self) { ! if (!Math3D.VectorEquals(self.s.angles, Globals.vec3_origin)) GameBase.G_SetMovedir(self.s.angles, self.movedir); *************** *** 88,92 **** } ! if (0 == Math3D.VectorCompare(ent.s.angles, Globals.vec3_origin)) GameBase.G_SetMovedir(ent.s.angles, ent.movedir); --- 88,92 ---- } ! if (!Math3D.VectorEquals(ent.s.angles, Globals.vec3_origin)) GameBase.G_SetMovedir(ent.s.angles, ent.movedir); *************** *** 268,272 **** return; ! if (0 == Math3D.VectorCompare(self.movedir, Globals.vec3_origin)) { float[] forward = { 0, 0, 0 }; --- 268,272 ---- return; ! if (!Math3D.VectorEquals(self.movedir, Globals.vec3_origin)) { float[] forward = { 0, 0, 0 }; |
|
From: Carsten W. <ca...@us...> - 2005-02-20 18:33:25
|
Update of /cvsroot/jake2/jake2/src/jake2/sys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27128/src/jake2/sys Modified Files: NET.java Log Message: better message Index: NET.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sys/NET.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** NET.java 20 Oct 2004 20:37:31 -0000 1.6 --- NET.java 20 Feb 2005 18:33:16 -0000 1.7 *************** *** 351,355 **** newsocket.setBroadcast(true); } catch (Exception e) { ! Com.Println(e.getMessage()); newsocket = null; } --- 351,355 ---- newsocket.setBroadcast(true); } catch (Exception e) { ! Com.Println("Error: " + e.toString()); newsocket = null; } |
|
From: Rene S. <sa...@us...> - 2005-02-20 16:38:46
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25891/src/jake2/game Modified Files: GameAI.java GameUtil.java Log Message: some changes in monster ai (findtarget, ai_run) Index: GameUtil.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameUtil.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** GameUtil.java 19 Feb 2005 23:32:01 -0000 1.11 --- GameUtil.java 20 Feb 2005 16:38:36 -0000 1.12 *************** *** 1010,1020 **** int r; ! if ((self.monsterinfo.aiflags & Defines.AI_GOOD_GUY) != 0) { if (self.goalentity != null && self.goalentity.inuse ! && self.goalentity.classname != null) { if (self.goalentity.classname.equals("target_actor")) return false; } ! //FIXME look for monsters? return false; --- 1010,1022 ---- int r; ! if ((self.monsterinfo.aiflags & Defines.AI_GOOD_GUY) != 0) ! { if (self.goalentity != null && self.goalentity.inuse ! && self.goalentity.classname != null) ! { if (self.goalentity.classname.equals("target_actor")) return false; } ! //FIXME look for monsters? return false; *************** *** 1037,1044 **** if ((GameBase.level.sight_entity_framenum >= (GameBase.level.framenum - 1)) && 0 == (self.spawnflags & 1)) { ! client = GameBase.level.sight_entity; ! if (client.enemy == self.enemy) { ! return false; ! } } else if (GameBase.level.sound_entity_framenum >= (GameBase.level.framenum - 1)) { client = GameBase.level.sound_entity; --- 1039,1045 ---- if ((GameBase.level.sight_entity_framenum >= (GameBase.level.framenum - 1)) && 0 == (self.spawnflags & 1)) { ! client = GameBase.level.sight_entity; ! if (client.enemy == self.enemy) ! return false; } else if (GameBase.level.sound_entity_framenum >= (GameBase.level.framenum - 1)) { client = GameBase.level.sound_entity; *************** *** 1059,1065 **** return false; - if (client == self.enemy) - return true; // JDC false; - if (client.client != null) { if ((client.flags & Defines.FL_NOTARGET) != 0) --- 1060,1063 ---- *************** *** 1082,1106 **** return false; ! // this is where we would check invisibility ! // is client in an spot too dark to be seen? if (client.light_level <= 5) return false; ! if (!visible(self, client)) { return false; ! } if (r == Defines.RANGE_NEAR) { if (client.show_hostile < GameBase.level.time ! && !infront(self, client)) { ! return false; ! } } else if (r == Defines.RANGE_MID) { ! if (!infront(self, client)) { ! return false; ! } } self.enemy = client; --- 1080,1105 ---- return false; ! // this is where we would check invisibility // is client in an spot too dark to be seen? + if (client.light_level <= 5) return false; ! if (!visible(self, client)) return false; ! if (r == Defines.RANGE_NEAR) { if (client.show_hostile < GameBase.level.time ! && !infront(self, client)) ! return false; } else if (r == Defines.RANGE_MID) { ! if (!infront(self, client)) ! return false; } + if (client == self.enemy) + return true; // JDC false; + self.enemy = client; *************** *** 1131,1137 **** if (Math3D.VectorLength(temp) > 1000) // too far to hear - { return false; ! } // check area portals - if they are different and not connected then --- 1130,1135 ---- if (Math3D.VectorLength(temp) > 1000) // too far to hear return false; ! // check area portals - if they are different and not connected then *************** *** 1146,1150 **** // hunt the sound for a bit; hopefully find the real player self.monsterinfo.aiflags |= Defines.AI_SOUND_TARGET; ! self.enemy = client; } --- 1144,1152 ---- // hunt the sound for a bit; hopefully find the real player self.monsterinfo.aiflags |= Defines.AI_SOUND_TARGET; ! ! if (client == self.enemy) ! return true; // JDC false; ! ! self.enemy = client; } Index: GameAI.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameAI.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GameAI.java 6 Feb 2005 18:58:51 -0000 1.6 --- GameAI.java 20 Feb 2005 16:38:36 -0000 1.7 *************** *** 2635,2639 **** if (0 == self.yaw_speed) ! self.yaw_speed = 20; self.viewheight = 25; --- 2635,2639 ---- if (0 == self.yaw_speed) ! self.yaw_speed = 40; self.viewheight = 25; *************** *** 2662,2666 **** if (0 == self.yaw_speed) ! self.yaw_speed = 10; self.viewheight = 25; --- 2662,2666 ---- if (0 == self.yaw_speed) ! self.yaw_speed = 20; self.viewheight = 25; *************** *** 2685,2689 **** public boolean think(edict_t self) { if (0 == self.yaw_speed) ! self.yaw_speed = 10; self.viewheight = 10; --- 2685,2689 ---- public boolean think(edict_t self) { if (0 == self.yaw_speed) ! self.yaw_speed = 20; self.viewheight = 10; *************** *** 2866,2881 **** } if ((self.monsterinfo.aiflags & Defines.AI_SOUND_TARGET) != 0) { Math3D.VectorSubtract(self.s.origin, self.enemy.s.origin, v); if (Math3D.VectorLength(v) < 64) { ! self.monsterinfo.aiflags |= (Defines.AI_STAND_GROUND | Defines.AI_TEMP_STAND_GROUND); self.monsterinfo.stand.think(self); ! return; } ! ! M.M_MoveToGoal(self, dist); ! if (!GameUtil.FindTarget(self)) return; } --- 2866,2888 ---- } + // rst: monster heard a sound.... if ((self.monsterinfo.aiflags & Defines.AI_SOUND_TARGET) != 0) { Math3D.VectorSubtract(self.s.origin, self.enemy.s.origin, v); + // ...and reached it if (Math3D.VectorLength(v) < 64) { ! //don't move, just stand and listen. ! //self.monsterinfo.aiflags |= (Defines.AI_STAND_GROUND | Defines.AI_TEMP_STAND_GROUND); self.monsterinfo.stand.think(self); ! // since now it is aware and does not to be triggered again. ! self.spawnflags &= ~1; ! self.enemy = null; } ! else ! M.M_MoveToGoal(self, dist); ! ! // look for new targets if (!GameUtil.FindTarget(self)) return; + } *************** *** 2899,2903 **** } ! // coop will change to another enemy if visible if (GameBase.coop.value != 0) { // FIXME: insane guys get mad with this, which causes crashes! --- 2906,2910 ---- } ! // coop will change to another enemy if visible^ if (GameBase.coop.value != 0) { // FIXME: insane guys get mad with this, which causes crashes! *************** *** 2905,2908 **** --- 2912,2916 ---- return; } + if ((self.monsterinfo.search_time != 0) *************** *** 3051,3059 **** self.s.angles[Defines.YAW] = self.ideal_yaw = Math3D .vectoyaw(v); ! // gi.dprintf("adjusted right\n"); ! // debug_drawline(self.origin, self.last_sighting, 152); } } ! // else gi.dprintf("course was fine\n"); } --- 3059,3067 ---- self.s.angles[Defines.YAW] = self.ideal_yaw = Math3D .vectoyaw(v); ! // gi.dprintf("adjusted right\n"); ! // debug_drawline(self.origin, self.last_sighting, 152); } } ! // else gi.dprintf("course was fine\n"); } |
|
From: Carsten W. <ca...@us...> - 2005-02-20 14:39:33
|
Update of /cvsroot/jake2/jake2/src/jake2/sys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28687/src/jake2/sys Modified Files: JOGLKBD.java Log Message: correct mouse button numbering for jogl (left->K_MOUSE1, center->K_MOUSE3, right->K_MOUSE2) Index: JOGLKBD.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sys/JOGLKBD.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JOGLKBD.java 16 Dec 2004 22:45:55 -0000 1.4 --- JOGLKBD.java 20 Feb 2005 14:39:23 -0000 1.5 *************** *** 39,43 **** private void HandleEvents() { ! int b; Jake2InputEvent event; --- 39,43 ---- private void HandleEvents() { ! int key; Jake2InputEvent event; *************** *** 62,74 **** } break; ! case Jake2InputEvent.ButtonPress: ! b=((MouseEvent)event.ev).getButton()-1; ! Do_Key_Event(Key.K_MOUSE1 + b, true); break; case Jake2InputEvent.ButtonRelease: ! b=((MouseEvent)event.ev).getButton()-1; ! Do_Key_Event(Key.K_MOUSE1 + b, false); break; --- 62,74 ---- } break; ! // see java.awt.MouseEvent case Jake2InputEvent.ButtonPress: ! key = mouseEventToKey((MouseEvent)event.ev); ! Do_Key_Event(key, true); break; case Jake2InputEvent.ButtonRelease: ! key = mouseEventToKey((MouseEvent)event.ev); ! Do_Key_Event(key, false); break; *************** *** 111,114 **** --- 111,128 ---- } + // strange button numbering in java.awt.MouseEvent + // BUTTON1(left) BUTTON2(center) BUTTON3(right) + // K_MOUSE1 K_MOUSE3 K_MOUSE2 + private final int mouseEventToKey(MouseEvent ev) { + switch (ev.getButton()) { + case MouseEvent.BUTTON3: + return Key.K_MOUSE2; + case MouseEvent.BUTTON2: + return Key.K_MOUSE3; + default: + return Key.K_MOUSE1; + } + } + private static int XLateKey(KeyEvent ev) { |
|
From: Carsten W. <ca...@us...> - 2005-02-20 13:55:37
|
Update of /cvsroot/jake2/jake2/src/jake2/sys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18843/src/jake2/sys Modified Files: LWJGLKBD.java Log Message: correct mouse button numbering for lwjgl (left->0, center->2, right->1) Index: LWJGLKBD.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sys/LWJGLKBD.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** LWJGLKBD.java 20 Dec 2004 15:24:30 -0000 1.7 --- LWJGLKBD.java 20 Feb 2005 13:55:26 -0000 1.8 *************** *** 85,91 **** int button = Mouse.getEventButton(); if (button >= 0) { - if (button == 1 && mouseHasTwoButtons) { - button = 2; // A three button mouse numbering scheme... - } Do_Key_Event(Key.K_MOUSE1 + button, Mouse.getEventButtonState()); } else { --- 85,88 ---- |
|
From: Carsten W. <ca...@us...> - 2005-02-20 13:42:18
|
Update of /cvsroot/jake2/jake2/webstart In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16313/webstart Modified Files: jake2_lwjgl.jnlp Log Message: change from binary to -kkv |
|
From: Rene S. <sa...@us...> - 2005-02-19 23:32:12
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28197/src/jake2/game Modified Files: GameUtil.java Log Message: fixed power shield bug Index: GameUtil.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameUtil.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** GameUtil.java 19 Feb 2005 21:19:23 -0000 1.10 --- GameUtil.java 19 Feb 2005 23:32:01 -0000 1.11 *************** *** 685,689 **** int power_used; ! if (damage != 0) return 0; --- 685,689 ---- int power_used; ! if (damage == 0) return 0; |
|
From: Rene S. <sa...@us...> - 2005-02-19 21:22:42
|
Update of /cvsroot/jake2/jake2/src/jake2/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31578/src/jake2/server Modified Files: SV_MAIN.java Log Message: wrong error message fixed when loading a game failes Index: SV_MAIN.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_MAIN.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SV_MAIN.java 17 Oct 2004 21:31:32 -0000 1.9 --- SV_MAIN.java 19 Feb 2005 21:22:34 -0000 1.10 *************** *** 994,998 **** // stagger the packets to crutch operating system limited buffers ! for (i = 0; i < SV_MAIN.maxclients.value; i++) { cl = SV_INIT.svs.clients[i]; if (cl.state >= Defines.cs_connected) --- 994,998 ---- // stagger the packets to crutch operating system limited buffers ! for (i = 0; i < SV_INIT.svs.clients.length; i++) { cl = SV_INIT.svs.clients[i]; if (cl.state >= Defines.cs_connected) *************** *** 1000,1004 **** Globals.net_message.data); } ! for (i = 0; i < SV_MAIN.maxclients.value; i++) { cl = SV_INIT.svs.clients[i]; if (cl.state >= Defines.cs_connected) --- 1000,1004 ---- Globals.net_message.data); } ! for (i = 0; i < SV_INIT.svs.clients.length; i++) { cl = SV_INIT.svs.clients[i]; if (cl.state >= Defines.cs_connected) |
|
From: Rene S. <sa...@us...> - 2005-02-19 21:22:06
|
Update of /cvsroot/jake2/jake2/src/jake2/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31300/src/jake2/server Modified Files: SV_INIT.java Log Message: cosmetic Index: SV_INIT.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_INIT.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** SV_INIT.java 12 Feb 2005 21:43:48 -0000 1.12 --- SV_INIT.java 19 Feb 2005 21:21:46 -0000 1.13 *************** *** 60,68 **** Com.Error(Defines.ERR_DROP, "*Index: overflow"); - //strncpy (sv.configstrings[start+i], name, - // sizeof(sv.configstrings[i])); sv.configstrings[start + i] = name; ! if (sv.state != Defines.ss_loading) { // send the update to everyone SZ.Clear(sv.multicast); MSG.WriteChar(sv.multicast, Defines.svc_configstring); --- 60,67 ---- Com.Error(Defines.ERR_DROP, "*Index: overflow"); sv.configstrings[start + i] = name; ! if (sv.state != Defines.ss_loading) { ! // send the update to everyone SZ.Clear(sv.multicast); MSG.WriteChar(sv.multicast, Defines.svc_configstring); *************** *** 109,115 **** svent.s.number = entnum; - // // take current state as baseline - // Math3D.VectorCopy(svent.s.origin, svent.s.old_origin); // rst: bugfix --- 108,112 ---- *************** *** 154,158 **** SV_CCMDS.SV_ReadLevelFile(); ! if (!sv.loadgame) { // coming back to a level after being in a different // level, so run it for ten seconds --- 151,156 ---- SV_CCMDS.SV_ReadLevelFile(); ! if (!sv.loadgame) { ! // coming back to a level after being in a different // level, so run it for ten seconds |
|
From: Rene S. <sa...@us...> - 2005-02-19 21:21:27
|
Update of /cvsroot/jake2/jake2/src/jake2/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31150/src/jake2/server Modified Files: SV_CCMDS.java Log Message: wrong error message fixed when loading a game failes Index: SV_CCMDS.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_CCMDS.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** SV_CCMDS.java 7 Oct 2004 14:13:07 -0000 1.13 --- SV_CCMDS.java 19 Feb 2005 21:21:19 -0000 1.14 *************** *** 466,470 **** */ public static void SV_ReadServerFile() { ! String filename, name = "", string, comment, mapcmd; try { QuakeFile f; --- 466,470 ---- */ public static void SV_ReadServerFile() { ! String filename="", name = "", string, comment, mapcmd; try { QuakeFile f; *************** *** 508,512 **** } catch (Exception e) { ! Com.Printf("Couldn't read file " + name + "\n"); e.printStackTrace(); } --- 508,512 ---- } catch (Exception e) { ! Com.Printf("Couldn't read file " + filename + "\n"); e.printStackTrace(); } |
|
From: Rene S. <sa...@us...> - 2005-02-19 21:20:56
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31002/src/jake2/qcommon Modified Files: MSG.java Log Message: developer msg removed Index: MSG.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/MSG.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MSG.java 6 Feb 2005 18:47:00 -0000 1.6 --- MSG.java 19 Feb 2005 21:20:47 -0000 1.7 *************** *** 88,92 **** SZ.Write(sb, x.getBytes()); WriteByte(sb, 0); ! Com.dprintln("MSG.WriteString:" + s.replace('\0', '@')); } --- 88,92 ---- SZ.Write(sb, x.getBytes()); WriteByte(sb, 0); ! //Com.dprintln("MSG.WriteString:" + s.replace('\0', '@')); } *************** *** 477,481 **** String ret = new String(readbuf, 0, l); ! Com.dprintln("MSG.ReadString:[" + ret + "]"); return ret; } --- 477,481 ---- String ret = new String(readbuf, 0, l); ! // Com.dprintln("MSG.ReadString:[" + ret + "]"); return ret; } |
|
From: Rene S. <sa...@us...> - 2005-02-19 21:20:41
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30941/src/jake2/game Modified Files: PlayerClientAdapters.java Log Message: bugfix in SP_FixCoopSpots Index: PlayerClientAdapters.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/PlayerClientAdapters.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PlayerClientAdapters.java 22 Sep 2004 19:22:05 -0000 1.3 --- PlayerClientAdapters.java 19 Feb 2005 21:20:31 -0000 1.4 *************** *** 54,60 **** es = GameBase.G_Find(es, GameBase.findByClass, "info_player_start"); ! spot = es.o; ! if (spot == null) return true; if (spot.targetname == null) continue; --- 54,63 ---- es = GameBase.G_Find(es, GameBase.findByClass, "info_player_start"); ! ! if (es == null) return true; + + spot = es.o; + if (spot.targetname == null) continue; |
|
From: Rene S. <sa...@us...> - 2005-02-19 21:20:30
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30838/src/jake2/game Modified Files: PlayerClient.java Log Message: bugfixes in selectspawnpoint() functions Index: PlayerClient.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/PlayerClient.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PlayerClient.java 12 Feb 2005 21:43:02 -0000 1.8 --- PlayerClient.java 19 Feb 2005 21:20:10 -0000 1.9 *************** *** 450,453 **** --- 450,457 ---- es = GameBase.G_Find(es, GameBase.findByClass, "info_player_deathmatch"); + + if (es == null) + break; + spot = es.o; if (spot == spot1 || spot == spot2) *************** *** 490,497 **** // if there is a player just spawned on each and every start spot // we have no choice to turn one into a telefrag meltdown ! spot = GameBase.G_Find(null, GameBase.findByClass, ! "info_player_deathmatch").o; ! ! return spot; } --- 494,503 ---- // if there is a player just spawned on each and every start spot // we have no choice to turn one into a telefrag meltdown ! EdictIterator edit = GameBase.G_Find(null, GameBase.findByClass, ! "info_player_deathmatch"); ! if (edit == null) ! return null; ! ! return edit.o; } *************** *** 580,594 **** if (null == spot) { ! if (GameBase.game.spawnpoint.length() == 0) { // there wasn't a ! // spawnpoint ! // without a ! // target, so use ! // any ! spot = (es = GameBase.G_Find(es, GameBase.findByClass, ! "info_player_start")).o; } if (null == spot) GameBase.gi.error("Couldn't find spawn point " + GameBase.game.spawnpoint + "\n"); } } --- 586,604 ---- if (null == spot) { ! if (GameBase.game.spawnpoint.length() == 0) { ! // there wasn't a spawnpoint without a ! // target, so use any ! es = GameBase.G_Find(es, GameBase.findByClass, ! "info_player_start"); ! ! if (es != null) ! spot = es.o; } if (null == spot) + { GameBase.gi.error("Couldn't find spawn point " + GameBase.game.spawnpoint + "\n"); + return; + } } } |
|
From: Rene S. <sa...@us...> - 2005-02-19 21:19:44
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30639/src/jake2/game Modified Files: GameUtil.java Log Message: developer msg added for killing and pickup. Index: GameUtil.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameUtil.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** GameUtil.java 6 Feb 2005 19:04:55 -0000 1.9 --- GameUtil.java 19 Feb 2005 21:19:23 -0000 1.10 *************** *** 606,609 **** --- 606,610 ---- public static void Killed(edict_t targ, edict_t inflictor, edict_t attacker, int damage, float[] point) { + Com.DPrintf("Killing a " + targ.classname + "\n"); if (targ.health < -999) targ.health = -999; *************** *** 1503,1507 **** if (!taken) return; ! //Com.p("Picked up:" + ent.classname); if (!((GameBase.coop.value != 0) && (ent.item.flags & Defines.IT_STAY_COOP) != 0) --- 1504,1509 ---- if (!taken) return; ! ! Com.dprintln("Picked up:" + ent.classname); if (!((GameBase.coop.value != 0) && (ent.item.flags & Defines.IT_STAY_COOP) != 0) |
|
From: Rene S. <sa...@us...> - 2005-02-19 21:18:54
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30508/src/jake2/game Modified Files: GameTarget.java Log Message: lightramp bug and imroved laser think Index: GameTarget.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameTarget.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GameTarget.java 22 Sep 2004 19:22:03 -0000 1.3 --- GameTarget.java 19 Feb 2005 21:18:44 -0000 1.4 *************** *** 223,227 **** } ! if (GameBase.deathmatch.value != 9) { GameUtil.G_FreeEdict(self); return; --- 223,227 ---- } ! if (GameBase.deathmatch.value != 0) { GameUtil.G_FreeEdict(self); return; *************** *** 701,711 **** if (null == self.enemy) { if (self.target != null) { ! ent = GameBase.G_Find(null, GameBase.findByTarget, ! self.target).o; ! if (ent == null) GameBase.gi.dprintf(self.classname + " at " + Lib.vtos(self.s.origin) + ": " + self.target + " is a bad target\n"); ! self.enemy = ent; } else { GameBase.G_SetMovedir(self.s.angles, self.movedir); --- 701,711 ---- if (null == self.enemy) { if (self.target != null) { ! EdictIterator edit = GameBase.G_Find(null, GameBase.findByTarget, ! self.target); ! if (edit == null) GameBase.gi.dprintf(self.classname + " at " + Lib.vtos(self.s.origin) + ": " + self.target + " is a bad target\n"); ! self.enemy = edit.o; } else { GameBase.G_SetMovedir(self.s.angles, self.movedir); *************** *** 741,751 **** public boolean think(edict_t self) { ! char style[] = { ' ', ' ' }; ! ! style[0] = (char) ('a' + (int) (self.movedir[0] + (GameBase.level.time - self.timestamp) ! / Defines.FRAMETIME * self.movedir[2])); ! style[1] = 0; GameBase.gi.configstring(Defines.CS_LIGHTS + self.enemy.style, ! new String(style)); if ((GameBase.level.time - self.timestamp) < self.speed) { --- 741,749 ---- public boolean think(edict_t self) { ! char tmp[] = {(char) ('a' + (int) (self.movedir[0] + (GameBase.level.time - self.timestamp) ! / Defines.FRAMETIME * self.movedir[2]))}; ! GameBase.gi.configstring(Defines.CS_LIGHTS + self.enemy.style, ! new String(tmp)); if ((GameBase.level.time - self.timestamp) < self.speed) { *************** *** 776,783 **** es = GameBase .G_Find(es, GameBase.findByTarget, self.target); e = es.o; - if (e == null) - break; if (Lib.strcmp(e.classname, "light") != 0) { GameBase.gi.dprintf(self.classname + " at " --- 774,783 ---- es = GameBase .G_Find(es, GameBase.findByTarget, self.target); + + if (es == null) + break; + e = es.o; if (Lib.strcmp(e.classname, "light") != 0) { GameBase.gi.dprintf(self.classname + " at " |
|
From: Rene S. <sa...@us...> - 2005-02-19 21:18:24
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30440/src/jake2/game Modified Files: GamePWeapon.java Log Message: cosmetic Index: GamePWeapon.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GamePWeapon.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GamePWeapon.java 6 Feb 2005 19:01:45 -0000 1.7 --- GamePWeapon.java 19 Feb 2005 21:18:15 -0000 1.8 *************** *** 1211,1215 **** ent.s.frame = M_Player.FRAME_pain304 + 1; ent.client.anim_end = M_Player.FRAME_pain301; - } } --- 1211,1214 ---- |
|
From: Rene S. <sa...@us...> - 2005-02-19 21:17:55
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30320/src/jake2/game Modified Files: edict_t.java GameSpawn.java Log Message: fixed bug in ent.setFields() when spawning an edict_t Index: GameSpawn.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameSpawn.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** GameSpawn.java 6 Feb 2005 19:02:34 -0000 1.11 --- GameSpawn.java 19 Feb 2005 21:17:44 -0000 1.12 *************** *** 354,358 **** Com.Println("nextmap: " + value); if (!GameBase.st.set(key, value)) ! if (!ent.set(key, value)) GameBase.gi.dprintf("??? The key [" + key + "] is not a field\n"); --- 354,358 ---- Com.Println("nextmap: " + value); if (!GameBase.st.set(key, value)) ! if (!ent.setField(key, value)) GameBase.gi.dprintf("??? The key [" + key + "] is not a field\n"); *************** *** 402,406 **** continue; ! ED_ParseField(keyname, com_token, ent); } --- 402,406 ---- continue; ! ED_ParseField(keyname.toLowerCase(), com_token, ent); } *************** *** 472,475 **** --- 472,477 ---- public static void SpawnEntities(String mapname, String entities, String spawnpoint) { + + Com.dprintln("SpawnEntities(), mapname=" + mapname); edict_t ent; int inhibit; *************** *** 553,558 **** --- 555,563 ---- || ((GameBase.skill.value == 1) && (ent.spawnflags & Defines.SPAWNFLAG_NOT_MEDIUM) != 0) || (((GameBase.skill.value == 2) || (GameBase.skill.value == 3)) && (ent.spawnflags & Defines.SPAWNFLAG_NOT_HARD) != 0)) { + + Com.DPrintf("->inhibited.\n"); GameUtil.G_FreeEdict(ent); inhibit++; + continue; } Index: edict_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/edict_t.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** edict_t.java 22 Sep 2004 19:22:01 -0000 1.6 --- edict_t.java 19 Feb 2005 21:17:44 -0000 1.7 *************** *** 27,30 **** --- 27,31 ---- import jake2.*; + import jake2.qcommon.Com; import jake2.util.*; *************** *** 281,285 **** ///////////////////////////////////////////////// ! public boolean set(String key, String value) { if (key.equals("classname")) { --- 282,286 ---- ///////////////////////////////////////////////// ! public boolean setField(String key, String value) { if (key.equals("classname")) { *************** *** 349,352 **** --- 350,354 ---- if (key.equals("team")) { team = GameSpawn.ED_NewString(value); + Com.dprintln("Monster Team:" + team); return true; } // F_LSTRING), |
|
From: Rene S. <sa...@us...> - 2005-02-19 21:16:13
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29892/src/jake2/client Modified Files: CL_parse.java Log Message: developer msg removed Index: CL_parse.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_parse.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** CL_parse.java 6 Feb 2005 19:22:13 -0000 1.20 --- CL_parse.java 19 Feb 2005 21:16:03 -0000 1.21 *************** *** 532,536 **** Globals.cl.configstrings[i] = s; ! Com.dprintln("ParseConfigString(): configstring[" + i + "]=<"+s+">"); // do something apropriate --- 532,536 ---- Globals.cl.configstrings[i] = s; ! //Com.dprintln("ParseConfigString(): configstring[" + i + "]=<"+s+">"); // do something apropriate |
|
From: Rene S. <sa...@us...> - 2005-02-19 19:42:29
|
Update of /cvsroot/jake2/jake2/src/jake2/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7625/src/jake2/server Modified Files: Tag: RST SV_MAIN.java Log Message: bugfix when games are loaded outside a started game. Index: SV_MAIN.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_MAIN.java,v retrieving revision 1.9 retrieving revision 1.9.6.1 diff -C2 -d -r1.9 -r1.9.6.1 *** SV_MAIN.java 17 Oct 2004 21:31:32 -0000 1.9 --- SV_MAIN.java 19 Feb 2005 19:42:20 -0000 1.9.6.1 *************** *** 994,998 **** // stagger the packets to crutch operating system limited buffers ! for (i = 0; i < SV_MAIN.maxclients.value; i++) { cl = SV_INIT.svs.clients[i]; if (cl.state >= Defines.cs_connected) --- 994,998 ---- // stagger the packets to crutch operating system limited buffers ! for (i = 0; i < SV_INIT.svs.clients.length; i++) { cl = SV_INIT.svs.clients[i]; if (cl.state >= Defines.cs_connected) *************** *** 1000,1004 **** Globals.net_message.data); } ! for (i = 0; i < SV_MAIN.maxclients.value; i++) { cl = SV_INIT.svs.clients[i]; if (cl.state >= Defines.cs_connected) --- 1000,1004 ---- Globals.net_message.data); } ! for (i = 0; i < SV_INIT.svs.clients.length; i++) { cl = SV_INIT.svs.clients[i]; if (cl.state >= Defines.cs_connected) |
|
From: Rene S. <sa...@us...> - 2005-02-19 19:40:48
|
Update of /cvsroot/jake2/jake2/src/jake2/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7333/src/jake2/server Modified Files: Tag: RST SV_CCMDS.java Log Message: wrong error message fixed when loading a game failes Index: SV_CCMDS.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_CCMDS.java,v retrieving revision 1.13 retrieving revision 1.13.6.1 diff -C2 -d -r1.13 -r1.13.6.1 *** SV_CCMDS.java 7 Oct 2004 14:13:07 -0000 1.13 --- SV_CCMDS.java 19 Feb 2005 19:40:38 -0000 1.13.6.1 *************** *** 466,470 **** */ public static void SV_ReadServerFile() { ! String filename, name = "", string, comment, mapcmd; try { QuakeFile f; --- 466,470 ---- */ public static void SV_ReadServerFile() { ! String filename="", name = "", string, comment, mapcmd; try { QuakeFile f; *************** *** 508,512 **** } catch (Exception e) { ! Com.Printf("Couldn't read file " + name + "\n"); e.printStackTrace(); } --- 508,512 ---- } catch (Exception e) { ! Com.Printf("Couldn't read file " + filename + "\n"); e.printStackTrace(); } |
|
From: Rene S. <sa...@us...> - 2005-02-19 19:40:04
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7149/src/jake2/game Modified Files: Tag: RST GamePWeapon.java Log Message: changeweapon() developer msg removed Index: GamePWeapon.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GamePWeapon.java,v retrieving revision 1.6.6.2 retrieving revision 1.6.6.3 diff -C2 -d -r1.6.6.2 -r1.6.6.3 *** GamePWeapon.java 23 Jan 2005 21:31:46 -0000 1.6.6.2 --- GamePWeapon.java 19 Feb 2005 19:39:55 -0000 1.6.6.3 *************** *** 1094,1100 **** ent.client.ps.gunindex = GameBase.gi .modelindex(ent.client.pers.weapon.view_model); - - Com.dprintln("ChangeWeapon: gunindex=" + ent.client.ps.gunindex); - Com.dprintln("ChangeWeapon: viewmodel=" + ent.client.pers.weapon.view_model); ent.client.anim_priority = Defines.ANIM_PAIN; --- 1094,1097 ---- |
|
From: Rene S. <sa...@us...> - 2005-02-19 19:39:28
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7034/src/jake2/game Modified Files: Tag: RST edict_t.java GameSpawn.java Log Message: fixed bug in ent.setFields() when spawning an edict_t Index: GameSpawn.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameSpawn.java,v retrieving revision 1.9.6.2 retrieving revision 1.9.6.3 diff -C2 -d -r1.9.6.2 -r1.9.6.3 *** GameSpawn.java 23 Jan 2005 21:31:46 -0000 1.9.6.2 --- GameSpawn.java 19 Feb 2005 19:39:17 -0000 1.9.6.3 *************** *** 354,358 **** Com.Println("nextmap: " + value); if (!GameBase.st.set(key, value)) ! if (!ent.set(key, value)) GameBase.gi.dprintf("??? The key [" + key + "] is not a field\n"); --- 354,358 ---- Com.Println("nextmap: " + value); if (!GameBase.st.set(key, value)) ! if (!ent.setField(key, value)) GameBase.gi.dprintf("??? The key [" + key + "] is not a field\n"); *************** *** 402,406 **** continue; ! ED_ParseField(keyname, com_token, ent); } --- 402,406 ---- continue; ! ED_ParseField(keyname.toLowerCase(), com_token, ent); } Index: edict_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/edict_t.java,v retrieving revision 1.6 retrieving revision 1.6.6.1 diff -C2 -d -r1.6 -r1.6.6.1 *** edict_t.java 22 Sep 2004 19:22:01 -0000 1.6 --- edict_t.java 19 Feb 2005 19:39:17 -0000 1.6.6.1 *************** *** 27,30 **** --- 27,31 ---- import jake2.*; + import jake2.qcommon.Com; import jake2.util.*; *************** *** 281,285 **** ///////////////////////////////////////////////// ! public boolean set(String key, String value) { if (key.equals("classname")) { --- 282,286 ---- ///////////////////////////////////////////////// ! public boolean setField(String key, String value) { if (key.equals("classname")) { *************** *** 349,352 **** --- 350,354 ---- if (key.equals("team")) { team = GameSpawn.ED_NewString(value); + Com.dprintln("Monster Team:" + team); return true; } // F_LSTRING), |
|
From: Rene S. <sa...@us...> - 2005-02-19 19:38:15
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6815/src/jake2/game Modified Files: Tag: RST PlayerClientAdapters.java Log Message: bug in fixcoopspots Index: PlayerClientAdapters.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/PlayerClientAdapters.java,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** PlayerClientAdapters.java 22 Sep 2004 19:22:05 -0000 1.3 --- PlayerClientAdapters.java 19 Feb 2005 19:38:04 -0000 1.3.6.1 *************** *** 54,60 **** es = GameBase.G_Find(es, GameBase.findByClass, "info_player_start"); ! spot = es.o; ! if (spot == null) return true; if (spot.targetname == null) continue; --- 54,63 ---- es = GameBase.G_Find(es, GameBase.findByClass, "info_player_start"); ! ! if (es == null) return true; + + spot = es.o; + if (spot.targetname == null) continue; |
|
From: Rene S. <sa...@us...> - 2005-02-19 19:37:27
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6610/src/jake2/game Modified Files: Tag: RST PlayerClient.java Log Message: fixed 2 selectspawnpoint() bugs Index: PlayerClient.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/PlayerClient.java,v retrieving revision 1.6.6.1 retrieving revision 1.6.6.2 diff -C2 -d -r1.6.6.1 -r1.6.6.2 *** PlayerClient.java 23 Jan 2005 21:31:44 -0000 1.6.6.1 --- PlayerClient.java 19 Feb 2005 19:37:17 -0000 1.6.6.2 *************** *** 450,453 **** --- 450,457 ---- es = GameBase.G_Find(es, GameBase.findByClass, "info_player_deathmatch"); + + if (es == null) + break; + spot = es.o; if (spot == spot1 || spot == spot2) *************** *** 490,497 **** // if there is a player just spawned on each and every start spot // we have no choice to turn one into a telefrag meltdown ! spot = GameBase.G_Find(null, GameBase.findByClass, ! "info_player_deathmatch").o; ! ! return spot; } --- 494,503 ---- // if there is a player just spawned on each and every start spot // we have no choice to turn one into a telefrag meltdown ! EdictIterator edit = GameBase.G_Find(null, GameBase.findByClass, ! "info_player_deathmatch"); ! if (edit == null) ! return null; ! ! return edit.o; } *************** *** 589,603 **** if (null == spot) { ! if (GameBase.game.spawnpoint.length() == 0) { // there wasn't a ! // spawnpoint ! // without a ! // target, so use ! // any ! spot = (es = GameBase.G_Find(es, GameBase.findByClass, ! "info_player_start")).o; } if (null == spot) GameBase.gi.error("Couldn't find spawn point " + GameBase.game.spawnpoint + "\n"); } } --- 595,613 ---- if (null == spot) { ! if (GameBase.game.spawnpoint.length() == 0) { ! // there wasn't a spawnpoint without a ! // target, so use any ! es = GameBase.G_Find(es, GameBase.findByClass, ! "info_player_start"); ! ! if (es != null) ! spot = es.o; } if (null == spot) + { GameBase.gi.error("Couldn't find spawn point " + GameBase.game.spawnpoint + "\n"); + return; + } } } |
|
From: Rene S. <sa...@us...> - 2005-02-19 19:35:51
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6147/src/jake2/game Modified Files: Tag: RST GameUtil.java Log Message: enabled pick up developer message Index: GameUtil.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameUtil.java,v retrieving revision 1.7.6.3 retrieving revision 1.7.6.4 diff -C2 -d -r1.7.6.3 -r1.7.6.4 *** GameUtil.java 23 Jan 2005 21:31:44 -0000 1.7.6.3 --- GameUtil.java 19 Feb 2005 19:35:40 -0000 1.7.6.4 *************** *** 1504,1508 **** if (!taken) return; ! //Com.p("Picked up:" + ent.classname); if (!((GameBase.coop.value != 0) && (ent.item.flags & Defines.IT_STAY_COOP) != 0) --- 1504,1509 ---- if (!taken) return; ! ! Com.dprintln("Picked up:" + ent.classname); if (!((GameBase.coop.value != 0) && (ent.item.flags & Defines.IT_STAY_COOP) != 0) |
2 messages has been excluded from this view by a project administrator.
