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: Holger Z. <hz...@us...> - 2006-02-13 10:55:40
|
Update of /cvsroot/jake2/jake2/test/jake2/render In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1536/test/jake2/render Removed Files: Tag: r_0_9_5 DebugCulling.java TestRenderer.java DancingQueens.java DisposeBuffer.java TestMap.java Log Message: 0.9.5 release preparation --- TestMap.java DELETED --- --- DebugCulling.java DELETED --- --- DisposeBuffer.java DELETED --- --- TestRenderer.java DELETED --- --- DancingQueens.java DELETED --- |
|
From: Holger Z. <hz...@us...> - 2006-02-13 10:55:40
|
Update of /cvsroot/jake2/jake2/test/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1536/test/jake2/qcommon Removed Files: Tag: r_0_9_5 TestMD4.java TestLoadGame.java TestLoadMap.java TestINFO.java TestCOM.java TestMSG.java TestCMD.java TestRotatePointAroundVector.java TestCvar.java Log Message: 0.9.5 release preparation --- TestCOM.java DELETED --- --- TestMSG.java DELETED --- --- TestRotatePointAroundVector.java DELETED --- --- TestLoadGame.java DELETED --- --- TestCvar.java DELETED --- --- TestLoadMap.java DELETED --- --- TestMD4.java DELETED --- --- TestINFO.java DELETED --- --- TestCMD.java DELETED --- |
|
From: Holger Z. <hz...@us...> - 2006-02-13 10:55:39
|
Update of /cvsroot/jake2/jake2/test/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1536/test/jake2/client Removed Files: Tag: r_0_9_5 GhostMouse.java CircleListener.java Log Message: 0.9.5 release preparation --- CircleListener.java DELETED --- --- GhostMouse.java DELETED --- |
|
From: Holger Z. <hz...@us...> - 2006-02-13 10:09:32
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19173 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/jake2/jake2/ChangeLog,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ChangeLog 26 May 2005 16:56:31 -0000 1.8 --- ChangeLog 13 Feb 2006 10:09:23 -0000 1.9 *************** *** 1,2 **** --- 1,10 ---- + 0.9.5 + + - quake video (cinematics) support including sound streaming + - save games are from now on build compatible + - support for arbitrary sound sample rates + - dedicated server mode + - lots of bugfixes + 0.9.4 2005-05-26 |
|
From: Holger Z. <hz...@us...> - 2006-02-13 10:06:13
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17696/src/jake2/qcommon Modified Files: Qcommon.java Log Message: Index: Qcommon.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Qcommon.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Qcommon.java 15 Jan 2006 15:34:38 -0000 1.21 --- Qcommon.java 13 Feb 2006 10:05:55 -0000 1.22 *************** *** 45,50 **** public final class Qcommon extends Globals { ! public static final String BUILDSTRING = "Java"; ! public static final String CPUSTRING = "jvm"; /** --- 45,50 ---- public final class Qcommon extends Globals { ! public static final String BUILDSTRING = "Java " + System.getProperty("java.version");; ! public static final String CPUSTRING = System.getProperty("os.arch"); /** |
|
From: Rene S. <sa...@us...> - 2006-01-21 21:53:44
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4615/src/jake2/client Modified Files: M.java Log Message: comment beautification Index: M.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/M.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** M.java 20 Nov 2005 22:18:34 -0000 1.8 --- M.java 21 Jan 2006 21:53:32 -0000 1.9 *************** *** 76,79 **** --- 76,84 ---- } } + + /** + * Returns false if any part of the bottom of the entity is off an edge that + * is not a staircase. + */ public static boolean M_CheckBottom(edict_t ent) { *************** *** 144,152 **** } ! /* ! * =============== ! * M_ChangeYaw ! * =============== ! *///ok public static void M_ChangeYaw(edict_t ent) { float ideal; --- 149,155 ---- } ! /** ! * M_ChangeYaw. ! */ public static void M_ChangeYaw(edict_t ent) { float ideal; *************** *** 181,188 **** } ! /* ! * ====================== ! * M_MoveToGoal ! * ====================== */ public static void M_MoveToGoal(edict_t ent, float dist) { --- 184,189 ---- } ! /** ! * M_MoveToGoal. */ public static void M_MoveToGoal(edict_t ent, float dist) { *************** *** 205,212 **** } ! /* ! * =============== ! * M_walkmove ! * =============== */ public static boolean M_walkmove(edict_t ent, float yaw, float dist) { --- 206,211 ---- } ! /** ! * M_walkmove. */ public static boolean M_walkmove(edict_t ent, float yaw, float dist) { |
|
From: Rene S. <sa...@us...> - 2006-01-21 21:53:44
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4615/src/jake2/game Modified Files: game_import_t.java GameTarget.java GameBase.java Cmd.java GameFunc.java GameSpawn.java GameMisc.java GameChase.java GameTurret.java GameTrigger.java GameItems.java GameCombat.java GameItemList.java GameSave.java GameSVCmds.java gclient_t.java Log Message: comment beautification Index: GameTarget.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameTarget.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GameTarget.java 20 Nov 2005 22:18:33 -0000 1.7 --- GameTarget.java 21 Jan 2006 21:53:31 -0000 1.8 *************** *** 45,51 **** if (GameBase.st.noise.indexOf(".wav") < 0) buffer = "" + GameBase.st.noise + ".wav"; - //Com_sprintf(buffer, sizeof(buffer), "%s.wav", st.noise); else - //strncpy(buffer, st.noise, sizeof(buffer)); buffer = GameBase.st.noise; --- 45,49 ---- *************** *** 71,75 **** } ! /* * QUAKED target_help (1 0 1) (-16 -16 -24) (16 16 24) help1 When fired, the * "message" key becomes the current personal computer string, and the --- 69,73 ---- } ! /** * QUAKED target_help (1 0 1) (-16 -16 -24) (16 16 24) help1 When fired, the * "message" key becomes the current personal computer string, and the *************** *** 263,267 **** } ! /* * QUAKED target_temp_entity (1 0 0) (-8 -8 -8) (8 8 8) Fire an origin based * temp entity event to the clients. "style" type byte --- 261,265 ---- } ! /** * QUAKED target_temp_entity (1 0 0) (-8 -8 -8) (8 8 8) Fire an origin based * temp entity event to the clients. "style" type byte *************** *** 277,283 **** }; ! //========================================================== ! ! /* * QUAKED target_speaker (1 0 0) (-8 -8 -8) (8 8 8) looped-on looped-off * reliable "noise" wav file to play "attenuation" -1 = none, send to whole --- 275,279 ---- }; ! /** * QUAKED target_speaker (1 0 0) (-8 -8 -8) (8 8 8) looped-on looped-off * reliable "noise" wav file to play "attenuation" -1 = none, send to whole *************** *** 316,320 **** }; ! //========================================================== public static EntUseAdapter Use_Target_Help = new EntUseAdapter() { public String getID() { return "Use_Target_Help"; } --- 312,316 ---- }; ! public static EntUseAdapter Use_Target_Help = new EntUseAdapter() { public String getID() { return "Use_Target_Help"; } *************** *** 330,336 **** }; ! //========================================================== ! ! /* * QUAKED target_secret (1 0 1) (-8 -8 -8) (8 8 8) Counts a secret found. * These are single use targets. --- 326,330 ---- }; ! /** * QUAKED target_secret (1 0 1) (-8 -8 -8) (8 8 8) Counts a secret found. * These are single use targets. *************** *** 348,355 **** } }; ! ! //========================================================== ! ! /* * QUAKED target_goal (1 0 1) (-8 -8 -8) (8 8 8) Counts a goal completed. * These are single use targets. --- 342,347 ---- } }; ! ! /** * QUAKED target_goal (1 0 1) (-8 -8 -8) (8 8 8) Counts a goal completed. * These are single use targets. *************** *** 371,377 **** }; - //========================================================== ! /* * QUAKED target_explosion (1 0 0) (-8 -8 -8) (8 8 8) Spawns an explosion * temporary entity when used. --- 363,368 ---- }; ! /** * QUAKED target_explosion (1 0 0) (-8 -8 -8) (8 8 8) Spawns an explosion * temporary entity when used. *************** *** 417,423 **** }; ! //========================================================== ! ! /* * QUAKED target_changelevel (1 0 0) (-8 -8 -8) (8 8 8) Changes level to * "map" when fired --- 408,412 ---- }; ! /** * QUAKED target_changelevel (1 0 0) (-8 -8 -8) (8 8 8) Changes level to * "map" when fired *************** *** 461,467 **** }; ! //========================================================== ! ! /* * QUAKED target_splash (1 0 0) (-8 -8 -8) (8 8 8) Creates a particle splash * effect when used. --- 450,454 ---- }; ! /** * QUAKED target_splash (1 0 0) (-8 -8 -8) (8 8 8) Creates a particle splash * effect when used. *************** *** 490,496 **** }; ! //========================================================== ! ! /* * QUAKED target_spawner (1 0 0) (-8 -8 -8) (8 8 8) Set target to the type * of entity you want spawned. Useful for spawning monsters and gibs in the --- 477,481 ---- }; ! /** * QUAKED target_spawner (1 0 0) (-8 -8 -8) (8 8 8) Set target to the type * of entity you want spawned. Useful for spawning monsters and gibs in the *************** *** 521,527 **** }; ! //========================================================== ! ! /* * QUAKED target_blaster (1 0 0) (-8 -8 -8) (8 8 8) NOTRAIL NOEFFECTS Fires * a blaster bolt in the set direction when triggered. --- 506,510 ---- }; ! /** * QUAKED target_blaster (1 0 0) (-8 -8 -8) (8 8 8) NOTRAIL NOEFFECTS Fires * a blaster bolt in the set direction when triggered. *************** *** 551,557 **** }; ! //========================================================== ! ! /* * QUAKED target_crosslevel_trigger (.5 .5 .5) (-8 -8 -8) (8 8 8) trigger1 * trigger2 trigger3 trigger4 trigger5 trigger6 trigger7 trigger8 Once this --- 534,538 ---- }; ! /** * QUAKED target_crosslevel_trigger (.5 .5 .5) (-8 -8 -8) (8 8 8) trigger1 * trigger2 trigger3 trigger4 trigger5 trigger6 trigger7 trigger8 Once this *************** *** 569,573 **** }; ! /* * QUAKED target_crosslevel_target (.5 .5 .5) (-8 -8 -8) (8 8 8) trigger1 * trigger2 trigger3 trigger4 trigger5 trigger6 trigger7 trigger8 Triggered --- 550,554 ---- }; ! /** * QUAKED target_crosslevel_target (.5 .5 .5) (-8 -8 -8) (8 8 8) trigger1 * trigger2 trigger3 trigger4 trigger5 trigger6 trigger7 trigger8 Triggered *************** *** 590,596 **** }; ! //========================================================== ! ! /* * QUAKED target_laser (0 .5 .8) (-8 -8 -8) (8 8 8) START_ON RED GREEN BLUE * YELLOW ORANGE FAT When triggered, fires a laser. You can either set a --- 571,575 ---- }; ! /** * QUAKED target_laser (0 .5 .8) (-8 -8 -8) (8 8 8) START_ON RED GREEN BLUE * YELLOW ORANGE FAT When triggered, fires a laser. You can either set a *************** *** 616,622 **** if (self.enemy != null) { Math3D.VectorCopy(self.movedir, last_movedir); ! Math3D ! .VectorMA(self.enemy.absmin, 0.5f, self.enemy.size, ! point); Math3D.VectorSubtract(point, self.s.origin, self.movedir); Math3D.VectorNormalize(self.movedir); --- 595,599 ---- if (self.enemy != null) { Math3D.VectorCopy(self.movedir, last_movedir); ! Math3D.VectorMA(self.enemy.absmin, 0.5f, self.enemy.size, point); Math3D.VectorSubtract(point, self.s.origin, self.movedir); Math3D.VectorNormalize(self.movedir); *************** *** 688,693 **** public boolean think(edict_t self) { - edict_t ent; - self.movetype = Defines.MOVETYPE_NONE; self.solid = Defines.SOLID_NOT; --- 665,668 ---- *************** *** 744,750 **** }; ! //========================================================== ! ! /* * QUAKED target_lightramp (0 .5 .8) (-8 -8 -8) (8 8 8) TOGGLE speed How * many seconds the ramping will take message two letters; starting --- 719,723 ---- }; ! /** * QUAKED target_lightramp (0 .5 .8) (-8 -8 -8) (8 8 8) TOGGLE speed How * many seconds the ramping will take message two letters; starting *************** *** 821,827 **** }; ! //========================================================== ! ! /* * QUAKED target_earthquake (1 0 0) (-8 -8 -8) (8 8 8) When triggered, this * initiates a level-wide earthquake. All players and monsters are affected. --- 794,798 ---- }; ! /** * QUAKED target_earthquake (1 0 0) (-8 -8 -8) (8 8 8) When triggered, this * initiates a level-wide earthquake. All players and monsters are affected. Index: GameSVCmds.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameSVCmds.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GameSVCmds.java 22 Sep 2004 19:22:05 -0000 1.3 --- GameSVCmds.java 21 Jan 2006 21:53:32 -0000 1.4 *************** *** 34,39 **** public class GameSVCmds { ! /* ! * ============================================================================== * * PACKET FILTERING --- 34,38 ---- public class GameSVCmds { ! /** * * PACKET FILTERING *************** *** 66,71 **** * your local network. * - * - * ============================================================================== */ --- 65,68 ---- *************** *** 90,101 **** } ! /* ! * ================= StringToFilter ================= */ static boolean StringToFilter(String s, GameSVCmds.ipfilter_t f) { ! //char num[128]; ! String num; ! int i, j; ! byte b[] = { 0, 0, 0, 0 }; byte m[] = { 0, 0, 0, 0 }; --- 87,96 ---- } ! /** ! * StringToFilter. */ static boolean StringToFilter(String s, GameSVCmds.ipfilter_t f) { ! ! byte b[] = { 0, 0, 0, 0 }; byte m[] = { 0, 0, 0, 0 }; *************** *** 120,125 **** } ! /* ! * ================= SV_FilterPacket ================= */ static boolean SV_FilterPacket(String from) { --- 115,120 ---- } ! /** ! * SV_FilterPacket. */ static boolean SV_FilterPacket(String from) { *************** *** 158,163 **** } ! /* ! * ================= SV_AddIP_f ================= */ static void SVCmd_AddIP_f() { --- 153,158 ---- } ! /** ! * SV_AddIP_f. */ static void SVCmd_AddIP_f() { *************** *** 186,191 **** } ! /* ! * ================= SV_RemoveIP_f ================= */ static void SVCmd_RemoveIP_f() { --- 181,186 ---- } ! /** ! * SV_RemoveIP_f. */ static void SVCmd_RemoveIP_f() { *************** *** 215,220 **** } ! /* ! * ================= SV_ListIP_f ================= */ static void SVCmd_ListIP_f() { --- 210,215 ---- } ! /** ! * SV_ListIP_f. */ static void SVCmd_ListIP_f() { *************** *** 232,237 **** } ! /* ! * ================= SV_WriteIP_f ================= */ static void SVCmd_WriteIP_f() { --- 227,232 ---- } ! /** ! * SV_WriteIP_f. */ static void SVCmd_WriteIP_f() { *************** *** 251,256 **** name = game.string + "/listip.cfg"; ! GameBase.gi ! .cprintf(null, Defines.PRINT_HIGH, "Writing " + name + ".\n"); f = Lib.fopen(name, "rw"); --- 246,250 ---- name = game.string + "/listip.cfg"; ! GameBase.gi.cprintf(null, Defines.PRINT_HIGH, "Writing " + name + ".\n"); f = Lib.fopen(name, "rw"); *************** *** 278,287 **** } ! /* ! * ================= ServerCommand * * ServerCommand will be called when an "sv" command is issued. The game can * issue gi.argc() / gi.argv() commands to get the rest of the parameters - * ================= */ public static void ServerCommand() { --- 272,280 ---- } ! /** ! * ServerCommand * * ServerCommand will be called when an "sv" command is issued. The game can * issue gi.argc() / gi.argv() commands to get the rest of the parameters */ public static void ServerCommand() { Index: GameSave.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameSave.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** GameSave.java 20 Nov 2005 22:18:33 -0000 1.10 --- GameSave.java 21 Jan 2006 21:53:32 -0000 1.11 *************** *** 113,123 **** }; ! /* ! * ============ * InitGame * * This will be called when the dll is first loaded, which only happens when * a new game is started or a save game is loaded. - * ============ */ public static void InitGame() { --- 113,121 ---- }; ! /** * InitGame * * This will be called when the dll is first loaded, which only happens when * a new game is started or a save game is loaded. */ public static void InitGame() { *************** *** 221,226 **** } ! /* ! * ============ WriteGame * * This will be called whenever the game goes to a new level, and when the --- 219,224 ---- } ! /** ! * WriteGame * * This will be called whenever the game goes to a new level, and when the *************** *** 231,235 **** * * A single player death will automatically restore from the last save ! * position. ============ */ public static void WriteGame(String filename, boolean autosave) { --- 229,233 ---- * * A single player death will automatically restore from the last save ! * position. */ public static void WriteGame(String filename, boolean autosave) { *************** *** 282,289 **** } ! /* ! * ================= WriteLevel ! * ! * ================= */ public static void WriteLevel(String filename) { --- 280,285 ---- } ! /** ! * WriteLevel */ public static void WriteLevel(String filename) { *************** *** 307,311 **** f.writeInt(i); ent.write(f); - } --- 303,306 ---- *************** *** 319,324 **** } ! /* ! * ================= ReadLevel * * SpawnEntities will allready have been called on the level the same way it --- 314,319 ---- } ! /** ! * ReadLevel * * SpawnEntities will allready have been called on the level the same way it *************** *** 330,335 **** * ReadLevel. * ! * No clients are connected yet. ! * ================= */ public static void ReadLevel(String filename) { --- 325,329 ---- * ReadLevel. * ! * No clients are connected yet. */ public static void ReadLevel(String filename) { Index: GameSpawn.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameSpawn.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** GameSpawn.java 12 Dec 2005 21:47:30 -0000 1.16 --- GameSpawn.java 21 Jan 2006 21:53:32 -0000 1.17 *************** *** 105,118 **** }; ! // static EntThinkAdapter SP_func_rotating = new EntThinkAdapter() {public ! // boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_func_button = new EntThinkAdapter() {public ! // boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_func_door = new EntThinkAdapter() {public ! // boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_func_door_secret = new EntThinkAdapter() ! // {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_func_door_rotating = new EntThinkAdapter() ! // {public boolean think(edict_t ent){ return true;}}; static EntThinkAdapter SP_func_water = new EntThinkAdapter() { public String getID(){ return "SP_func_water"; } --- 105,109 ---- }; ! static EntThinkAdapter SP_func_water = new EntThinkAdapter() { public String getID(){ return "SP_func_water"; } *************** *** 131,146 **** }; - // static EntThinkAdapter SP_func_conveyor = new EntThinkAdapter() {public - // boolean think(edict_t ent){ return true;}}; - // static EntThinkAdapter SP_func_wall = new EntThinkAdapter() {public - // boolean think(edict_t ent){ return true;}}; - // static EntThinkAdapter SP_func_object = new EntThinkAdapter() {public - // boolean think(edict_t ent){ return true;}}; - // static EntThinkAdapter SP_func_explosive = new EntThinkAdapter() {public - // boolean think(edict_t ent){ return true;}}; - // static EntThinkAdapter SP_func_timer = new EntThinkAdapter() {public - // boolean think(edict_t ent){ return true;}}; - // static EntThinkAdapter SP_func_areaportal = new EntThinkAdapter() {public - // boolean think(edict_t ent){ return true;}}; static EntThinkAdapter SP_func_clock = new EntThinkAdapter() { public String getID(){ return "SP_func_clock"; } --- 122,125 ---- *************** *** 151,155 **** }; ! /* * QUAKED worldspawn (0 0 0) ? * --- 130,134 ---- }; ! /** * QUAKED worldspawn (0 0 0) ? * *************** *** 286,290 **** GameBase.gi.modelindex("models/objects/gibs/head2/tris.md2"); // ! // Setup light animation tables. 'a' is total darkness, 'z' is // doublebright. // --- 265,269 ---- GameBase.gi.modelindex("models/objects/gibs/head2/tris.md2"); // ! // Setup light animation tables. 'a' is total darkness, 'z' is // doublebright. // *************** *** 330,337 **** }; ! /* ! * ============= ! * ED_NewString ! * ============= */ static String ED_NewString(String string) { --- 309,314 ---- }; ! /** ! * ED_NewString. */ static String ED_NewString(String string) { *************** *** 355,369 **** } ! /* ! * =============== * ED_ParseField * ! * Takes a key/value pair and sets the binary values in an edict ! * =============== */ static void ED_ParseField(String key, String value, edict_t ent) { - byte b; - float v; - float[] vec = { 0, 0, 0 }; if (key.equals("nextmap")) --- 332,341 ---- } ! /** * ED_ParseField * ! * Takes a key/value pair and sets the binary values in an edict. */ static void ED_ParseField(String key, String value, edict_t ent) { if (key.equals("nextmap")) *************** *** 376,386 **** } ! /* ! * ==================== * ED_ParseEdict * * Parses an edict out of the given string, returning the new position ed ! * should be a properly initialized empty edict. ! * ==================== */ --- 348,356 ---- } ! /** * ED_ParseEdict * * Parses an edict out of the given string, returning the new position ed ! * should be a properly initialized empty edict. */ *************** *** 431,436 **** } ! /* ! * ================ * G_FindTeams * --- 401,405 ---- } ! /** * G_FindTeams * *************** *** 438,443 **** * * All but the first will have the FL_TEAMSLAVE flag set. All but the last ! * will have the teamchain field set to the next one ! * ================ */ --- 407,411 ---- * * All but the first will have the FL_TEAMSLAVE flag set. All but the last ! * will have the teamchain field set to the next one. */ *************** *** 461,465 **** c++; c2++; ! //Com.Printf("Team:" + e.team+" entity: " + e.index + "\n"); for (j = i + 1; j < GameBase.num_edicts; j++) { e2 = GameBase.g_edicts[j]; --- 429,433 ---- c++; c2++; ! for (j = i + 1; j < GameBase.num_edicts; j++) { e2 = GameBase.g_edicts[j]; *************** *** 480,493 **** } } - //gi.dprintf("" + c + " teams with " + c2 + " entities\n"); } ! /* ! * ============== * SpawnEntities * * Creates a server's entity / program execution context by parsing textual ! * entity definitions out of an ent file. ! * ============== */ --- 448,458 ---- } } } ! /** * SpawnEntities * * Creates a server's entity / program execution context by parsing textual ! * entity definitions out of an ent file. */ *************** *** 513,524 **** PlayerClient.SaveClientData(); - //level.clear(); GameBase.level = new level_locals_t(); for (int n = 0; n < GameBase.game.maxentities; n++) { GameBase.g_edicts[n] = new edict_t(n); } ! //memset(g_edicts, 0, game.maxentities * sizeof(g_edicts[0])); GameBase.level.mapname = mapname; GameBase.game.spawnpoint = spawnpoint; // set client fields on player ents for (i = 0; i < GameBase.game.maxclients; i++) --- 478,489 ---- PlayerClient.SaveClientData(); GameBase.level = new level_locals_t(); for (int n = 0; n < GameBase.game.maxentities; n++) { GameBase.g_edicts[n] = new edict_t(n); } ! GameBase.level.mapname = mapname; GameBase.game.spawnpoint = spawnpoint; + // set client fields on player ents for (i = 0; i < GameBase.game.maxclients; i++) *************** *** 527,535 **** ent = null; inhibit = 0; - // parse ents - //Com.Printf("========================\n"); - //Com.Printf("entities(" + entities.length() + ") = \n" + entities + - // "\n"); - //Com.Printf("========================\n"); Com.ParseHelp ph = new Com.ParseHelp(entities); --- 492,495 ---- *************** *** 1204,1213 **** }), new spawn_t(null, null) }; ! /* ! * =============== * ED_CallSpawn * ! * Finds the spawn function for the entity and calls it ! * =============== */ public static void ED_CallSpawn(edict_t ent) { --- 1164,1171 ---- }), new spawn_t(null, null) }; ! /** * ED_CallSpawn * ! * Finds the spawn function for the entity and calls it. */ public static void ED_CallSpawn(edict_t ent) { *************** *** 1246,1249 **** GameBase.gi.dprintf(ent.classname + " doesn't have a spawn function\n"); } - } \ No newline at end of file --- 1204,1206 ---- Index: gclient_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/gclient_t.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gclient_t.java 21 Jan 2006 14:00:53 -0000 1.6 --- gclient_t.java 21 Jan 2006 21:53:32 -0000 1.7 *************** *** 126,135 **** public int index; ! ! ! public void clear() { - player_state_t ps = new player_state_t(); ping =0; --- 126,132 ---- public int index; ! /** Clears the game client structure. */ public void clear() { ping =0; Index: GameItems.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameItems.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GameItems.java 17 Dec 2005 20:32:29 -0000 1.3 --- GameItems.java 21 Jan 2006 21:53:32 -0000 1.4 *************** *** 25,39 **** ! import java.util.StringTokenizer; ! ! import jake2.*; ! import jake2.client.*; ! import jake2.game.*; ! import jake2.qcommon.*; ! import jake2.render.*; ! import jake2.server.*; import jake2.util.Lib; import jake2.util.Math3D; public class GameItems { --- 25,35 ---- ! import jake2.Defines; ! import jake2.qcommon.Com; import jake2.util.Lib; import jake2.util.Math3D; + import java.util.StringTokenizer; + public class GameItems { Index: GameFunc.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameFunc.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** GameFunc.java 20 Nov 2005 22:18:33 -0000 1.8 --- GameFunc.java 21 Jan 2006 21:53:32 -0000 1.9 *************** *** 67,75 **** } ! /* ! * ============== Think_AccelMove * * The team has completed a frame of movement, so change the speed for the ! * next frame ============== */ static float AccelerationDistance(float target, float rate) { --- 67,75 ---- } ! /** ! * Think_AccelMove * * The team has completed a frame of movement, so change the speed for the ! * next frame. */ static float AccelerationDistance(float target, float rate) { *************** *** 231,235 **** } ! /* * QUAKED func_plat (0 .5 .8) ? PLAT_LOW_TRIGGER speed default 150 * --- 231,235 ---- } ! /** * QUAKED func_plat (0 .5 .8) ? PLAT_LOW_TRIGGER speed default 150 * *************** *** 314,329 **** } ! /* ! * ====================================================================== ! * * DOORS * * spawn a trigger surrounding the entire team unless it is already targeted ! * by another * - * ====================================================================== */ ! /* * QUAKED func_door (0 .5 .8) ? START_OPEN x CRUSHER NOMONSTER ANIMATED * TOGGLE ANIMATED_FAST TOGGLE wait in both the start and end states for a --- 314,326 ---- } ! /** * DOORS * * spawn a trigger surrounding the entire team unless it is already targeted ! * by another. * */ ! /** * QUAKED func_door (0 .5 .8) ? START_OPEN x CRUSHER NOMONSTER ANIMATED * TOGGLE ANIMATED_FAST TOGGLE wait in both the start and end states for a *************** *** 388,392 **** } ! /* * QUAKED func_water (0 .5 .8) ? START_OPEN func_water is a moveable water * brush. It must be targeted to operate. Use a non-water texture at your --- 385,389 ---- } ! /** * QUAKED func_water (0 .5 .8) ? START_OPEN func_water is a moveable water * brush. It must be targeted to operate. Use a non-water texture at your *************** *** 549,555 **** } ! /* ! * ========================================================= ! * * PLATS * --- 546,550 ---- } ! /** * PLATS * *************** *** 566,571 **** * disabled? auto trigger spawning * - * - * ========================================================= */ --- 561,564 ---- *************** *** 858,864 **** }; ! // ==================================================================== ! ! /* * QUAKED func_rotating (0 .5 .8) ? START_ON REVERSE X_AXIS Y_AXIS * TOUCH_PAIN STOP ANIMATED ANIMATED_FAST You need to have an origin brush --- 851,855 ---- }; ! /** * QUAKED func_rotating (0 .5 .8) ? START_ON REVERSE X_AXIS Y_AXIS * TOUCH_PAIN STOP ANIMATED ANIMATED_FAST You need to have an origin brush *************** *** 1360,1366 **** return; ! // if a door has a negative wait, it would never come back if // blocked, ! // so let it just squash the object to death real fast if (self.moveinfo.wait >= 0) { if (self.moveinfo.state == STATE_DOWN) { --- 1351,1357 ---- return; ! // if a door has a negative wait, it would never come back if // blocked, ! // so let it just squash the object to death real fast if (self.moveinfo.wait >= 0) { if (self.moveinfo.state == STATE_DOWN) { *************** *** 2077,2081 **** public String getID() { return "door_secret_move6";} public boolean think(edict_t self) { - Move_Calc(self, Globals.vec3_origin, door_secret_done); return true; --- 2068,2071 ---- *************** *** 2198,2202 **** }; ! /* * QUAKED func_killbox (1 0 0) ? Kills everything inside when fired, * irrespective of protection. --- 2188,2192 ---- }; ! /** * QUAKED func_killbox (1 0 0) ? Kills everything inside when fired, * irrespective of protection. Index: GameMisc.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameMisc.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GameMisc.java 20 Nov 2005 22:18:33 -0000 1.6 --- GameMisc.java 21 Jan 2006 21:53:32 -0000 1.7 *************** *** 662,666 **** } ! /* * QUAKED misc_teleporter (1 0 0) (-32 -32 -24) (32 32 -16) Stepping onto * this disc will teleport players to the targeted misc_teleporter_dest --- 662,666 ---- } ! /** * QUAKED misc_teleporter (1 0 0) (-32 -32 -24) (32 32 -16) Stepping onto * this disc will teleport players to the targeted misc_teleporter_dest *************** *** 697,701 **** } ! /* * QUAKED func_group (0 0 0) ? Used to group brushes together just for * editor convenience. --- 697,701 ---- } ! /** * QUAKED func_group (0 0 0) ? Used to group brushes together just for * editor convenience. *************** *** 903,907 **** } - //===================================================== public static EntUseAdapter Use_Areaportal = new EntUseAdapter() { public String getID() { return "use_areaportal";} --- 903,906 ---- *************** *** 913,917 **** }; ! /* * QUAKED func_areaportal (0 0 0) ? * --- 912,916 ---- }; ! /** * QUAKED func_areaportal (0 0 0) ? * *************** *** 930,934 **** }; ! /* * QUAKED path_corner (.5 .3 0) (-8 -8 -8) (8 8 8) TELEPORT Target: next * path corner Pathtarget: gets used when an entity that has this --- 929,933 ---- }; ! /** * QUAKED path_corner (.5 .3 0) (-8 -8 -8) (8 8 8) TELEPORT Target: next * path corner Pathtarget: gets used when an entity that has this *************** *** 1933,1938 **** }; ! /* ! * ================= debris ================= */ public static EntDieAdapter debris_die = new EntDieAdapter() { --- 1932,1937 ---- }; ! /** ! * Debris */ public static EntDieAdapter debris_die = new EntDieAdapter() { Index: GameItemList.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameItemList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GameItemList.java 20 Nov 2005 22:18:34 -0000 1.1 --- GameItemList.java 21 Jan 2006 21:53:32 -0000 1.2 *************** *** 43,47 **** // new gitem_t( ! /* * QUAKED item_armor_body (.3 .3 1) (-16 -16 -16) (16 16 16) */ --- 43,48 ---- // new gitem_t( ! ! /** * QUAKED item_armor_body (.3 .3 1) (-16 -16 -16) (16 16 16) */ *************** *** 757,762 **** // end of list marker null }; - - public static void main(String[] args) { - } } --- 758,760 ---- Index: GameTrigger.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameTrigger.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GameTrigger.java 14 Dec 2005 21:08:03 -0000 1.7 --- GameTrigger.java 21 Jan 2006 21:53:32 -0000 1.8 *************** *** 47,52 **** // the trigger was just activated // ent.activator should be set to the activator so it can be held through a ! // delay ! // so wait for the delay time before firing public static void multi_trigger(edict_t ent) { if (ent.nextthink != 0) --- 47,51 ---- // the trigger was just activated // ent.activator should be set to the activator so it can be held through a ! // delay so wait for the delay time before firing public static void multi_trigger(edict_t ent) { if (ent.nextthink != 0) *************** *** 97,101 **** } ! /* * QUAKED trigger_once (.5 .5 .5) ? x x TRIGGERED Triggers once, then * removes itself. You must set the key "target" to the name of another --- 96,100 ---- } ! /** * QUAKED trigger_once (.5 .5 .5) ? x x TRIGGERED Triggers once, then * removes itself. You must set the key "target" to the name of another *************** *** 286,290 **** }; ! /* * QUAKED trigger_multiple (.5 .5 .5) ? MONSTER NOT_PLAYER TRIGGERED * Variable sized repeatable trigger. Must be targeted at one or more --- 285,289 ---- }; ! /** * QUAKED trigger_multiple (.5 .5 .5) ? MONSTER NOT_PLAYER TRIGGERED * Variable sized repeatable trigger. Must be targeted at one or more *************** *** 302,306 **** }; ! /* * QUAKED trigger_relay (.5 .5 .5) (-8 -8 -8) (8 8 8) This fixed size * trigger cannot be touched, it can only be fired by other events. --- 301,305 ---- }; ! /** * QUAKED trigger_relay (.5 .5 .5) (-8 -8 -8) (8 8 8) This fixed size * trigger cannot be touched, it can only be fired by other events. *************** *** 321,325 **** */ ! /* * QUAKED trigger_key (.5 .5 .5) (-8 -8 -8) (8 8 8) A relay trigger that * only fires it's targets if player has the proper key. Use "item" to --- 320,324 ---- */ ! /** * QUAKED trigger_key (.5 .5 .5) (-8 -8 -8) (8 8 8) A relay trigger that * only fires it's targets if player has the proper key. Use "item" to *************** *** 344,350 **** GameBase.gi.centerprintf(activator, "You need the " + self.item.pickup_name); ! GameBase.gi ! .sound(activator, Defines.CHAN_AUTO, GameBase.gi ! .soundindex("misc/keytry.wav"), 1, Defines.ATTN_NORM, 0); return; --- 343,348 ---- GameBase.gi.centerprintf(activator, "You need the " + self.item.pickup_name); ! GameBase.gi.sound(activator, Defines.CHAN_AUTO, ! GameBase.gi.soundindex("misc/keytry.wav"), 1, Defines.ATTN_NORM, 0); return; *************** *** 541,545 **** */ ! /* * QUAKED trigger_gravity (.5 .5 .5) ? Changes the touching entites gravity * to the value of "gravity". 1.0 is standard gravity for the level. --- 539,543 ---- */ ! /** * QUAKED trigger_gravity (.5 .5 .5) ? Changes the touching entites gravity * to the value of "gravity". 1.0 is standard gravity for the level. *************** *** 563,567 **** */ ! /* * QUAKED trigger_monsterjump (.5 .5 .5) ? Walking monsters that touch this * will jump in the direction of the trigger's angle "speed" default to 200, --- 561,565 ---- */ ! /** * QUAKED trigger_monsterjump (.5 .5 .5) ? Walking monsters that touch this * will jump in the direction of the trigger's angle "speed" default to 200, Index: GameTurret.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameTurret.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GameTurret.java 20 Nov 2005 22:18:34 -0000 1.6 --- GameTurret.java 21 Jan 2006 21:53:32 -0000 1.7 *************** *** 54,58 **** } ! /* * QUAKED turret_breach (0 0 0) ? This portion of the turret can change both * pitch and yaw. The model should be made with a flat pitch. It (and the --- 54,58 ---- } ! /** * QUAKED turret_breach (0 0 0) ? This portion of the turret can change both * pitch and yaw. The model should be made with a flat pitch. It (and the *************** *** 119,123 **** } ! /* * QUAKED turret_base (0 0 0) ? This portion of the turret changes yaw only. * MUST be teamed with a turret_breach. --- 119,123 ---- } ! /** * QUAKED turret_base (0 0 0) ? This portion of the turret changes yaw only. * MUST be teamed with a turret_breach. *************** *** 281,292 **** angle = self.s.angles[1] + self.owner.move_origin[1]; angle *= (Math.PI * 2 / 360); ! target[0] = GameTurret ! .SnapToEights((float) (self.s.origin[0] + Math ! .cos(angle) ! * self.owner.move_origin[0])); ! target[1] = GameTurret ! .SnapToEights((float) (self.s.origin[1] + Math ! .sin(angle) ! * self.owner.move_origin[0])); target[2] = self.owner.s.origin[2]; --- 281,288 ---- angle = self.s.angles[1] + self.owner.move_origin[1]; angle *= (Math.PI * 2 / 360); ! target[0] = GameTurret.SnapToEights((float) (self.s.origin[0] + ! Math.cos(angle) * self.owner.move_origin[0])); ! target[1] = GameTurret.SnapToEights((float) (self.s.origin[1] + ! Math.sin(angle) * self.owner.move_origin[0])); target[2] = self.owner.s.origin[2]; *************** *** 296,303 **** // z ! angle = self.s.angles[Defines.PITCH] ! * (float) (Math.PI * 2f / 360f); ! target_z = GameTurret ! .SnapToEights((float) (self.s.origin[2] + self.owner.move_origin[0] * Math.tan(angle) + self.owner.move_origin[2])); --- 292,297 ---- // z ! angle = self.s.angles[Defines.PITCH] * (float) (Math.PI * 2f / 360f); ! target_z = GameTurret.SnapToEights((float) (self.s.origin[2] + self.owner.move_origin[0] * Math.tan(angle) + self.owner.move_origin[2])); *************** *** 361,367 **** self.target_ent.teammaster.owner = null; ! //TODO: null appended as last missing argument, was unclean. rst ! M_Infantry.infantry_die ! .die(self, inflictor, attacker, damage, null); } }; --- 355,359 ---- self.target_ent.teammaster.owner = null; ! M_Infantry.infantry_die.die(self, inflictor, attacker, damage, null); } }; Index: GameBase.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameBase.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** GameBase.java 16 Dec 2005 21:15:50 -0000 1.12 --- GameBase.java 21 Jan 2006 21:53:31 -0000 1.13 *************** *** 152,167 **** } - /** - * SV_FlyMove - * - * The basic solid body movement clip that slides along multiple planes - * Returns the clipflags if the velocity was modified (hit something solid) - * 1 = floor 2 = wall / step 4 = dead stop - */ - public final static int MAX_CLIP_PLANES = 5; ! /* ! * ============= G_Find ! * * Searches all active entities for the next one that holds the matching * string at fieldofs (use the FOFS() macro) in the structure. --- 152,157 ---- } ! /** * Searches all active entities for the next one that holds the matching * string at fieldofs (use the FOFS() macro) in the structure. *************** *** 170,179 **** * will be returned if the end of the list is reached. * - * ============= - */ - - /** - * Finds an edict. Call with null as from parameter to search from array - * beginning. */ --- 160,163 ---- *************** *** 304,311 **** } ! /* ! * ============ G_TouchTriggers ! * ! * ============ */ --- 288,293 ---- } ! /** ! * G_TouchTriggers */ *************** *** 335,342 **** continue; - //rst: just for debugging player triggers - //if (ent.index == 1) - //Com.Printf("trigger:" + hit.classname + "(" + hit.index + ")\n"); - hit.touch.touch(hit, ent, dummyplane, null); } --- 317,320 ---- *************** *** 353,373 **** public static edict_t obstacle; - /* - * ============= M_CheckBottom - * - * Returns false if any part of the bottom of the entity is off an edge that - * is not a staircase. - * - * ============= - */ public static int c_yes, c_no; public static int STEPSIZE = 18; ! // ============================================================================ ! /* ! * ================ G_RunEntity ! * ! * ================ */ public static void G_RunEntity(edict_t ent) { --- 331,340 ---- public static edict_t obstacle; public static int c_yes, c_no; public static int STEPSIZE = 18; ! /** ! * G_RunEntity */ public static void G_RunEntity(edict_t ent) { *************** *** 401,411 **** } - /* - * ================ SV_NewChaseDir - * - * ================ - */ - public static int DI_NODIR = -1; - public static void ClearBounds(float[] mins, float[] maxs) { mins[0] = mins[1] = mins[2] = 99999; --- 368,371 ---- *************** *** 440,453 **** }; - //=================================================================== - public static void ShutdownGame() { gi.dprintf("==== ShutdownGame ====\n"); } ! //====================================================================== ! ! /* ! * ================= ClientEndServerFrames ================= */ public static void ClientEndServerFrames() { --- 400,409 ---- }; public static void ShutdownGame() { gi.dprintf("==== ShutdownGame ====\n"); } ! /** ! * ClientEndServerFrames. */ public static void ClientEndServerFrames() { *************** *** 466,473 **** } ! /* ! * ================= CreateTargetChangeLevel ! * ! * Returns the created target changelevel ================= */ public static edict_t CreateTargetChangeLevel(String map) { --- 422,427 ---- } ! /** ! * Returns the created target changelevel. */ public static edict_t CreateTargetChangeLevel(String map) { *************** *** 481,488 **** } ! /* ! * ================= EndDMLevel ! * ! * The timelimit or fraglimit has been exceeded ================= */ public static void EndDMLevel() { --- 435,440 ---- } ! /** ! * The timelimit or fraglimit has been exceeded. */ public static void EndDMLevel() { *************** *** 544,549 **** } ! /* ! * ================= CheckNeedPass ================= */ public static void CheckNeedPass() { --- 496,501 ---- } ! /** ! * CheckNeedPass. */ public static void CheckNeedPass() { *************** *** 568,573 **** } ! /* ! * ================= CheckDMRules ================= */ public static void CheckDMRules() { --- 520,525 ---- } ! /** ! * CheckDMRules. */ public static void CheckDMRules() { *************** *** 604,617 **** } ! /* ! * ============= ExitLevel ============= */ public static void ExitLevel() { int i; edict_t ent; - //char command[256]; - String command; ! command = "gamemap \"" + level.changemap + "\"\n"; gi.AddCommandString(command); level.changemap = null; --- 556,567 ---- } ! /** ! * Exits a level. */ public static void ExitLevel() { int i; edict_t ent; ! String command = "gamemap \"" + level.changemap + "\"\n"; gi.AddCommandString(command); level.changemap = null; *************** *** 628,638 **** ent.health = ent.client.pers.max_health; } - } ! /* ! * ================ G_RunFrame ! * ! * Advances the world by 0.1 seconds ================ */ public static void G_RunFrame() { --- 578,587 ---- ent.health = ent.client.pers.max_health; } } ! /** ! * G_RunFrame ! * ! * Advances the world by Defines.FRAMETIME (0.1) seconds. */ public static void G_RunFrame() { *************** *** 695,708 **** } ! /* ! * ================= GetGameAPI ! * ! * Returns a pointer to the structure with all entry points and global ! * variables ================= */ public static void GetGameApi(game_import_t imp) { gi = imp; - gi.pointcontents = new pmove_t.PointContentsAdapter() { public int pointcontents(float[] o) { --- 644,654 ---- } ! /** ! * This return a pointer to the structure with all entry points and global ! * variables. */ public static void GetGameApi(game_import_t imp) { gi = imp; gi.pointcontents = new pmove_t.PointContentsAdapter() { public int pointcontents(float[] o) { Index: game_import_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/game_import_t.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** game_import_t.java 14 Jan 2006 16:06:11 -0000 1.6 --- game_import_t.java 21 Jan 2006 21:53:31 -0000 1.7 *************** *** 66,70 **** // they connect, and changes are sent to all connected clients. public void configstring(int num, String string) { - //Com.Error(Defines.ERR_FATAL,"method is not implemented!"); SV_GAME.PF_Configstring(num, string); } --- 66,69 ---- *************** *** 177,185 **** } public cvar_t cvar_set(String var_name, String value) { return Cvar.Set(var_name, value); - //return null; } public cvar_t cvar_forceset(String var_name, String value) { return Cvar.ForceSet(var_name, value); --- 176,185 ---- } + // console variable interaction public cvar_t cvar_set(String var_name, String value) { return Cvar.Set(var_name, value); } + // console variable interaction public cvar_t cvar_forceset(String var_name, String value) { return Cvar.ForceSet(var_name, value); *************** *** 191,194 **** --- 191,195 ---- } + public String argv(int n) { return Cmd.Argv(n); *************** *** 196,200 **** // concatenation of all argv >= 1 - public String args() { return Cmd.Args(); --- 197,200 ---- Index: GameChase.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameChase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GameChase.java 16 Nov 2005 22:24:52 -0000 1.1 --- GameChase.java 21 Jan 2006 21:53:32 -0000 1.2 *************** *** 191,194 **** GameBase.gi.centerprintf(ent, "No other players to chase."); } - } --- 191,193 ---- Index: Cmd.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/Cmd.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Cmd.java 18 Dec 2005 17:08:27 -0000 1.17 --- Cmd.java 21 Jan 2006 21:53:32 -0000 1.18 *************** *** 148,152 **** /** ! * register our commands */ public static void Init() { --- 148,152 ---- /** ! * Register our commands. */ [...1045 lines suppressed...] + ShowPosition_f(ent); else // anything that doesn't match a command will be a chat *************** *** 1369,1376 **** } ! public static void ValidateSelectedItem(edict_t ent) { ! gclient_t cl; ! ! cl = ent.client; if (cl.pers.inventory[cl.pers.selected_item] != 0) --- 1284,1289 ---- } ! public static void ValidateSelectedItem(edict_t ent) { ! gclient_t cl = ent.client; if (cl.pers.inventory[cl.pers.selected_item] != 0) Index: GameCombat.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameCombat.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GameCombat.java 10 Dec 2005 22:45:01 -0000 1.2 --- GameCombat.java 21 Jan 2006 21:53:32 -0000 1.3 *************** *** 31,39 **** public class GameCombat { ! /* ! * ============ CanDamage * * Returns true if the inflictor can directly damage the target. Used for ! * explosions and melee attacks. ============ */ static boolean CanDamage(edict_t targ, edict_t inflictor) { --- 31,39 ---- public class GameCombat { ! /** ! * CanDamage * * Returns true if the inflictor can directly damage the target. Used for ! * explosions and melee attacks. */ static boolean CanDamage(edict_t targ, edict_t inflictor) { *************** *** 95,100 **** } ! /* ! * ============ Killed ============ */ public static void Killed(edict_t targ, edict_t inflictor, --- 95,100 ---- } ! /** ! * Killed. */ public static void Killed(edict_t targ, edict_t inflictor, *************** *** 104,108 **** targ.health = -999; - //Com.Println("Killed:" + targ.classname); targ.enemy = attacker; --- 104,107 ---- *************** *** 138,143 **** } ! /* ! * ================ SpawnDamage ================ */ static void SpawnDamage(int type, float[] origin, float[] normal, int damage) { --- 137,142 ---- } ! /** ! * SpawnDamage. */ static void SpawnDamage(int type, float[] origin, float[] normal, int damage) { *************** *** 352,357 **** } ! /* ! * ============ T_RadiusDamage ============ */ static void T_RadiusDamage(edict_t inflictor, edict_t attacker, --- 351,356 ---- } ! /** ! * T_RadiusDamage. */ static void T_RadiusDamage(edict_t inflictor, edict_t attacker, *************** *** 432,436 **** Math3D.VectorNormalize(dir); ! // bonus damage for suprising a monster if (0 == (dflags & Defines.DAMAGE_RADIUS) && (targ.svflags & Defines.SVF_MONSTER) != 0 --- 431,435 ---- Math3D.VectorNormalize(dir); ! // bonus damage for suprising a monster if (0 == (dflags & Defines.DAMAGE_RADIUS) && (targ.svflags & Defines.SVF_MONSTER) != 0 *************** *** 442,446 **** knockback = 0; ! // figure momentum add if (0 == (dflags & Defines.DAMAGE_NO_KNOCKBACK)) { if ((knockback != 0) && (targ.movetype != Defines.MOVETYPE_NONE) --- 441,445 ---- knockback = 0; ! // figure momentum add if (0 == (dflags & Defines.DAMAGE_NO_KNOCKBACK)) { if ((knockback != 0) && (targ.movetype != Defines.MOVETYPE_NONE) *************** *** 552,555 **** } } - } --- 551,553 ---- |
|
From: Rene S. <sa...@us...> - 2006-01-21 21:53:44
|
Update of /cvsroot/jake2/jake2/src/jake2/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4615/src/jake2/server Modified Files: SV.java SV_GAME.java Log Message: comment beautification Index: SV.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** SV.java 20 Feb 2005 21:50:37 -0000 1.11 --- SV.java 21 Jan 2006 21:53:32 -0000 1.12 *************** *** 112,115 **** --- 112,124 ---- e2.touch.touch(e2, e1, GameBase.dummyplane, null); } + + /** + * SV_FlyMove + * + * The basic solid body movement clip that slides along multiple planes + * Returns the clipflags if the velocity was modified (hit something solid) + * 1 = floor 2 = wall / step 4 = dead stop + */ + public final static int MAX_CLIP_PLANES = 5; public static int SV_FlyMove(edict_t ent, float time, int mask) { *************** *** 119,123 **** float d; int numplanes; ! float[][] planes = new float[GameBase.MAX_CLIP_PLANES][3]; float[] primal_velocity = { 0.0f, 0.0f, 0.0f }; float[] original_velocity = { 0.0f, 0.0f, 0.0f }; --- 128,132 ---- float d; int numplanes; ! float[][] planes = new float[MAX_CLIP_PLANES][3]; float[] primal_velocity = { 0.0f, 0.0f, 0.0f }; float[] original_velocity = { 0.0f, 0.0f, 0.0f }; *************** *** 183,187 **** // cliped to another plane ! if (numplanes >= GameBase.MAX_CLIP_PLANES) { // this shouldn't // really happen Math3D.VectorCopy(Globals.vec3_origin, ent.velocity); --- 192,196 ---- // cliped to another plane ! if (numplanes >= MAX_CLIP_PLANES) { // this shouldn't // really happen Math3D.VectorCopy(Globals.vec3_origin, ent.velocity); *************** *** 236,243 **** } ! /* ! * ============ SV_AddGravity ! * ! * ============ */ public static void SV_AddGravity(edict_t ent) { --- 245,250 ---- } ! /** ! * SV_AddGravity. */ public static void SV_AddGravity(edict_t ent) { *************** *** 295,303 **** } ! /* ! * ============ SV_Push ! * * Objects need to be moved back on a failed push, otherwise riders would ! * continue to slide. ============ */ public static boolean SV_Push(edict_t pusher, float[] move, float[] amove) { --- 302,308 ---- } ! /** * Objects need to be moved back on a failed push, otherwise riders would ! * continue to slide. */ public static boolean SV_Push(edict_t pusher, float[] move, float[] amove) { *************** *** 458,466 **** } ! /* ! * ================ SV_Physics_Pusher * ! * Bmodel objects don't interact with each other, but push all box objects ! * ================ */ public static void SV_Physics_Pusher(edict_t ent) { --- 463,469 ---- } ! /** * ! * Bmodel objects don't interact with each other, but push all box objects. */ public static void SV_Physics_Pusher(edict_t ent) { *************** *** 513,532 **** } - // ================================================================== ! /* ! * ============= SV_Physics_None ! * ! * Non moving objects can only think ============= */ public static void SV_Physics_None(edict_t ent) { ! // regular thinking SV_RunThink(ent); } ! /* ! * ============= SV_Physics_Noclip ! * ! * A moving object that doesn't obey physics ============= */ public static void SV_Physics_Noclip(edict_t ent) { --- 516,530 ---- } ! /** ! * Non moving objects can only think. */ public static void SV_Physics_None(edict_t ent) { ! // regular thinking SV_RunThink(ent); } ! /** ! * A moving object that doesn't obey physics. */ public static void SV_Physics_Noclip(edict_t ent) { *************** *** 543,558 **** } ! /* ! * ============================================================================== ! * ! * TOSS / BOUNCE ! * ! * ============================================================================== ! */ ! ! /* ! * ============= SV_Physics_Toss ! * ! * Toss, bounce, and fly movement. When onground, do nothing. ============= */ public static void SV_Physics_Toss(edict_t ent) { --- 541,546 ---- } ! /** ! * Toss, bounce, and fly movement. When onground, do nothing. */ public static void SV_Physics_Toss(edict_t ent) { *************** *** 624,629 **** } ! // if (ent.touch) ! // ent.touch (ent, trace.ent, &trace.plane, trace.surface); } --- 612,617 ---- } ! // if (ent.touch) ! // ent.touch (ent, trace.ent, &trace.plane, trace.surface); } *************** *** 652,675 **** } - /* - * =============================================================================== - * - * STEPPING MOVEMENT - * - * =============================================================================== - */ ! /* ! * ============= SV_Physics_Step ! * ! * Monsters freefall when they don't have a ground entity, otherwise all ! * movement is done with discrete steps. ! * ! * This is also used for objects that have become still on the ground, but ! * will fall if the floor is pulled out from under them. FIXME: is this ! * true? ============= ! */ ! ! // FIXME: hacked in for E3 demo public static void SV_AddRotationalFriction(edict_t ent) { int n; --- 640,645 ---- } ! // FIXME: hacked in for E3 demo public static void SV_AddRotationalFriction(edict_t ent) { int n; *************** *** 692,695 **** --- 662,674 ---- } } + + /** + * Monsters freefall when they don't have a ground entity, otherwise all + * movement is done with discrete steps. + * + * This is also used for objects that have become still on the ground, but + * will fall if the floor is pulled out from under them. FIXME: is this + * true? + */ public static void SV_Physics_Step(edict_t ent) { *************** *** 799,804 **** if (!wasonground) if (hitsound) ! GameBase.gi.sound(ent, 0, GameBase.gi ! .soundindex("world/land.wav"), 1, 1, 0); } --- 778,783 ---- if (!wasonground) if (hitsound) ! GameBase.gi.sound(ent, 0, ! GameBase.gi.soundindex("world/land.wav"), 1, 1, 0); } *************** *** 807,821 **** } ! /* ! * ============= SV_movestep ! * * Called by monster program code. The move will be adjusted for slopes and * stairs, but if the move isn't possible, no move is done, false is * returned, and pr_global_struct.trace_normal is set to the normal of the ! * blocking wall ============= */ ! // FIXME since we need to test end position contents here, can we avoid ! // doing ! // it again later in catagorize position? public static boolean SV_movestep(edict_t ent, float[] move, boolean relink) { float dz; --- 786,798 ---- } ! /** * Called by monster program code. The move will be adjusted for slopes and * stairs, but if the move isn't possible, no move is done, false is * returned, and pr_global_struct.trace_normal is set to the normal of the ! * blocking wall. */ ! ! // FIXME: since we need to test end position contents here, can we avoid ! // doing it again later in catagorize position? public static boolean SV_movestep(edict_t ent, float[] move, boolean relink) { float dz; *************** *** 869,874 **** test[1] = trace.endpos[1]; test[2] = trace.endpos[2] + ent.mins[2] + 1; ! contents = GameBase.gi.pointcontents ! .pointcontents(test); if ((contents & Defines.MASK_WATER) != 0) return false; --- 846,850 ---- test[1] = trace.endpos[1]; test[2] = trace.endpos[2] + ent.mins[2] + 1; ! contents = GameBase.gi.pointcontents.pointcontents(test); if ((contents & Defines.MASK_WATER) != 0) return false; *************** *** 882,887 **** test[1] = trace.endpos[1]; test[2] = trace.endpos[2] + ent.mins[2] + 1; ! contents = GameBase.gi.pointcontents ! .pointcontents(test); if ((contents & Defines.MASK_WATER) == 0) return false; --- 858,862 ---- test[1] = trace.endpos[1]; test[2] = trace.endpos[2] + ent.mins[2] + 1; ! contents = GameBase.gi.pointcontents.pointcontents(test); if ((contents & Defines.MASK_WATER) == 0) return false; *************** *** 986,996 **** } ! /* ! * ====================== SV_StepDirection ! * * Turns to the movement direction, and walks the current distance if facing * it. - * - * ====================== */ public static boolean SV_StepDirection(edict_t ent, float yaw, float dist) { --- 961,967 ---- } ! /** * Turns to the movement direction, and walks the current distance if facing * it. */ public static boolean SV_StepDirection(edict_t ent, float yaw, float dist) { *************** *** 1023,1030 **** } ! /* ! * ====================== SV_FixCheckBottom * - * ====================== */ public static void SV_FixCheckBottom(edict_t ent) { --- 994,1000 ---- } ! /** ! * SV_FixCheckBottom * */ public static void SV_FixCheckBottom(edict_t ent) { *************** *** 1052,1056 **** d[1] = 180; else ! d[1] = GameBase.DI_NODIR; if (deltay < -10) d[2] = 270; --- 1022,1026 ---- d[1] = 180; else ! d[1] = DI_NODIR; if (deltay < -10) d[2] = 270; *************** *** 1058,1065 **** d[2] = 90; else ! d[2] = GameBase.DI_NODIR; // try direct route ! if (d[1] != GameBase.DI_NODIR && d[2] != GameBase.DI_NODIR) { if (d[1] == 0) tdir = d[2] == 90 ? 45 : 315; --- 1028,1035 ---- d[2] = 90; else ! d[2] = DI_NODIR; // try direct route ! if (d[1] != DI_NODIR && d[2] != DI_NODIR) { if (d[1] == 0) tdir = d[2] == 90 ? 45 : 315; *************** *** 1078,1086 **** } ! if (d[1] != GameBase.DI_NODIR && d[1] != turnaround && SV_StepDirection(actor, d[1], dist)) return; ! if (d[2] != GameBase.DI_NODIR && d[2] != turnaround && SV_StepDirection(actor, d[2], dist)) return; --- 1048,1056 ---- } ! if (d[1] != DI_NODIR && d[1] != turnaround && SV_StepDirection(actor, d[1], dist)) return; ! if (d[2] != DI_NODIR && d[2] != turnaround && SV_StepDirection(actor, d[2], dist)) return; *************** *** 1088,1092 **** /* there is no direct path to the player, so pick another direction */ ! if (olddir != GameBase.DI_NODIR && SV_StepDirection(actor, olddir, dist)) return; --- 1058,1062 ---- /* there is no direct path to the player, so pick another direction */ ! if (olddir != DI_NODIR && SV_StepDirection(actor, olddir, dist)) return; *************** *** 1102,1106 **** } ! if (turnaround != GameBase.DI_NODIR && SV_StepDirection(actor, turnaround, dist)) return; --- 1072,1076 ---- } ! if (turnaround != DI_NODIR && SV_StepDirection(actor, turnaround, dist)) return; *************** *** 1108,1113 **** actor.ideal_yaw = olddir; // can't move ! // if a bridge was pulled out from underneath a monster, it may not have ! // a valid standing position at all if (!M.M_CheckBottom(actor)) --- 1078,1083 ---- actor.ideal_yaw = olddir; // can't move ! // if a bridge was pulled out from underneath a monster, it may not have ! // a valid standing position at all if (!M.M_CheckBottom(actor)) *************** *** 1115,1123 **** } ! /* ! * ====================== SV_CloseEnough ! * ! * ====================== ! *///ok public static boolean SV_CloseEnough(edict_t ent, edict_t goal, float dist) { int i; --- 1085,1092 ---- } ! /** ! * SV_CloseEnough - returns true if distance between 2 ents is smaller than ! * given dist. ! */ public static boolean SV_CloseEnough(edict_t ent, edict_t goal, float dist) { int i; *************** *** 1131,1133 **** --- 1100,1104 ---- return true; } + + public static int DI_NODIR = -1; } \ No newline at end of file Index: SV_GAME.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_GAME.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SV_GAME.java 20 Jan 2006 22:44:07 -0000 1.9 --- SV_GAME.java 21 Jan 2006 21:53:32 -0000 1.10 *************** *** 68,71 **** --- 68,79 ---- } + + /** + * Centerprintf for critical messages. + */ + public static void PF_cprintfhigh(edict_t ent, String fmt) { + PF_cprintf(ent, Defines.PRINT_HIGH, fmt); + } + /** * PF_cprintf |
|
From: Rene S. <sa...@us...> - 2006-01-21 21:53:41
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4615/src/jake2/qcommon Modified Files: PMove.java Log Message: comment beautification Index: PMove.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/PMove.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PMove.java 27 Dec 2005 21:02:30 -0000 1.7 --- PMove.java 21 Jan 2006 21:53:32 -0000 1.8 *************** *** 26,29 **** --- 26,30 ---- import jake2.Globals; import jake2.game.*; + import jake2.server.SV; import jake2.util.Math3D; *************** *** 101,105 **** } ! static float[] planes[] = new float[GameBase.MAX_CLIP_PLANES][3]; public static void PM_StepSlideMove_() { --- 102,106 ---- } ! static float[] planes[] = new float[SV.MAX_CLIP_PLANES][3]; public static void PM_StepSlideMove_() { *************** *** 152,156 **** // slide along this plane ! if (numplanes >= GameBase.MAX_CLIP_PLANES) { // this shouldn't really happen Math3D.VectorCopy(Globals.vec3_origin, pml.velocity); --- 153,157 ---- // slide along this plane ! if (numplanes >= SV.MAX_CLIP_PLANES) { // this shouldn't really happen Math3D.VectorCopy(Globals.vec3_origin, pml.velocity); |
|
From: Rene S. <sa...@us...> - 2006-01-21 14:01:02
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8868/src/jake2/game Modified Files: gclient_t.java Log Message: spectator bugfix Index: gclient_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/gclient_t.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** gclient_t.java 6 Feb 2005 19:06:37 -0000 1.5 --- gclient_t.java 21 Jan 2006 14:00:53 -0000 1.6 *************** *** 201,206 **** 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? } --- 201,206 ---- respawn_time = 0; // can respawn when time > this ! chase_target = null; // player we are chasing ! update_chase = false; // need to update chase info? } |
|
From: Holger Z. <hz...@us...> - 2006-01-21 11:33:30
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24534 Added Files: Jake2_Eclipse_Setup.txt Log Message: short Jake2 Eclipse project setup guide --- NEW FILE: Jake2_Eclipse_Setup.txt --- 1. CVS checkout - switch to CVS perspective - create a new CVS repository with the following parameters: host: cvs.sourceforge.net repository path: /cvsroot/jake2 user: anonymous password: connection type: pserver - browse the repository structure - rightclick "jake2" below the HEAD entry and choose "Checkout As.." - confirm the following dialog with "Finish" 2. Choose the right JDK - switch to Java perspective - go to Window -> Preferences -> Java -> Installed JREs - select a JDK1.5 or newer 3. Project settings - switch to Java perspective - go to Project->Properties->Java Compiler and select: - use project settings - Compliance and Classfiles: Compiler compliance level: 1.4 Generated .class files compatibility: 1.4 Source compatibility: 1.4 - confirm with OK - Jake2 should compile now without errors. The warnings can be safely ignored. 4. Running and debugging - switch to Java perspective - right click the file src/jake2/Jake2.java in Package Exlorer - select Run -> Run... - choose Java Application; press "New" button - Arguments tab: VM arguments: "-Xmx80M -Dsun.java2d.noddraw=true -Djava.library.path=lib/jogl/windows;lib/joal/windows;lib/lwjgl/windows" replace "windows" with "linux" or "osx" and ";" with ":" on linux and OS X platforms - choose Run to test your brand new Jake2 build 5. Distribution builds - switch to Java perspective - right click the file build.xm in the project root - choose Run -> Ant build... - Tagets tab: uncheck "usage" target select "distclean" and "installer" target in that order - Refresh tab: select "Refresh resources upon completion" - "Run" to build the Jake2 installer jake2-cvs-install.jar in project root dir 6. Keep ud to date - right click project root folder jake2 - select Team -> Update to get latest chages from CVS - if you have local changes, you want to commit into the Jake2 source tree select Team -> Create Patch... and send us the patchfile |
|
From: Rene S. <sa...@us...> - 2006-01-20 22:44:16
|
Update of /cvsroot/jake2/jake2/src/jake2/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21963/src/jake2/server Modified Files: SV_INIT.java SV_MAIN.java SV_GAME.java Log Message: comment beautification Index: SV_GAME.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_GAME.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SV_GAME.java 22 Sep 2004 19:22:12 -0000 1.8 --- SV_GAME.java 20 Jan 2006 22:44:07 -0000 1.9 *************** *** 31,39 **** public class SV_GAME { ! /* ! * =============== PF_Unicast * ! * Sends the contents of the mutlicast buffer to a single client ! * =============== */ public static void PF_Unicast(edict_t ent, boolean reliable) { --- 31,38 ---- public class SV_GAME { ! /** ! * PF_Unicast * ! * Sends the contents of the mutlicast buffer to a single client. */ public static void PF_Unicast(edict_t ent, boolean reliable) { *************** *** 60,67 **** } ! /* ! * =============== PF_dprintf * ! * Debug print to server console =============== */ public static void PF_dprintf(String fmt) { --- 59,66 ---- } ! /** ! * PF_dprintf * ! * Debug print to server console. */ public static void PF_dprintf(String fmt) { *************** *** 69,76 **** } ! /* ! * =============== PF_cprintf * ! * Print to a single client =============== */ public static void PF_cprintf(edict_t ent, int level, String fmt) { --- 68,75 ---- } ! /** ! * PF_cprintf * ! * Print to a single client. */ public static void PF_cprintf(edict_t ent, int level, String fmt) { *************** *** 90,97 **** } ! /* ! * =============== PF_centerprintf * ! * centerprint to a single client =============== */ public static void PF_centerprintf(edict_t ent, String fmt) { --- 89,96 ---- } ! /** ! * PF_centerprintf * ! * centerprint to a single client. */ public static void PF_centerprintf(edict_t ent, String fmt) { *************** *** 107,114 **** } ! /* ! * =============== PF_error * ! * Abort the server with a game error =============== */ public static void PF_error(String fmt) { --- 106,113 ---- } ! /** ! * PF_error * ! * Abort the server with a game error. */ public static void PF_error(String fmt) { *************** *** 120,127 **** } ! /* ! * ================= PF_setmodel * ! * Also sets mins and maxs for inline bmodels ================= */ public static void PF_setmodel(edict_t ent, String name) { --- 119,126 ---- } ! /** ! * PF_setmodel * ! * Also sets mins and maxs for inline bmodels. */ public static void PF_setmodel(edict_t ent, String name) { *************** *** 145,152 **** } ! /* ! * =============== PF_Configstring ! * ! * =============== */ public static void PF_Configstring(int index, String val) { --- 144,149 ---- } ! /** ! * PF_Configstring */ public static void PF_Configstring(int index, String val) { *************** *** 208,215 **** } ! /* ! * ================= PF_inPVS * ! * Also checks portalareas so that doors block sight ================= */ public static boolean PF_inPVS(float[] p1, float[] p2) { --- 205,212 ---- } ! /** ! * PF_inPVS * ! * Also checks portalareas so that doors block sight. */ public static boolean PF_inPVS(float[] p1, float[] p2) { *************** *** 240,247 **** } ! /* ! * ================= PF_inPHS * ! * Also checks portalareas so that doors block sound ================= */ public static boolean PF_inPHS(float[] p1, float[] p2) { --- 237,244 ---- } ! /** ! * PF_inPHS. * ! * Also checks portalareas so that doors block sound. */ public static boolean PF_inPHS(float[] p1, float[] p2) { *************** *** 281,291 **** } - //============================================== ! /* ! * =============== SV_ShutdownGameProgs * * Called when either the entire server is being killed, or it is changing ! * to a different game directory. =============== */ public static void SV_ShutdownGameProgs() { --- 278,287 ---- } ! /** ! * SV_ShutdownGameProgs * * Called when either the entire server is being killed, or it is changing ! * to a different game directory. */ public static void SV_ShutdownGameProgs() { *************** *** 293,300 **** } ! /* ! * =============== SV_InitGameProgs * ! * Init the game subsystem for a new map =============== */ --- 289,296 ---- } ! /** ! * SV_InitGameProgs * ! * Init the game subsystem for a new map. */ Index: SV_MAIN.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_MAIN.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** SV_MAIN.java 27 Dec 2005 21:02:30 -0000 1.15 --- SV_MAIN.java 20 Jan 2006 22:44:07 -0000 1.16 *************** *** 860,864 **** /** ! * Only called at quake2.exe startup, not for each game =============== */ public static void SV_Init() { --- 860,864 ---- /** ! * Only called at quake2.exe startup, not for each game */ public static void SV_Init() { Index: SV_INIT.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_INIT.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** SV_INIT.java 5 Dec 2005 00:11:47 -0000 1.16 --- SV_INIT.java 20 Jan 2006 22:44:07 -0000 1.17 *************** *** 38,45 **** public class SV_INIT { ! /* ! * ================ SV_FindIndex ! * ! * ================ */ public static int SV_FindIndex(String name, int start, int max, --- 38,43 ---- public class SV_INIT { ! /** ! * SV_FindIndex. */ public static int SV_FindIndex(String name, int start, int max, *************** *** 86,95 **** } ! /* ! * ================ SV_CreateBaseline * * Entity baselines are used to compress the update messages to the clients -- ! * only the fields that differ from the baseline will be transmitted ! * ================ */ public static void SV_CreateBaseline() { --- 84,92 ---- } ! /** ! * SV_CreateBaseline * * Entity baselines are used to compress the update messages to the clients -- ! * only the fields that differ from the baseline will be transmitted. */ public static void SV_CreateBaseline() { *************** *** 98,102 **** for (entnum = 1; entnum < GameBase.num_edicts; entnum++) { - //svent = EDICT_NUM(entnum); svent = GameBase.g_edicts[entnum]; --- 95,98 ---- *************** *** 106,120 **** && 0 == svent.s.effects) continue; svent.s.number = entnum; // take current state as baseline Math3D.VectorCopy(svent.s.origin, svent.s.old_origin); ! // rst: bugfix ! sv.baselines[entnum].set(svent.s); // = svent.s.getClone(); } } ! /* ! * ================= SV_CheckForSavegame ================= */ public static void SV_CheckForSavegame() { --- 102,116 ---- && 0 == svent.s.effects) continue; + svent.s.number = entnum; // take current state as baseline Math3D.VectorCopy(svent.s.origin, svent.s.old_origin); ! sv.baselines[entnum].set(svent.s); } } ! /** ! * SV_CheckForSavegame. */ public static void SV_CheckForSavegame() { *************** *** 169,179 **** } ! /* ! * ================ SV_SpawnServer * * Change the server to a new map, taking all connected clients along with * it. - * - * ================ */ public static void SV_SpawnServer(String server, String spawnpoint, --- 165,173 ---- } ! /** ! * SV_SpawnServer. * * Change the server to a new map, taking all connected clients along with * it. */ public static void SV_SpawnServer(String server, String spawnpoint, *************** *** 191,195 **** try { sv.demofile.close(); ! } catch (Exception e) { } --- 185,190 ---- try { sv.demofile.close(); ! } ! catch (Exception e) { } *************** *** 249,267 **** sv.configstrings[Defines.CS_MAPCHECKSUM] = "" + checksum; ! // // clear physics interaction links ! // SV_WORLD.SV_ClearWorld(); for (i = 1; i < CM.CM_NumInlineModels(); i++) { sv.configstrings[Defines.CS_MODELS + 1 + i] = "*" + i; // copy references ! sv.models[i + 1] = CM ! .InlineModel(sv.configstrings[Defines.CS_MODELS + 1 + i]); } ! // // spawn the rest of the entities on the map - // // precache and static commands can be issued during --- 244,261 ---- sv.configstrings[Defines.CS_MAPCHECKSUM] = "" + checksum; ! // clear physics interaction links ! SV_WORLD.SV_ClearWorld(); for (i = 1; i < CM.CM_NumInlineModels(); i++) { sv.configstrings[Defines.CS_MODELS + 1 + i] = "*" + i; + // copy references ! sv.models[i + 1] = CM.InlineModel(sv.configstrings[Defines.CS_MODELS + 1 + i]); } ! // spawn the rest of the entities on the map // precache and static commands can be issued during *************** *** 291,302 **** Cvar.FullSet("mapname", sv.name, Defines.CVAR_SERVERINFO | Defines.CVAR_NOSET); - - //Com.Printf("-------------------------------------\n"); } ! /* ! * ============== SV_InitGame * ! * A brand new game has been started ============== */ public static void SV_InitGame() { --- 285,294 ---- Cvar.FullSet("mapname", sv.name, Defines.CVAR_SERVERINFO | Defines.CVAR_NOSET); } ! /** ! * SV_InitGame. * ! * A brand new game has been started. */ public static void SV_InitGame() { *************** *** 357,361 **** svs.clients = new client_t[(int) SV_MAIN.maxclients.value]; for (int n = 0; n < svs.clients.length; n++) { - // fixed nasty multiplayer bug (rst). svs.clients[n] = new client_t(); svs.clients[n].serverindex = n; --- 349,352 ---- *************** *** 364,369 **** * Defines.UPDATE_BACKUP * 64; //ok. - //svs.client_entities = Z_Malloc(sizeof(entity_state_t) * - // svs.num_client_entities); svs.client_entities = new entity_state_t[svs.num_client_entities]; for (int n = 0; n < svs.client_entities.length; n++) --- 355,358 ---- *************** *** 371,375 **** // init network stuff ! NET.Config((SV_MAIN.maxclients.value > 1)); //ok! // heartbeats will always be sent to the id master --- 360,364 ---- // init network stuff ! NET.Config((SV_MAIN.maxclients.value > 1)); // heartbeats will always be sent to the id master *************** *** 379,391 **** // init game ! SV_GAME.SV_InitGameProgs(); // bis hier alles ok! for (i = 0; i < SV_MAIN.maxclients.value; i++) { ent = GameBase.g_edicts[i + 1]; - - //ent.s.number = i + 1; //dont need this, ent.s.number already set. svs.clients[i].edict = ent; - //memset(& svs.clients[i].lastcmd, 0, - // sizeof(svs.clients[i].lastcmd)); svs.clients[i].lastcmd = new usercmd_t(); } --- 368,376 ---- // init game ! SV_GAME.SV_InitGameProgs(); for (i = 0; i < SV_MAIN.maxclients.value; i++) { ent = GameBase.g_edicts[i + 1]; svs.clients[i].edict = ent; svs.clients[i].lastcmd = new usercmd_t(); } *************** *** 394,399 **** private static String firstmap = ""; ! /* ! * ====================== SV_Map * * the full syntax is: --- 379,384 ---- private static String firstmap = ""; ! /** ! * SV_Map * * the full syntax is: *************** *** 401,409 **** * map [*] <map>$ <startspot>+ <nextserver> * ! * command from the console or progs. Map can also be a.cin, .pcx, or .dm2 ! * file Nextserver is used to allow a cinematic to play, then proceed to * another level: * ! * map tram.cin+jail_e3 ====================== */ public static void SV_Map(boolean attractloop, String levelstring, boolean loadgame) { --- 386,395 ---- * map [*] <map>$ <startspot>+ <nextserver> * ! * command from the console or progs. Map can also be a.cin, .pcx, or .dm2 file. ! * ! * Nextserver is used to allow a cinematic to play, then proceed to * another level: * ! * map tram.cin+jail_e3 */ public static void SV_Map(boolean attractloop, String levelstring, boolean loadgame) { *************** *** 422,435 **** // if there is a + in the map, set nextserver to the remainder - //was: - // ch = strstr(level, "+"); - // if (ch) - // { - // *ch = 0; - // Cvar_Set ("nextserver", va("gamemap \"%s\"", ch+1)); - // } - // else - // Cvar_Set ("nextserver", ""); - int c = level.indexOf('+'); if (c != -1) { --- 408,411 ---- *************** *** 450,454 **** } ! //ZOID special hack for end game screen in coop mode if (Cvar.VariableValue("coop") != 0 && level.equals("victory.pcx")) Cvar.Set("nextserver", "gamemap \"*" + firstmap + "\""); --- 426,430 ---- } ! // ZOID: special hack for end game screen in coop mode if (Cvar.VariableValue("coop") != 0 && level.equals("victory.pcx")) Cvar.Set("nextserver", "gamemap \"*" + firstmap + "\""); *************** *** 457,469 **** int pos = level.indexOf('$'); if (pos != -1) { - //* ch = 0; spawnpoint = level.substring(pos + 1); level = level.substring(0, pos); } else - //spawnpoint[0] = 0; spawnpoint = ""; ! // skip the end-of-unit flag if necessary if (level.charAt(0) == '*') level = level.substring(1); --- 433,443 ---- int pos = level.indexOf('$'); if (pos != -1) { spawnpoint = level.substring(pos + 1); level = level.substring(0, pos); } else spawnpoint = ""; ! // skip the end-of-unit flag * if necessary if (level.charAt(0) == '*') level = level.substring(1); |
|
From: Holger Z. <hz...@us...> - 2006-01-15 15:34:48
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv529/src/jake2/qcommon Modified Files: Qcommon.java Log Message: don't write config before archive bits of cvars are set Index: Qcommon.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Qcommon.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Qcommon.java 3 Dec 2005 19:43:41 -0000 1.20 --- Qcommon.java 15 Jan 2006 15:34:38 -0000 1.21 *************** *** 93,99 **** reconfigure(true); // reload default.cfg and config.cfg - // save config when we have a valid baseq2 - CL.WriteConfiguration(); - // // init commands and vars --- 93,96 ---- *************** *** 149,152 **** --- 146,152 ---- Com.Printf("====== Quake2 Initialized ======\n\n"); + + // save config when configuration is completed + CL.WriteConfiguration(); if (Globals.dedicated.value != 1.0f) |
|
From: Holger Z. <hz...@us...> - 2006-01-14 16:06:18
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31819/src/jake2/game Modified Files: game_import_t.java Log Message: dirty bugfix Index: game_import_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/game_import_t.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** game_import_t.java 7 Oct 2004 14:13:07 -0000 1.5 --- game_import_t.java 14 Jan 2006 16:06:11 -0000 1.6 *************** *** 101,105 **** } ! public pmove_t.PointContentsAdapter pointcontents; public boolean inPHS(float[] p1, float[] p2) { --- 101,109 ---- } ! public pmove_t.PointContentsAdapter pointcontents = new pmove_t.PointContentsAdapter() { ! public int pointcontents(float[] o) { ! return 0; ! } ! }; public boolean inPHS(float[] p1, float[] p2) { |
|
From: Holger Z. <hz...@us...> - 2006-01-11 22:04:50
|
Update of /cvsroot/jake2/jake2/src/jake2/sys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14389/src/jake2/sys Modified Files: NET.java Log Message: allow to specify a clientport Index: NET.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sys/NET.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** NET.java 27 Dec 2005 21:02:31 -0000 1.9 --- NET.java 11 Jan 2006 22:04:42 -0000 1.10 *************** *** 280,292 **** */ public static void OpenIP() { ! cvar_t port, ip; port = Cvar.Get("port", "" + Defines.PORT_SERVER, Defines.CVAR_NOSET); ip = Cvar.Get("ip", "localhost", Defines.CVAR_NOSET); ! if (ip_sockets[Defines.NS_SERVER] == null) ip_sockets[Defines.NS_SERVER] = Socket(Defines.NS_SERVER, ip.string, (int) port.value); ! if (ip_sockets[Defines.NS_CLIENT] == null) ip_sockets[Defines.NS_CLIENT] = Socket(Defines.NS_CLIENT, --- 280,296 ---- */ public static void OpenIP() { ! cvar_t port, ip, clientport; port = Cvar.Get("port", "" + Defines.PORT_SERVER, Defines.CVAR_NOSET); ip = Cvar.Get("ip", "localhost", Defines.CVAR_NOSET); ! clientport = Cvar.Get("clientport", "" + Defines.PORT_CLIENT, Defines.CVAR_NOSET); ! if (ip_sockets[Defines.NS_SERVER] == null) ip_sockets[Defines.NS_SERVER] = Socket(Defines.NS_SERVER, ip.string, (int) port.value); ! ! if (ip_sockets[Defines.NS_CLIENT] == null) ! ip_sockets[Defines.NS_CLIENT] = Socket(Defines.NS_CLIENT, ! ip.string, (int) clientport.value); if (ip_sockets[Defines.NS_CLIENT] == null) ip_sockets[Defines.NS_CLIENT] = Socket(Defines.NS_CLIENT, |
|
From: Holger Z. <hz...@us...> - 2006-01-10 14:34:54
|
Update of /cvsroot/jake2/jake2/test/jake2/render In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24023/test/jake2/render Modified Files: DancingQueens.java Log Message: was broken by last Jake2 changes Index: DancingQueens.java =================================================================== RCS file: /cvsroot/jake2/jake2/test/jake2/render/DancingQueens.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** DancingQueens.java 11 Jun 2005 19:43:48 -0000 1.8 --- DancingQueens.java 10 Jan 2006 14:34:00 -0000 1.9 *************** *** 26,29 **** --- 26,30 ---- package jake2.render; + import jake2.*; import jake2.Defines; import jake2.Globals; *************** *** 36,39 **** --- 37,41 ---- import java.util.Arrays; + import java.util.Locale; /** *************** *** 65,68 **** --- 67,74 ---- void init() { + Globals.dedicated = Cvar.Get("dedicated", "0", Qcommon.CVAR_NOSET); + Jake2.Q2Dialog = new Q2DataDialog(); + Locale.setDefault(Locale.US); + Jake2.Q2Dialog.setVisible(true); Qcommon.Init(new String[] { "DancingQueens", "+set", "gl_mode", "5", *************** *** 75,78 **** --- 81,85 ---- this.re = Renderer.getDriver("fastjogl"); + Globals.re = this.re; System.out.println("Use driver: " + re); *************** *** 83,86 **** --- 90,95 ---- kbd.Init(); + Cbuf.AddText("unbind t"); + Cbuf.Execute(); Cmd.AddCommand("togglemouse", togglemouse); Cbuf.AddText("bind t togglemouse"); |
|
From: Holger Z. <hz...@us...> - 2006-01-10 13:09:27
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7474/src/jake2/game Modified Files: Info.java Log Message: remove '\\' check Index: Info.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/Info.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Info.java 27 Dec 2005 21:02:31 -0000 1.6 --- Info.java 10 Jan 2006 13:09:18 -0000 1.7 *************** *** 133,137 **** */ public static boolean Info_Validate(String s) { ! return !((s.indexOf('"') != -1) || (s.indexOf(';') != -1) || (s.indexOf('\\') != -1)); } --- 133,137 ---- */ public static boolean Info_Validate(String s) { ! return !((s.indexOf('"') != -1) || (s.indexOf(';') != -1)); } |
|
From: Holger Z. <hz...@us...> - 2006-01-09 13:03:38
|
Update of /cvsroot/jake2/jake2/lib/jogl/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19974/lib/jogl/windows Modified Files: jogl.dll jogl_cg.dll Log Message: jogl-1.1 final Index: jogl_cg.dll =================================================================== RCS file: /cvsroot/jake2/jake2/lib/jogl/windows/jogl_cg.dll,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsn77XpA and /tmp/cvsp4CxXY differ Index: jogl.dll =================================================================== RCS file: /cvsroot/jake2/jake2/lib/jogl/windows/jogl.dll,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvspC3PXB and /tmp/cvs9Vk400 differ |
|
From: Holger Z. <hz...@us...> - 2006-01-09 13:03:15
|
Update of /cvsroot/jake2/jake2/lib/jogl/osx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19974/lib/jogl/osx Modified Files: libjogl.jnilib libjogl_cg.jnilib Log Message: jogl-1.1 final Index: libjogl.jnilib =================================================================== RCS file: /cvsroot/jake2/jake2/lib/jogl/osx/libjogl.jnilib,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsfBDnB6 and /tmp/cvsKnV0m7 differ Index: libjogl_cg.jnilib =================================================================== RCS file: /cvsroot/jake2/jake2/lib/jogl/osx/libjogl_cg.jnilib,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs6aIHLt and /tmp/cvs9dykJv differ |
|
From: Holger Z. <hz...@us...> - 2006-01-09 13:03:15
|
Update of /cvsroot/jake2/jake2/lib/jogl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19974/lib/jogl Modified Files: jogl.jar Log Message: jogl-1.1 final Index: jogl.jar =================================================================== RCS file: /cvsroot/jake2/jake2/lib/jogl/jogl.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsFM1uCe and /tmp/cvsNCcMbg differ |
|
From: Holger Z. <hz...@us...> - 2006-01-09 13:03:13
|
Update of /cvsroot/jake2/jake2/lib/jogl/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19974/lib/jogl/linux Modified Files: libjogl.so libjogl_cg.so Log Message: jogl-1.1 final Index: libjogl.so =================================================================== RCS file: /cvsroot/jake2/jake2/lib/jogl/linux/libjogl.so,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsgiARKp and /tmp/cvs5zcKVo differ Index: libjogl_cg.so =================================================================== RCS file: /cvsroot/jake2/jake2/lib/jogl/linux/libjogl_cg.so,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsGRZidU and /tmp/cvslnCdnU differ |
|
From: Holger Z. <hz...@us...> - 2006-01-08 22:54:37
|
Update of /cvsroot/jake2/jake2/webstart In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17843/webstart Modified Files: jake2_lwjgl.jnlp jake2_jogl11.jnlp jake2_jogl11ATI.jnlp Log Message: bytonic server as first address book entry Index: jake2_lwjgl.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_lwjgl.jnlp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** jake2_lwjgl.jnlp 26 May 2005 16:56:32 -0000 1.10 --- jake2_lwjgl.jnlp 8 Jan 2006 22:54:29 -0000 1.11 *************** *** 44,47 **** --- 44,50 ---- <argument>s_impl</argument> <argument>lwjgl</argument> + <argument>+set</argument> + <argument>adr0</argument> + <argument>213.187.87.100</argument> </application-desc> Index: jake2_jogl11.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_jogl11.jnlp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** jake2_jogl11.jnlp 30 Jun 2005 20:17:51 -0000 1.12 --- jake2_jogl11.jnlp 8 Jan 2006 22:54:29 -0000 1.13 *************** *** 48,52 **** <argument>+set</argument> <argument>s_impl</argument> ! <argument>joal</argument> </application-desc> --- 48,55 ---- <argument>+set</argument> <argument>s_impl</argument> ! <argument>joal</argument> ! <argument>+set</argument> ! <argument>adr0</argument> ! <argument>213.187.87.100</argument> </application-desc> Index: jake2_jogl11ATI.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_jogl11ATI.jnlp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** jake2_jogl11ATI.jnlp 30 Jun 2005 20:17:51 -0000 1.13 --- jake2_jogl11ATI.jnlp 8 Jan 2006 22:54:29 -0000 1.14 *************** *** 48,52 **** <argument>+set</argument> <argument>s_impl</argument> ! <argument>joal</argument> </application-desc> --- 48,55 ---- <argument>+set</argument> <argument>s_impl</argument> ! <argument>joal</argument> ! <argument>+set</argument> ! <argument>adr0</argument> ! <argument>213.187.87.100</argument> </application-desc> |
|
From: Holger Z. <hz...@us...> - 2006-01-08 22:53:11
|
Update of /cvsroot/jake2/jake2/webstart In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17388/webstart Added Files: jake2_online.jnlp Log Message: jnlp for deathmatches on bytonic server --- NEW FILE: jake2_online.jnlp --- <?xml version="1.0" encoding="utf-8"?> <jnlp spec="1.0+" codebase="http://www.bytonic.de/downloads" href="jake2_jogl11.jnlp"> <information> <title>Jake2</title> <vendor>Bytonic Software</vendor> <homepage href="http://www.bytonic.de/html/jake2.html"/> <description>Java port of the Quake2 game engine</description> <icon href="http://jake2.sourceforge.net/icon.gif"/> <offline-allowed/> </information> <security> <all-permissions/> </security> <resources> <j2se version="1.4+" max-heap-size="100M"/> <jar href="http://jake2.sourceforge.net/lib/jake2.jar"/> <property name="sun.java2d.noddraw" value="true"/> <property name="ATI_WORKAROUND" value="false"/> <extension href="https://jogl.dev.java.net/webstart/jogl-1-1.jnlp" name="jogl"/> </resources> <resources os="Linux"> <jar href="http://jake2.sourceforge.net/lib/patch.jar"/> <jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/> <jar href="http://jake2.sourceforge.net/lib/linux/openal.jar"/> <nativelib href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/> </resources> <resources os="Windows"> <jar href="http://jake2.sourceforge.net/lib/windows/joal.jar"/> <nativelib href="http://jake2.sourceforge.net/lib/windows/joal-native.jar"/> </resources> <resources os="Mac OS X"> <jar href="http://jake2.sourceforge.net/lib/osx/joal.jar"/> <nativelib href="http://jake2.sourceforge.net/lib/osx/joal-native.jar"/> </resources> <application-desc main-class="jake2.Jake2"> <argument>+set</argument> <argument>vid_ref</argument> <argument>fastjogl</argument> <argument>+set</argument> <argument>s_impl</argument> <argument>joal</argument> <argument>+set</argument> <argument>adr0</argument> <argument>213.187.87.100</argument> <argument>+connect</argument> <argument>213.187.87.100</argument> </application-desc> </jnlp> |
|
From: Carsten W. <ca...@us...> - 2006-01-01 15:07:39
|
Update of /cvsroot/jake2/jake2/src/jake2/sound In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8884/src/jake2/sound Modified Files: WaveLoader.java Log Message: handles the 16bit sample byte order (Mac OSX) Index: WaveLoader.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sound/WaveLoader.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** WaveLoader.java 13 Dec 2005 00:02:52 -0000 1.6 --- WaveLoader.java 1 Jan 2006 15:07:30 -0000 1.7 *************** *** 167,191 **** fracstep = (int) (stepscale * 256); ! for (i=0 ; i<outcount ; i++) ! { ! srcsample = samplefrac >> 8; ! samplefrac += fracstep; ! ! if (inwidth == 2) ! { ! sample = (int) ((data[offset + srcsample * 2] & 0xff) + (data[offset + srcsample * 2 + 1] << 8)); ! } ! else ! { ! sample = ((data[offset + srcsample] &0xff) - 128) << 8; ! } ! ! if (sc.width == 2) ! { ! sc.data[i*2] = (byte) (sample & 0xff); ! sc.data[i*2+1] = (byte) ((sample>>>8) & 0xff); ! } ! else ! { sc.data[i] = (byte) (sample >> 8); } --- 167,190 ---- fracstep = (int) (stepscale * 256); ! for (i = 0; i < outcount; i++) { ! srcsample = samplefrac >> 8; ! samplefrac += fracstep; ! ! if (inwidth == 2) { ! sample = (data[offset + srcsample * 2] & 0xff) ! + (data[offset + srcsample * 2 + 1] << 8); ! } else { ! sample = ((data[offset + srcsample] & 0xff) - 128) << 8; ! } ! ! if (sc.width == 2) { ! if (Defines.LITTLE_ENDIAN) { ! sc.data[i * 2] = (byte) (sample & 0xff); ! sc.data[i * 2 + 1] = (byte) ((sample >>> 8) & 0xff); ! } else { ! sc.data[i * 2] = (byte) ((sample >>> 8) & 0xff); ! sc.data[i * 2 + 1] = (byte) (sample & 0xff); ! } ! } else { sc.data[i] = (byte) (sample >> 8); } |
|
From: Carsten W. <ca...@us...> - 2006-01-01 15:05:56
|
Update of /cvsroot/jake2/jake2/src/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8427/src/jake2 Modified Files: Defines.java Log Message: use the system a little endian byte order? Index: Defines.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/Defines.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Defines.java 27 Dec 2005 21:02:30 -0000 1.8 --- Defines.java 1 Jan 2006 15:05:47 -0000 1.9 *************** *** 26,29 **** --- 26,31 ---- package jake2; + import java.nio.ByteOrder; + public class Defines { *************** *** 1352,1355 **** --- 1354,1359 ---- // datentyp konstanten // groesse in bytes + public final static boolean LITTLE_ENDIAN = (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN); + public final static int SIZE_OF_SHORT = 2; *************** *** 1360,1362 **** public final static int SIZE_OF_FLOAT = 4; ! public final static int SIZE_OF_DOUBLE = 8;} --- 1364,1368 ---- public final static int SIZE_OF_FLOAT = 4; ! public final static int SIZE_OF_DOUBLE = 8; ! ! } \ No newline at end of file |
2 messages has been excluded from this view by a project administrator.
![http://jake2.sourceforge.net/icon.gif"/>](http://jake2.sourceforge.net/icon.gif"/>){kind=link}