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...> - 2004-09-18 13:07:54
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19250/src/jake2/qcommon Modified Files: Cbuf.java Log Message: fix command line argument handling Index: Cbuf.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Cbuf.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Cbuf.java 12 Jul 2004 20:47:00 -0000 1.3 --- Cbuf.java 18 Sep 2004 13:07:46 -0000 1.4 *************** *** 74,78 **** if (!s.equals("+set")) continue; ! Cbuf.AddText("set " + Com.Argv(i + 1) + " " + Com.Argv(i + 2) + "n"); if (clear) { Com.ClearArgv(i); --- 74,78 ---- if (!s.equals("+set")) continue; ! Cbuf.AddText("set " + Com.Argv(i + 1) + " " + Com.Argv(i + 2) + "\n"); if (clear) { Com.ClearArgv(i); |
|
From: Holger Z. <hz...@us...> - 2004-09-18 12:37:01
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13883/src/jake2/qcommon Modified Files: Qcommon.java Added Files: Q2DataDialog.java Q2DataTest.java Log Message: first version of data chooser/installer Index: Qcommon.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Qcommon.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Qcommon.java 6 Sep 2004 20:30:21 -0000 1.6 --- Qcommon.java 18 Sep 2004 12:36:53 -0000 1.7 *************** *** 83,86 **** --- 83,90 ---- Cbuf.Execute(); + FS.setCDDir(); // use cddir from config.cfg + Q2DataTest.run(); // test for valid baseq2 + reconfigure(); // reload default.cfg and config.cfg + // // init commands and vars *************** *** 228,231 **** --- 232,243 ---- } + static void reconfigure() { + Cbuf.AddText("exec default.cfg\n"); + Cbuf.Execute(); + Cvar.Set("vid_fullscreen", "0"); + Cbuf.AddText("exec config.cfg\n"); + Cbuf.AddEarlyCommands(true); + Cbuf.Execute(); + } } --- NEW FILE: Q2DataDialog.java --- /* * Q2DataDialog.java * * Created on 17. September 2004, 20:13 */ package jake2.qcommon; import jake2.Globals; import java.awt.DisplayMode; import java.awt.GraphicsEnvironment; import java.io.IOException; import javax.swing.JFileChooser; /** * * @author hoz */ public class Q2DataDialog extends javax.swing.JDialog { /** Creates new form Q2DataDialog */ public Q2DataDialog(java.awt.Frame parent, boolean modal) { super(parent, modal); initComponents(); DisplayMode mode = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDisplayMode(); int x = (mode.getWidth() - getWidth()) / 2; int y = (mode.getHeight() - getHeight()) / 2; setLocation(x, y); } /** This method is called from within the constructor to * initialize the form. * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ private void initComponents() {//GEN-BEGIN:initComponents java.awt.GridBagConstraints gridBagConstraints; jPanel1 = new javax.swing.JPanel(); jPanel2 = new javax.swing.JPanel(); jTextField1 = new javax.swing.JTextField(); changeButton = new javax.swing.JButton(); installButton = new javax.swing.JButton(); exitButton = new javax.swing.JButton(); okButton = new javax.swing.JButton(); setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle("Looking for Quake2 level data..."); setModal(true); setResizable(false); addWindowListener(new java.awt.event.WindowAdapter() { public void windowClosing(java.awt.event.WindowEvent evt) { formWindowClosing(evt); } }); jPanel1.setBackground(new java.awt.Color(255, 255, 255)); jPanel1.setDoubleBuffered(false); jPanel1.setMaximumSize(new java.awt.Dimension(400, 200)); jPanel1.setMinimumSize(new java.awt.Dimension(400, 200)); jPanel1.setPreferredSize(new java.awt.Dimension(400, 200)); getContentPane().add(jPanel1, java.awt.BorderLayout.CENTER); jPanel2.setLayout(new java.awt.GridBagLayout()); jPanel2.setMaximumSize(new java.awt.Dimension(400, 100)); jPanel2.setMinimumSize(new java.awt.Dimension(400, 100)); jPanel2.setPreferredSize(new java.awt.Dimension(400, 100)); jTextField1.setPreferredSize(null); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 0; gridBagConstraints.gridwidth = 2; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10); gridBagConstraints.weightx = 1.0; jPanel2.add(jTextField1, gridBagConstraints); changeButton.setText("change"); changeButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { changeButtonActionPerformed(evt); } }); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 2; gridBagConstraints.gridy = 0; gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10); gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; jPanel2.add(changeButton, gridBagConstraints); installButton.setText("Install"); installButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { installButtonActionPerformed(evt); } }); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 1; gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10); gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; jPanel2.add(installButton, gridBagConstraints); exitButton.setText("Exit"); exitButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { exitButtonActionPerformed(evt); } }); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 1; gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10); jPanel2.add(exitButton, gridBagConstraints); okButton.setText("OK"); okButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { okButtonActionPerformed(evt); } }); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 2; gridBagConstraints.gridy = 1; gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10); gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; jPanel2.add(okButton, gridBagConstraints); getContentPane().add(jPanel2, java.awt.BorderLayout.SOUTH); pack(); }//GEN-END:initComponents private void installButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_installButtonActionPerformed // TODO add your handling code here: }//GEN-LAST:event_installButtonActionPerformed private void exitButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_exitButtonActionPerformed System.exit(1); dispose(); notifyAll(); }//GEN-LAST:event_exitButtonActionPerformed private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed Cvar.Set("cddir", dir); FS.setCDDir(); synchronized (this) { notify(); } dispose(); }//GEN-LAST:event_okButtonActionPerformed private void changeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_changeButtonActionPerformed JFileChooser chooser = new JFileChooser(); chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); chooser.setDialogType(JFileChooser.CUSTOM_DIALOG); chooser.setMultiSelectionEnabled(false); chooser.setDialogTitle("choose a valid baseq2 directory"); chooser.showDialog(this, "OK"); dir = null; try { dir = chooser.getSelectedFile().getCanonicalPath(); } catch (IOException e) {} jTextField1.setText(dir); }//GEN-LAST:event_changeButtonActionPerformed private void formWindowClosing(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowClosing System.exit(1); dispose(); notifyAll(); }//GEN-LAST:event_formWindowClosing /** * @param args the command line arguments */ public static void main(String args[]) { new Q2DataDialog(new javax.swing.JFrame(), true).show(); } // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton changeButton; private javax.swing.JButton exitButton; private javax.swing.JButton installButton; private javax.swing.JPanel jPanel1; private javax.swing.JPanel jPanel2; private javax.swing.JTextField jTextField1; private javax.swing.JButton okButton; // End of variables declaration//GEN-END:variables private String dir; } --- NEW FILE: Q2DataTest.java --- /* * Q2DataTest.java * Copyright Bytonic Software (C) 2004 * * $Id: Q2DataTest.java,v 1.1 2004/09/18 12:36:53 hzi Exp $ */ package jake2.qcommon; /** * Q2DataTest */ public class Q2DataTest { static void run() { while (FS.LoadFile("pics/colormap.pcx") == null) { Q2DataDialog d = new Q2DataDialog(null, true); d.setVisible(true); try { d.wait(); } catch (Exception e) {} } } } |
|
From: Holger Z. <hz...@us...> - 2004-09-18 12:36:08
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13700/src/jake2/qcommon Modified Files: FS.java Log Message: - use $HOME/.jake2 as first searchpath element - "cddir" as persistent location for baseq2 Index: FS.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/FS.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FS.java 20 Aug 2004 21:29:58 -0000 1.4 --- FS.java 18 Sep 2004 12:35:52 -0000 1.5 *************** *** 72,75 **** --- 72,76 ---- public static String fs_gamedir; + private static String fs_userdir; public static cvar_t fs_basedir; public static cvar_t fs_cddir; *************** *** 483,491 **** // // add the directory to the search path ! // search = new searchpath_t(); search.filename = new String(dir); ! search.next = fs_searchpaths; ! fs_searchpaths = search; // --- 484,496 ---- // // add the directory to the search path ! // ensure fs_userdir is first in searchpath search = new searchpath_t(); search.filename = new String(dir); ! if (fs_searchpaths != null) { ! search.next = fs_searchpaths.next; ! fs_searchpaths.next = search; ! } else { ! fs_searchpaths = search; ! } // *************** *** 517,521 **** */ public static String Gamedir() { ! return (fs_gamedir != null) ? fs_gamedir : Globals.BASEDIRNAME; } --- 522,526 ---- */ public static String Gamedir() { ! return (fs_userdir != null) ? fs_userdir : Globals.BASEDIRNAME; } *************** *** 785,788 **** --- 790,797 ---- }); + fs_userdir = System.getProperty("user.home") + "/.jake2"; + FS.CreatePath(fs_userdir + "/"); + FS.AddGameDirectory(fs_userdir); + // // basedir <path> *************** *** 797,804 **** // ! // TODO zur zeit wird auf baseq2 mit ../../ zugegriffen, sonst "" ! fs_cddir = Cvar.Get("cddir", "../..", CVAR_NOSET); ! if (fs_cddir.string.length() > 0) ! AddGameDirectory(fs_cddir.string + '/' + Globals.BASEDIRNAME); // --- 806,810 ---- // ! setCDDir(); // *************** *** 817,820 **** --- 823,835 ---- } + /** + * set baseq2 directory + */ + static void setCDDir() { + fs_cddir = Cvar.Get("cddir", "../../baseq2", CVAR_ARCHIVE); + if (fs_cddir.string.length() > 0) + AddGameDirectory(fs_cddir.string); + } + // RAFAEL /* |
|
From: Carsten W. <ca...@us...> - 2004-09-15 22:13:45
|
Update of /cvsroot/jake2/jake2/test/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28566/test/jake2/client Modified Files: GhostMouse.java Log Message: deprecated frame.show() replaced Index: GhostMouse.java =================================================================== RCS file: /cvsroot/jake2/jake2/test/jake2/client/GhostMouse.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GhostMouse.java 15 Sep 2004 22:10:00 -0000 1.2 --- GhostMouse.java 15 Sep 2004 22:13:36 -0000 1.3 *************** *** 45,49 **** frame.setLocation((int) (size.getWidth() - frame.getWidth()) / 2, (int) (size.getHeight() - frame.getHeight()) / 2); ! frame.show(); } } \ No newline at end of file --- 45,49 ---- frame.setLocation((int) (size.getWidth() - frame.getWidth()) / 2, (int) (size.getHeight() - frame.getHeight()) / 2); ! frame.setVisible(true); } } \ No newline at end of file |
|
From: Carsten W. <ca...@us...> - 2004-09-15 22:10:10
|
Update of /cvsroot/jake2/jake2/test/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27529/test/jake2/client Modified Files: GhostMouse.java Log Message: reformat (Java conventions) Index: GhostMouse.java =================================================================== RCS file: /cvsroot/jake2/jake2/test/jake2/client/GhostMouse.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** GhostMouse.java 7 Jul 2004 19:59:56 -0000 1.1.1.1 --- GhostMouse.java 15 Sep 2004 22:10:00 -0000 1.2 *************** *** 1,42 **** /* ! Copyright (C) 1997-2001 Id Software, Inc. ! ! This program is free software; you can redistribute it and/or ! modify it under the terms of the GNU General Public License ! as published by the Free Software Foundation; either version 2 ! of the License, or (at your option) any later version. ! ! This program is distributed in the hope that it will be useful, ! but WITHOUT ANY WARRANTY; without even the implied warranty of ! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ! ! See the GNU General Public License for more details. ! ! You should have received a copy of the GNU General Public License ! along with this program; if not, write to the Free Software ! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ! ! */ // Created on 07.01.2000 by RST. // $Id$ - package jake2.client; ! import java.awt.*; ! import java.awt.event.*; ! import javax.swing.*; import java.awt.Robot; ! ! // import jake2.*; ! // import jake2.client.*; ! // import jake2.game.*; ! // import jake2.qcommon.*; ! // import jake2.render.*; ! // import jake2.server.*; public class GhostMouse { public static Dimension size; public static void main(String[] args) throws Exception { Robot robot = new Robot(); --- 1,36 ---- /* ! * Copyright (C) 1997-2001 Id Software, Inc. ! * ! * This program is free software; you can redistribute it and/or modify it under ! * the terms of the GNU General Public License as published by the Free Software ! * Foundation; either version 2 of the License, or (at your option) any later ! * version. ! * ! * This program is distributed in the hope that it will be useful, but WITHOUT ! * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS ! * FOR A PARTICULAR PURPOSE. ! * ! * See the GNU General Public License for more details. ! * ! * You should have received a copy of the GNU General Public License along with ! * this program; if not, write to the Free Software Foundation, Inc., 59 Temple ! * Place - Suite 330, Boston, MA 02111-1307, USA. ! * ! */ // Created on 07.01.2000 by RST. // $Id$ package jake2.client; ! import java.awt.Dimension; import java.awt.Robot; + import java.awt.Toolkit; ! import javax.swing.JButton; ! import javax.swing.JFrame; public class GhostMouse { public static Dimension size; + public static void main(String[] args) throws Exception { Robot robot = new Robot(); *************** *** 49,56 **** frame.pack(); ! frame.setLocation( ! (int)(size.getWidth()-frame.getWidth())/2, ! (int)(size.getHeight()-frame.getHeight())/2); frame.show(); } ! } --- 43,49 ---- frame.pack(); ! frame.setLocation((int) (size.getWidth() - frame.getWidth()) / 2, ! (int) (size.getHeight() - frame.getHeight()) / 2); frame.show(); } ! } \ No newline at end of file |
|
From: Holger Z. <hz...@us...> - 2004-09-12 19:54:39
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21487/src/jake2/game Modified Files: GamePWeapon.java Log Message: fix out of ammo messages Index: GamePWeapon.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GamePWeapon.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** GamePWeapon.java 12 Sep 2004 18:25:49 -0000 1.4 --- GamePWeapon.java 12 Sep 2004 19:54:29 -0000 1.5 *************** *** 26,31 **** import jake2.Defines; import jake2.Globals; ! import jake2.util.*; ! import jake2.util.*; public class GamePWeapon { --- 26,31 ---- import jake2.Defines; import jake2.Globals; ! import jake2.util.Lib; ! import jake2.util.Math3D; public class GamePWeapon { *************** *** 763,767 **** if (0 == ent.client.pers.inventory[ammo_index]) { ! GameBase.gi.cprintf(ent, Defines.PRINT_HIGH, "No " + ammo_item.pickup_name + " for " + ".\n"); return; } --- 763,767 ---- if (0 == ent.client.pers.inventory[ammo_index]) { ! GameBase.gi.cprintf(ent, Defines.PRINT_HIGH, "No " + ammo_item.pickup_name + " for " + item.pickup_name + ".\n"); return; } |
|
From: Holger Z. <hz...@us...> - 2004-09-12 19:53:07
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21208/src/jake2/client Modified Files: Menu.java Log Message: fix grey bar at bottom in video menu Index: Menu.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/Menu.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Menu.java 20 Aug 2004 21:29:56 -0000 1.7 --- Menu.java 12 Sep 2004 19:52:58 -0000 1.8 *************** *** 30,42 **** import jake2.game.cvar_t; import jake2.qcommon.*; ! import jake2.sound.*; import jake2.sys.NET; import jake2.sys.Sys; ! import jake2.util.Lib; ! import jake2.util.Math3D; ! import jake2.util.QuakeFile; import java.awt.Dimension; - import java.io.IOException; import java.io.RandomAccessFile; import java.util.Arrays; --- 30,39 ---- import jake2.game.cvar_t; import jake2.qcommon.*; ! import jake2.sound.S; import jake2.sys.NET; import jake2.sys.Sys; ! import jake2.util.*; import java.awt.Dimension; import java.io.RandomAccessFile; import java.util.Arrays; *************** *** 108,112 **** int n= -1; //position in an array. ! String statusbar= ""; mcallback callback; --- 105,109 ---- int n= -1; //position in an array. ! String statusbar; mcallback callback; |
|
From: Rene S. <sa...@us...> - 2004-09-12 18:26:13
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2795/src/jake2/game Modified Files: Monster.java SuperAdapter.java GamePWeapon.java usercmd_t.java GameUtil.java Log Message: fixed an inventory bug and did some cleanups Index: Monster.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/Monster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Monster.java 8 Jul 2004 15:58:44 -0000 1.2 --- Monster.java 12 Sep 2004 18:25:49 -0000 1.3 *************** *** 32,39 **** import java.util.*; ! public class Monster extends GameAI ! { ! // FIXME mosnters should call these with a totally accurate direction // and we can mess it up based on skill. Spread should be for normal // and we can tighten or loosen based on skill. We could muck with --- 32,38 ---- import java.util.*; ! public class Monster extends GameAI { ! // FIXME monsters should call these with a totally accurate direction // and we can mess it up based on skill. Spread should be for normal // and we can tighten or loosen based on skill. We could muck with *************** *** 47,52 **** int hspread, int vspread, ! int flashtype) ! { Fire.fire_bullet(self, start, dir, damage, kick, hspread, vspread, Defines.MOD_UNKNOWN); --- 46,50 ---- int hspread, int vspread, ! int flashtype) { Fire.fire_bullet(self, start, dir, damage, kick, hspread, vspread, Defines.MOD_UNKNOWN); *************** *** 66,71 **** int vspread, int count, ! int flashtype) ! { Fire.fire_shotgun(self, start, aimdir, damage, kick, hspread, vspread, count, Defines.MOD_UNKNOWN); --- 64,68 ---- int vspread, int count, ! int flashtype) { Fire.fire_shotgun(self, start, aimdir, damage, kick, hspread, vspread, count, Defines.MOD_UNKNOWN); *************** *** 83,88 **** int speed, int flashtype, ! int effect) ! { Fire.fire_blaster(self, start, dir, damage, speed, effect, false); --- 80,84 ---- int speed, int flashtype, ! int effect) { Fire.fire_blaster(self, start, dir, damage, speed, effect, false); *************** *** 93,98 **** } /** The Moster fires the grenade. */ ! public static void monster_fire_grenade(edict_t self, float[] start, float[] aimdir, int damage, int speed, int flashtype) ! { Fire.fire_grenade(self, start, aimdir, damage, speed, 2.5f, damage + 40); --- 89,93 ---- } /** The Moster fires the grenade. */ ! public static void monster_fire_grenade(edict_t self, float[] start, float[] aimdir, int damage, int speed, int flashtype) { Fire.fire_grenade(self, start, aimdir, damage, speed, 2.5f, damage + 40); *************** *** 103,108 **** } /** The Moster fires the rocket. */ ! public static void monster_fire_rocket(edict_t self, float[] start, float[] dir, int damage, int speed, int flashtype) ! { Fire.fire_rocket(self, start, dir, damage, speed, damage + 20, damage); --- 98,102 ---- } /** The Moster fires the rocket. */ ! public static void monster_fire_rocket(edict_t self, float[] start, float[] dir, int damage, int speed, int flashtype) { Fire.fire_rocket(self, start, dir, damage, speed, damage + 20, damage); *************** *** 113,118 **** } /** The Moster fires the railgun. */ ! public static void monster_fire_railgun(edict_t self, float[] start, float[] aimdir, int damage, int kick, int flashtype) ! { Fire.fire_rail(self, start, aimdir, damage, kick); --- 107,111 ---- } /** The Moster fires the railgun. */ ! public static void monster_fire_railgun(edict_t self, float[] start, float[] aimdir, int damage, int kick, int flashtype) { Fire.fire_rail(self, start, aimdir, damage, kick); *************** *** 131,136 **** int kick, float damage_radius, ! int flashtype) ! { Fire.fire_bfg(self, start, aimdir, damage, speed, damage_radius); --- 124,128 ---- int kick, float damage_radius, ! int flashtype) { Fire.fire_bfg(self, start, aimdir, damage, speed, damage_radius); *************** *** 148,164 **** ================ */ ! public static void monster_death_use(edict_t self) ! { self.flags &= ~(Defines.FL_FLY | Defines.FL_SWIM); self.monsterinfo.aiflags &= Defines.AI_GOOD_GUY; ! if (self.item != null) ! { GameUtil.Drop_Item(self, self.item); ! self.item = null; } if (self.deathtarget != null) ! self.target = self.deathtarget; if (self.target == null) --- 140,154 ---- ================ */ ! public static void monster_death_use(edict_t self) { self.flags &= ~(Defines.FL_FLY | Defines.FL_SWIM); self.monsterinfo.aiflags &= Defines.AI_GOOD_GUY; ! if (self.item != null) { GameUtil.Drop_Item(self, self.item); ! self.item= null; } if (self.deathtarget != null) ! self.target= self.deathtarget; if (self.target == null) *************** *** 168,181 **** } // ============================================================================ ! public static boolean monster_start(edict_t self) ! { ! if (GameBase.deathmatch.value != 0) ! { GameUtil.G_FreeEdict(self); return false; } ! if ((self.spawnflags & 4) != 0 && 0 == (self.monsterinfo.aiflags & Defines.AI_GOOD_GUY)) ! { self.spawnflags &= ~4; self.spawnflags |= 1; --- 158,168 ---- } // ============================================================================ ! public static boolean monster_start(edict_t self) { ! if (GameBase.deathmatch.value != 0) { GameUtil.G_FreeEdict(self); return false; } ! if ((self.spawnflags & 4) != 0 && 0 == (self.monsterinfo.aiflags & Defines.AI_GOOD_GUY)) { self.spawnflags &= ~4; self.spawnflags |= 1; *************** *** 186,209 **** GameBase.level.total_monsters++; ! self.nextthink = GameBase.level.time + Defines.FRAMETIME; self.svflags |= Defines.SVF_MONSTER; self.s.renderfx |= Defines.RF_FRAMELERP; ! self.takedamage = Defines.DAMAGE_AIM; ! self.air_finished = GameBase.level.time + 12; ! self.use = GameUtilAdapters.monster_use; ! self.max_health = self.health; ! self.clipmask = Defines.MASK_MONSTERSOLID; ! self.s.skinnum = 0; ! self.deadflag = Defines.DEAD_NO; self.svflags &= ~Defines.SVF_DEADMONSTER; if (null == self.monsterinfo.checkattack) ! self.monsterinfo.checkattack = GameUtilAdapters.M_CheckAttack; Math3D.VectorCopy(self.s.origin, self.s.old_origin); ! if (GameBase.st.item != null && GameBase.st.item.length()>0 ) ! { ! self.item = GameUtil.FindItemByClassname(GameBase.st.item); if (self.item == null) GameBase.gi.dprintf( --- 173,195 ---- GameBase.level.total_monsters++; ! self.nextthink= GameBase.level.time + Defines.FRAMETIME; self.svflags |= Defines.SVF_MONSTER; self.s.renderfx |= Defines.RF_FRAMELERP; ! self.takedamage= Defines.DAMAGE_AIM; ! self.air_finished= GameBase.level.time + 12; ! self.use= GameUtilAdapters.monster_use; ! self.max_health= self.health; ! self.clipmask= Defines.MASK_MONSTERSOLID; ! self.s.skinnum= 0; ! self.deadflag= Defines.DEAD_NO; self.svflags &= ~Defines.SVF_DEADMONSTER; if (null == self.monsterinfo.checkattack) ! self.monsterinfo.checkattack= GameUtilAdapters.M_CheckAttack; Math3D.VectorCopy(self.s.origin, self.s.old_origin); ! if (GameBase.st.item != null && GameBase.st.item.length() > 0) { ! self.item= GameUtil.FindItemByClassname(GameBase.st.item); if (self.item == null) GameBase.gi.dprintf( *************** *** 219,223 **** // randomize what frame they start on if (self.monsterinfo.currentmove != null) ! self.s.frame = self.monsterinfo.currentmove.firstframe + (Lib.rand() % (self.monsterinfo.currentmove.lastframe - self.monsterinfo.currentmove.firstframe + 1)); --- 205,209 ---- // randomize what frame they start on if (self.monsterinfo.currentmove != null) ! self.s.frame= self.monsterinfo.currentmove.firstframe + (Lib.rand() % (self.monsterinfo.currentmove.lastframe - self.monsterinfo.currentmove.firstframe + 1)); *************** *** 226,233 **** } ! public static void monster_start_go(edict_t self) ! { ! float[] v = { 0, 0, 0 }; if (self.health <= 0) --- 212,218 ---- } ! public static void monster_start_go(edict_t self) { ! float[] v= { 0, 0, 0 }; if (self.health <= 0) *************** *** 235,245 **** // check for target to combat_point and change to combattarget ! if (self.target != null) ! { boolean notcombat; boolean fixup; ! edict_t target = null; ! notcombat = false; ! fixup = false; /* if (true) { --- 220,229 ---- // check for target to combat_point and change to combattarget ! if (self.target != null) { boolean notcombat; boolean fixup; ! edict_t target= null; ! notcombat= false; ! fixup= false; /* if (true) { *************** *** 259,275 **** */ ! EdictIterator edit = null; ! while ((edit = GameBase.G_Find(edit, GameBase.findByTarget, self.target)) != null) ! { ! target = edit.o; ! if (Lib.strcmp(target.classname, "point_combat") == 0) ! { ! self.combattarget = self.target; ! fixup = true; } ! else ! { ! notcombat = true; } } --- 243,256 ---- */ ! EdictIterator edit= null; ! while ((edit= GameBase.G_Find(edit, GameBase.findByTarget, self.target)) != null) { ! target= edit.o; ! if (Lib.strcmp(target.classname, "point_combat") == 0) { ! self.combattarget= self.target; ! fixup= true; } ! else { ! notcombat= true; } } *************** *** 277,295 **** GameBase.gi.dprintf(self.classname + " at " + Lib.vtos(self.s.origin) + " has target with mixed types\n"); if (fixup) ! self.target = null; } // validate combattarget ! if (self.combattarget != null) ! { ! edict_t target = null; ! EdictIterator edit = null; ! while ((edit = GameBase.G_Find(edit, GameBase.findByTarget, self.combattarget)) != null) ! { ! target = edit.o; ! if (Lib.strcmp(target.classname, "point_combat") != 0) ! { GameBase.gi.dprintf( self.classname --- 258,273 ---- GameBase.gi.dprintf(self.classname + " at " + Lib.vtos(self.s.origin) + " has target with mixed types\n"); if (fixup) ! self.target= null; } // validate combattarget ! if (self.combattarget != null) { ! edict_t target= null; ! EdictIterator edit= null; ! while ((edit= GameBase.G_Find(edit, GameBase.findByTarget, self.combattarget)) != null) { ! target= edit.o; ! if (Lib.strcmp(target.classname, "point_combat") != 0) { GameBase.gi.dprintf( self.classname *************** *** 306,341 **** } ! if (self.target != null) ! { ! self.goalentity = self.movetarget = GameBase.G_PickTarget(self.target); ! if (null == self.movetarget) ! { GameBase.gi.dprintf(self.classname + " can't find target " + self.target + " at " + Lib.vtos(self.s.origin) + "\n"); ! self.target = null; ! self.monsterinfo.pausetime = 100000000; self.monsterinfo.stand.think(self); } ! else if (Lib.strcmp(self.movetarget.classname, "path_corner") == 0) ! { Math3D.VectorSubtract(self.goalentity.s.origin, self.s.origin, v); ! self.ideal_yaw = self.s.angles[Defines.YAW] = Math3D.vectoyaw(v); self.monsterinfo.walk.think(self); ! self.target = null; } ! else ! { ! self.goalentity = self.movetarget = null; ! self.monsterinfo.pausetime = 100000000; self.monsterinfo.stand.think(self); } } ! else ! { ! self.monsterinfo.pausetime = 100000000; self.monsterinfo.stand.think(self); } ! self.think = MonsterAdapters.monster_think; ! self.nextthink = GameBase.level.time + Defines.FRAMETIME; } } --- 284,314 ---- } ! if (self.target != null) { ! self.goalentity= self.movetarget= GameBase.G_PickTarget(self.target); ! if (null == self.movetarget) { GameBase.gi.dprintf(self.classname + " can't find target " + self.target + " at " + Lib.vtos(self.s.origin) + "\n"); ! self.target= null; ! self.monsterinfo.pausetime= 100000000; self.monsterinfo.stand.think(self); } ! else if (Lib.strcmp(self.movetarget.classname, "path_corner") == 0) { Math3D.VectorSubtract(self.goalentity.s.origin, self.s.origin, v); ! self.ideal_yaw= self.s.angles[Defines.YAW]= Math3D.vectoyaw(v); self.monsterinfo.walk.think(self); ! self.target= null; } ! else { ! self.goalentity= self.movetarget= null; ! self.monsterinfo.pausetime= 100000000; self.monsterinfo.stand.think(self); } } ! else { ! self.monsterinfo.pausetime= 100000000; self.monsterinfo.stand.think(self); } ! self.think= MonsterAdapters.monster_think; ! self.nextthink= GameBase.level.time + Defines.FRAMETIME; } } Index: SuperAdapter.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/SuperAdapter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SuperAdapter.java 4 Sep 2004 09:01:01 -0000 1.3 --- SuperAdapter.java 12 Sep 2004 18:25:49 -0000 1.4 *************** *** 29,38 **** import java.util.Vector; ! public class SuperAdapter ! { /** Adapter registration. */ ! private static void register(SuperAdapter sa, String id) ! { adapters.put(id, sa); } --- 29,36 ---- import java.util.Vector; ! public class SuperAdapter { /** Adapter registration. */ ! private static void register(SuperAdapter sa, String id) { adapters.put(id, sa); } *************** *** 42,83 **** /** Returns the adapter from the repository given by its ID. */ ! public static SuperAdapter getFromID(String key) ! { ! SuperAdapter sa = (SuperAdapter) adapters.get(key); ! // try to create the adapter ! if (sa == null) ! { Com.DPrintf("SuperAdapter.getFromID():adapter not found->" + key + "\n"); ! int pos = key.indexOf('$'); ! String classname = key; if (pos != -1) ! classname = key.substring(0, pos); ! // load class and instantiate ! try ! { //Com.DPrintf("SuperAdapter.getFromID():loading class->" + classname + "\n"); Class.forName(classname).newInstance(); } ! catch(Exception e) ! { Com.DPrintf("SuperAdapter.getFromID():class not found->" + classname + "\n"); } ! // try it again... ! sa = (SuperAdapter) adapters.get(key); ! if (sa == null) Com.DPrintf("jake2: could not load adapter:" + key + "\n"); } ! return sa; } /** Constructor, does the adapter registration. */ ! public SuperAdapter() ! { ! StackTraceElement tr[] = new Throwable().getStackTrace(); adapterid= tr[2].getClassName(); if (adapterid == "") --- 40,76 ---- /** Returns the adapter from the repository given by its ID. */ ! public static SuperAdapter getFromID(String key) { ! SuperAdapter sa= (SuperAdapter) adapters.get(key); ! // try to create the adapter ! if (sa == null) { Com.DPrintf("SuperAdapter.getFromID():adapter not found->" + key + "\n"); ! int pos= key.indexOf('$'); ! String classname= key; if (pos != -1) ! classname= key.substring(0, pos); ! // load class and instantiate ! try { //Com.DPrintf("SuperAdapter.getFromID():loading class->" + classname + "\n"); Class.forName(classname).newInstance(); } ! catch (Exception e) { Com.DPrintf("SuperAdapter.getFromID():class not found->" + classname + "\n"); } ! // try it again... ! sa= (SuperAdapter) adapters.get(key); ! if (sa == null) Com.DPrintf("jake2: could not load adapter:" + key + "\n"); } ! return sa; } /** Constructor, does the adapter registration. */ ! public SuperAdapter() { ! StackTraceElement tr[]= new Throwable().getStackTrace(); adapterid= tr[2].getClassName(); if (adapterid == "") *************** *** 88,93 **** /** Returns the Adapter-ID. */ ! public String getID() ! { return adapterid; } --- 81,85 ---- /** Returns the Adapter-ID. */ ! public String getID() { return adapterid; } Index: GamePWeapon.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GamePWeapon.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GamePWeapon.java 10 Sep 2004 19:02:55 -0000 1.3 --- GamePWeapon.java 12 Sep 2004 18:25:49 -0000 1.4 *************** *** 1234,1238 **** if (((ent.client.latched_buttons | ent.client.buttons) & Defines.BUTTON_ATTACK) != 0) { ent.client.latched_buttons &= ~Defines.BUTTON_ATTACK; ! if ((0 != ent.client.ammo_index) || (ent.client.pers.inventory[ent.client.ammo_index] >= ent.client.pers.weapon.quantity)) { --- 1234,1238 ---- if (((ent.client.latched_buttons | ent.client.buttons) & Defines.BUTTON_ATTACK) != 0) { ent.client.latched_buttons &= ~Defines.BUTTON_ATTACK; ! if ((0 == ent.client.ammo_index) || (ent.client.pers.inventory[ent.client.ammo_index] >= ent.client.pers.weapon.quantity)) { Index: usercmd_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/usercmd_t.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** usercmd_t.java 8 Jul 2004 15:58:44 -0000 1.2 --- usercmd_t.java 12 Sep 2004 18:25:49 -0000 1.3 *************** *** 31,35 **** public byte msec; public byte buttons; ! public short angles[] = new short[3]; public short forwardmove, sidemove, upmove; public byte impulse; // remove? --- 31,35 ---- public byte msec; public byte buttons; ! public short angles[]= new short[3]; public short forwardmove, sidemove, upmove; public byte impulse; // remove? *************** *** 37,86 **** public void reset() { ! forwardmove = sidemove = upmove = msec = buttons = impulse = lightlevel = 0; ! Arrays.fill(angles, (short)0); } ! ! public usercmd_t() {}; ! public usercmd_t(usercmd_t from) { ! msec = from.msec; ! buttons = from.buttons; ! angles[0] = from.angles[0]; ! angles[1] = from.angles[1]; ! angles[2] = from.angles[2]; ! forwardmove = from.forwardmove; ! sidemove = from.sidemove; ! upmove = from.upmove; ! impulse = from.impulse; ! lightlevel = from.lightlevel; } ! ! public usercmd_t set(usercmd_t from) ! { ! msec = from.msec; ! buttons = from.buttons; ! angles[0] = from.angles[0]; ! angles[1] = from.angles[1]; ! angles[2] = from.angles[2]; ! forwardmove = from.forwardmove; ! sidemove = from.sidemove; ! upmove = from.upmove; ! impulse = from.impulse; ! lightlevel = from.lightlevel; ! return this; } - - // public usercmd_t getClone() - // { - // try { - // usercmd_t u1 = (usercmd_t) this.clone(); - // u1.angles = Lib.clone(angles); - // return u1; - // } - // catch (CloneNotSupportedException e) { - // return null; - // } - // } - } \ No newline at end of file --- 37,73 ---- public void reset() { ! forwardmove= sidemove= upmove= msec= buttons= impulse= lightlevel= 0; ! Arrays.fill(angles, (short) 0); } ! ! public usercmd_t() { ! }; ! public usercmd_t(usercmd_t from) { ! msec= from.msec; ! buttons= from.buttons; ! angles[0]= from.angles[0]; ! angles[1]= from.angles[1]; ! angles[2]= from.angles[2]; ! forwardmove= from.forwardmove; ! sidemove= from.sidemove; ! upmove= from.upmove; ! impulse= from.impulse; ! lightlevel= from.lightlevel; } ! ! public usercmd_t set(usercmd_t from) { ! msec= from.msec; ! buttons= from.buttons; ! angles[0]= from.angles[0]; ! angles[1]= from.angles[1]; ! angles[2]= from.angles[2]; ! forwardmove= from.forwardmove; ! sidemove= from.sidemove; ! upmove= from.upmove; ! impulse= from.impulse; ! lightlevel= from.lightlevel; ! return this; } } \ No newline at end of file Index: GameUtil.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameUtil.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GameUtil.java 29 Aug 2004 21:39:24 -0000 1.5 --- GameUtil.java 12 Sep 2004 18:25:49 -0000 1.6 *************** *** 29,40 **** import jake2.util.Math3D; ! public class GameUtil extends GameBase ! { ! public static void checkClassname(edict_t ent) ! { ! if (ent.classname == null) ! { [...1978 lines suppressed...] Math3D.VectorSubtract(inflictor.s.origin, v, v); ! points = damage - 0.5f * Math3D.VectorLength(v); if (ent == attacker) ! points = points * 0.5f; ! if (points > 0) ! { ! if (CanDamage(ent, inflictor)) ! { Math3D.VectorSubtract(ent.s.origin, inflictor.s.origin, dir); T_Damage( --- 1237,1245 ---- Math3D.VectorMA(ent.s.origin, 0.5f, v, v); Math3D.VectorSubtract(inflictor.s.origin, v, v); ! points= damage - 0.5f * Math3D.VectorLength(v); if (ent == attacker) ! points= points * 0.5f; ! if (points > 0) { ! if (CanDamage(ent, inflictor)) { Math3D.VectorSubtract(ent.s.origin, inflictor.s.origin, dir); T_Damage( |
|
From: Rene S. <sa...@us...> - 2004-09-10 22:06:51
|
Update of /cvsroot/jake2/jake2/src/jake2/render/fastjogl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11120/src/jake2/render/fastjogl Modified Files: Light.java Log Message: did some cource cleanups Index: Light.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastjogl/Light.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Light.java 27 Jul 2004 11:58:29 -0000 1.7 --- Light.java 10 Sep 2004 19:02:52 -0000 1.8 *************** *** 760,763 **** } } - } --- 760,762 ---- |
|
From: Rene S. <sa...@us...> - 2004-09-10 22:02:24
|
Update of /cvsroot/jake2/jake2/src/jake2/sys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11120/src/jake2/sys Modified Files: Sys.java Log Message: did some cource cleanups Index: Sys.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sys/Sys.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Sys.java 29 Aug 2004 21:39:26 -0000 1.7 --- Sys.java 10 Sep 2004 19:02:56 -0000 1.8 *************** *** 58,82 **** public static File[] FindAll(String path, int musthave, int canthave) { ! int index = path.lastIndexOf('/'); if (index != -1) { ! findbase = path.substring(0, index); ! findpattern = path.substring(index + 1, path.length()); } else { ! findbase = path; ! findpattern = "*"; } if (findpattern.equals("*.*")) { ! findpattern = "*"; } ! File fdir = new File(findbase); if (!fdir.exists()) return null; ! FilenameFilter filter = new FileFilter(findpattern, musthave, canthave); return fdir.listFiles(filter); --- 58,82 ---- public static File[] FindAll(String path, int musthave, int canthave) { ! int index= path.lastIndexOf('/'); if (index != -1) { ! findbase= path.substring(0, index); ! findpattern= path.substring(index + 1, path.length()); } else { ! findbase= path; ! findpattern= "*"; } if (findpattern.equals("*.*")) { ! findpattern= "*"; } ! File fdir= new File(findbase); if (!fdir.exists()) return null; ! FilenameFilter filter= new FileFilter(findpattern, musthave, canthave); return fdir.listFiles(filter); *************** *** 102,108 **** FileFilter(String findpattern, int musthave, int canthave) { ! this.regexpr = convert2regexpr(findpattern); ! this.musthave = musthave; ! this.canthave = canthave; } --- 102,108 ---- FileFilter(String findpattern, int musthave, int canthave) { ! this.regexpr= convert2regexpr(findpattern); ! this.musthave= musthave; ! this.canthave= canthave; } *************** *** 120,156 **** String convert2regexpr(String pattern) { ! StringBuffer sb = new StringBuffer(); char c; ! boolean escape = false; String subst; // convert pattern ! for (int i = 0; i < pattern.length(); i++) { ! c = pattern.charAt(i); ! subst = null; switch (c) { case '*' : ! subst = (!escape) ? ".*" : "*"; break; case '.' : ! subst = (!escape) ? "\\." : "."; break; case '!' : ! subst = (!escape) ? "^" : "!"; break; case '?' : ! subst = (!escape) ? "." : "?"; break; case '\\' : ! escape = !escape; break; default : ! escape = false; } if (subst != null) { sb.append(subst); ! escape = false; } else --- 120,156 ---- String convert2regexpr(String pattern) { ! StringBuffer sb= new StringBuffer(); char c; ! boolean escape= false; String subst; // convert pattern ! for (int i= 0; i < pattern.length(); i++) { ! c= pattern.charAt(i); ! subst= null; switch (c) { case '*' : ! subst= (!escape) ? ".*" : "*"; break; case '.' : ! subst= (!escape) ? "\\." : "."; break; case '!' : ! subst= (!escape) ? "^" : "!"; break; case '?' : ! subst= (!escape) ? "." : "?"; break; case '\\' : ! escape= !escape; break; default : ! escape= false; } if (subst != null) { sb.append(subst); ! escape= false; } else *************** *** 159,163 **** // the converted pattern ! String regexpr = sb.toString(); //Com.DPrintf("pattern: " + pattern + " regexpr: " + regexpr + '\n'); --- 159,163 ---- // the converted pattern ! String regexpr= sb.toString(); //Com.DPrintf("pattern: " + pattern + " regexpr: " + regexpr + '\n'); *************** *** 174,178 **** boolean CompareAttributes(File dir, int musthave, int canthave) { // . and .. never match ! String name = dir.getName(); if (name.equals(".") || name.equals("..")) --- 174,178 ---- boolean CompareAttributes(File dir, int musthave, int canthave) { // . and .. never match ! String name= dir.getName(); if (name.equals(".") || name.equals("..")) *************** *** 184,190 **** } ! private static long secbase = System.currentTimeMillis(); public static int Milliseconds() { ! return Globals.curtime = (int) (System.currentTimeMillis() - secbase); } --- 184,190 ---- } ! private static long secbase= System.currentTimeMillis(); public static int Milliseconds() { ! return Globals.curtime= (int) (System.currentTimeMillis() - secbase); } *************** *** 204,211 **** // COM_FilePath (path, findbase); ! fdir = FindAll(path, canthave, musthave); ! fileindex =0; ! ! if (fdir == null) return null; return FindNext(); --- 204,212 ---- // COM_FilePath (path, findbase); ! fdir= FindAll(path, canthave, musthave); ! fileindex= 0; ! ! if (fdir == null) ! return null; return FindNext(); *************** *** 221,235 **** public static void FindClose() { ! ! if (fdir != null) ! fdir = null; ! } ! public static void SendKeyEvents() { KBD.Update(); ! // grab frame time ! Globals.sys_frame_time = Sys.Milliseconds(); } --- 222,233 ---- public static void FindClose() { ! fdir= null; } ! public static void SendKeyEvents() { KBD.Update(); ! // grab frame time ! Globals.sys_frame_time= Sys.Milliseconds(); } *************** *** 239,244 **** } ! public static void ConsoleOutput(String msg) ! { if (Globals.nostdout != null && Globals.nostdout.value != 0) return; --- 237,241 ---- } ! public static void ConsoleOutput(String msg) { if (Globals.nostdout != null && Globals.nostdout.value != 0) return; |
|
From: Rene S. <sa...@us...> - 2004-09-10 22:02:20
|
Update of /cvsroot/jake2/jake2/src/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11120/src/jake2 Modified Files: Defines.java Log Message: did some cource cleanups Index: Defines.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/Defines.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Defines.java 9 Jul 2004 06:50:51 -0000 1.3 --- Defines.java 10 Sep 2004 19:02:57 -0000 1.4 *************** *** 139,143 **** // remaining contents are non-visible, and don't eat brushes - public final static int CONTENTS_AREAPORTAL = 0x8000; --- 139,142 ---- *************** *** 162,166 **** public final static int SURF_LIGHT = 0x1; // value will hold the light strength - public final static int SURF_SLICK = 0x2; // effects game physics --- 161,164 ---- *************** *** 172,186 **** public final static int SURF_NODRAW = 0x80; // don't bother referencing the texture ! // structure offset for asm code ! public final static int CPLANE_NORMAL_X = 0; ! public final static int CPLANE_NORMAL_Y = 4; ! public final static int CPLANE_NORMAL_Z = 8; ! public final static int CPLANE_DIST = 12; ! public final static int CPLANE_TYPE = 16; ! public final static int CPLANE_SIGNBITS = 17; ! public final static int CPLANE_PAD0 = 18; ! public final static int CPLANE_PAD1 = 19; ! ! // pmove->pm_flags public final static int PMF_DUCKED = 1; public final static int PMF_JUMP_HELD = 2; --- 170,174 ---- public final static int SURF_NODRAW = 0x80; // don't bother referencing the texture ! // pmove->pm_flags public final static int PMF_DUCKED = 1; public final static int PMF_JUMP_HELD = 2; |
|
From: Rene S. <sa...@us...> - 2004-09-10 21:51:50
|
Update of /cvsroot/jake2/jake2/src/jake2/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11120/src/jake2/server Modified Files: SV_CCMDS.java SV_MAIN.java SV_SEND.java Log Message: did some cource cleanups Index: SV_CCMDS.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_CCMDS.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** SV_CCMDS.java 4 Sep 2004 19:08:30 -0000 1.10 --- SV_CCMDS.java 10 Sep 2004 19:02:56 -0000 1.11 *************** *** 66,70 **** for (i= 1; i < MAX_MASTERS; i++) - //memset (&master_adr[i], 0, sizeof(master_adr[i])); master_adr[i]= new netadr_t(); --- 66,69 ---- *************** *** 169,174 **** */ public static void SV_WipeSavegame(String savename) { - //char name[MAX_OSPATH]; - //char *s; String name, s; --- 168,171 ---- *************** *** 220,224 **** } try { - f2= new RandomAccessFile(dst, "rw"); } --- 217,220 ---- *************** *** 308,315 **** // change sav to sv2 - //l = strlen(name); - //strcpy(name + l - 3, "sv2"); - //l = strlen(name2); - //strcpy(name2 + l - 3, "sv2"); name= name.substring(0, name.length() - 3) + "sv2"; name2= name2.substring(0, name2.length() - 3) + "sv2"; --- 304,307 ---- *************** *** 478,486 **** // read the comment field - comment= f.readString(); // read the mapcmd - mapcmd= f.readString(); --- 470,476 ---- *************** *** 648,654 **** */ public static void SV_Loadgame_f() { - //char name[MAX_OSPATH]; - //FILE * f; - //char * dir; String name; --- 638,641 ---- *************** *** 686,690 **** SV_CopySaveGame(Cmd.Argv(1), "current"); - SV_ReadServerFile(); --- 673,676 ---- *************** *** 750,759 **** // copy it off SV_CopySaveGame("current", dir); - Com.Printf("Done.\n"); } //=============================================================== - /* ================== --- 736,743 ---- *************** *** 997,1001 **** try { svs.demofile.writeInt(len); ! svs.demofile.write(buf.data); } catch (IOException e1) { --- 981,985 ---- try { svs.demofile.writeInt(len); ! svs.demofile.write(buf.data,0, buf.cursize); } catch (IOException e1) { Index: SV_MAIN.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_MAIN.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SV_MAIN.java 29 Aug 2004 21:39:25 -0000 1.6 --- SV_MAIN.java 10 Sep 2004 19:02:56 -0000 1.7 *************** *** 36,43 **** public class SV_MAIN extends SV_GAME { ! static netadr_t master_adr[] = new netadr_t[MAX_MASTERS]; // address of group servers static { ! for (int i = 0; i < MAX_MASTERS; i++) { ! master_adr[i] = new netadr_t(); } } --- 36,43 ---- public class SV_MAIN extends SV_GAME { ! static netadr_t master_adr[]= new netadr_t[MAX_MASTERS]; // address of group servers static { ! for (int i= 0; i < MAX_MASTERS; i++) { ! master_adr[i]= new netadr_t(); } } *************** *** 95,103 **** if (drop.download != null) { FS.FreeFile(drop.download); ! drop.download = null; } ! drop.state = Defines.cs_zombie; // become free in a few seconds ! drop.name = ""; } --- 95,103 ---- if (drop.download != null) { FS.FreeFile(drop.download); ! drop.download= null; } ! drop.state= Defines.cs_zombie; // become free in a few seconds ! drop.name= ""; } *************** *** 119,123 **** public static String SV_StatusString() { String player; ! String status = ""; int i; client_t cl; --- 119,123 ---- public static String SV_StatusString() { String player; ! String status= ""; int i; client_t cl; *************** *** 125,137 **** int playerLength; ! status = Cvar.Serverinfo() + "\n"; ! for (i = 0; i < maxclients.value; i++) { ! cl = svs.clients[i]; if (cl.state == Defines.cs_connected || cl.state == Defines.cs_spawned) { ! player = "" + cl.edict.client.ps.stats[Defines.STAT_FRAGS] + " " + cl.ping + "\"" + cl.name + "\"\n"; ! playerLength = player.length(); ! statusLength = status.length(); if (statusLength + playerLength >= 1024) --- 125,137 ---- int playerLength; ! status= Cvar.Serverinfo() + "\n"; ! for (i= 0; i < maxclients.value; i++) { ! cl= svs.clients[i]; if (cl.state == Defines.cs_connected || cl.state == Defines.cs_spawned) { ! player= "" + cl.edict.client.ps.stats[Defines.STAT_FRAGS] + " " + cl.ping + "\"" + cl.name + "\"\n"; ! playerLength= player.length(); ! statusLength= status.length(); if (statusLength + playerLength >= 1024) *************** *** 182,196 **** return; // ignore in single player ! version = atoi(Cmd.Argv(1)); if (version != PROTOCOL_VERSION) ! string = hostname.string + ": wrong version\n"; else { ! count = 0; ! for (i = 0; i < maxclients.value; i++) if (svs.clients[i].state >= cs_connected) count++; ! string = hostname.string + " " + sv.name + " " + count + "/" + (int) maxclients.value + "\n"; } --- 182,196 ---- return; // ignore in single player ! version= atoi(Cmd.Argv(1)); if (version != PROTOCOL_VERSION) ! string= hostname.string + ": wrong version\n"; else { ! count= 0; ! for (i= 0; i < maxclients.value; i++) if (svs.clients[i].state >= cs_connected) count++; ! string= hostname.string + " " + sv.name + " " + count + "/" + (int) maxclients.value + "\n"; } *************** *** 225,238 **** int oldestTime; ! oldest = 0; ! oldestTime = 0x7fffffff; // see if we already have a challenge for this ip ! for (i = 0; i < MAX_CHALLENGES; i++) { if (NET.NET_CompareBaseAdr(Netchan.net_from, svs.challenges[i].adr)) break; if (svs.challenges[i].time < oldestTime) { ! oldestTime = svs.challenges[i].time; ! oldest = i; } } --- 225,238 ---- int oldestTime; ! oldest= 0; ! oldestTime= 0x7fffffff; // see if we already have a challenge for this ip ! for (i= 0; i < MAX_CHALLENGES; i++) { if (NET.NET_CompareBaseAdr(Netchan.net_from, svs.challenges[i].adr)) break; if (svs.challenges[i].time < oldestTime) { ! oldestTime= svs.challenges[i].time; ! oldest= i; } } *************** *** 240,247 **** if (i == MAX_CHALLENGES) { // overwrite the oldest ! svs.challenges[oldest].challenge = rand() & 0x7fff; ! svs.challenges[oldest].adr = Netchan.net_from; ! svs.challenges[oldest].time = (int) Globals.curtime; ! i = oldest; } --- 240,247 ---- if (i == MAX_CHALLENGES) { // overwrite the oldest ! svs.challenges[oldest].challenge= rand() & 0x7fff; ! svs.challenges[oldest].adr= Netchan.net_from; ! svs.challenges[oldest].time= (int) Globals.curtime; ! i= oldest; } *************** *** 258,267 **** */ public static void SVC_DirectConnect() { - //char userinfo[MAX_INFO_STRING]; String userinfo; netadr_t adr; int i; client_t cl; ! edict_t ent; int edictnum; --- 258,266 ---- */ public static void SVC_DirectConnect() { String userinfo; netadr_t adr; int i; client_t cl; ! edict_t ent; int edictnum; *************** *** 269,277 **** int qport; ! adr = Netchan.net_from; Com.DPrintf("SVC_DirectConnect ()\n"); ! version = atoi(Cmd.Argv(1)); if (version != PROTOCOL_VERSION) { Netchan.OutOfBandPrint(NS_SERVER, adr, "print\nServer is version " + VERSION + "\n"); --- 268,276 ---- int qport; ! adr= Netchan.net_from; Com.DPrintf("SVC_DirectConnect ()\n"); ! version= atoi(Cmd.Argv(1)); if (version != PROTOCOL_VERSION) { Netchan.OutOfBandPrint(NS_SERVER, adr, "print\nServer is version " + VERSION + "\n"); *************** *** 280,291 **** } ! qport = atoi(Cmd.Argv(2)); ! int challenge = atoi(Cmd.Argv(3)); ! userinfo = Cmd.Argv(4); //userinfo[sizeof(userinfo) - 1] = 0; // force the IP key/value pair so the game can filter based on ip ! userinfo = Info.Info_SetValueForKey1(userinfo, "ip", NET.AdrToString(Netchan.net_from)); // attractloop servers are ONLY for local clients --- 279,290 ---- } ! qport= atoi(Cmd.Argv(2)); ! int challenge= atoi(Cmd.Argv(3)); ! userinfo= Cmd.Argv(4); //userinfo[sizeof(userinfo) - 1] = 0; // force the IP key/value pair so the game can filter based on ip ! userinfo= Info.Info_SetValueForKey1(userinfo, "ip", NET.AdrToString(Netchan.net_from)); // attractloop servers are ONLY for local clients *************** *** 300,304 **** // see if the challenge is valid if (!NET.IsLocalAddress(adr)) { ! for (i = 0; i < MAX_CHALLENGES; i++) { if (NET.NET_CompareBaseAdr(Netchan.net_from, svs.challenges[i].adr)) { if (challenge == svs.challenges[i].challenge) --- 299,303 ---- // see if the challenge is valid if (!NET.IsLocalAddress(adr)) { ! for (i= 0; i < MAX_CHALLENGES; i++) { if (NET.NET_CompareBaseAdr(Netchan.net_from, svs.challenges[i].adr)) { if (challenge == svs.challenges[i].challenge) *************** *** 314,324 **** } - //newcl = temp; - //memset (newcl, 0, sizeof(client_t)); - //newcl = new client_t(); - // if there is already a slot for this ip, reuse it ! for (i = 0; i < maxclients.value; i++) { ! cl = svs.clients[i]; if (cl.state == cs_free) --- 313,319 ---- } // if there is already a slot for this ip, reuse it ! for (i= 0; i < maxclients.value; i++) { ! cl= svs.clients[i]; if (cl.state == cs_free) *************** *** 339,347 **** // find a client slot //newcl = null; ! int index = -1; ! for (i = 0; i < maxclients.value; i++) { ! cl = svs.clients[i]; if (cl.state == cs_free) { ! index = i; break; } --- 334,342 ---- // find a client slot //newcl = null; ! int index= -1; ! for (i= 0; i < maxclients.value; i++) { ! cl= svs.clients[i]; if (cl.state == cs_free) { ! index= i; break; } *************** *** 361,370 **** //*newcl = temp; ! sv_client = svs.clients[i]; //edictnum = (newcl-svs.clients)+1; ! int edictnum = i + 1; ! edict_t ent = GameBase.g_edicts[edictnum]; ! svs.clients[i].edict = ent; ! svs.clients[i].challenge = challenge; // save challenge for checksumming // get the game a chance to reject this connection or modify the userinfo --- 356,365 ---- //*newcl = temp; ! sv_client= svs.clients[i]; //edictnum = (newcl-svs.clients)+1; ! int edictnum= i + 1; ! edict_t ent= GameBase.g_edicts[edictnum]; ! svs.clients[i].edict= ent; ! svs.clients[i].challenge= challenge; // save challenge for checksumming // get the game a chance to reject this connection or modify the userinfo *************** *** 382,386 **** // parse some info from the info strings ! svs.clients[i].userinfo = userinfo; SV_UserinfoChanged(svs.clients[i]); --- 377,381 ---- // parse some info from the info strings ! svs.clients[i].userinfo= userinfo; SV_UserinfoChanged(svs.clients[i]); *************** *** 390,399 **** Netchan.Setup(NS_SERVER, svs.clients[i].netchan, adr, qport); ! svs.clients[i].state = cs_connected; SZ.Init(svs.clients[i].datagram, svs.clients[i].datagram_buf, svs.clients[i].datagram_buf.length); ! svs.clients[i].datagram.allowoverflow = true; ! svs.clients[i].lastmessage = svs.realtime; // don't timeout ! svs.clients[i].lastconnect = svs.realtime; Com.DPrintf("new client added.\n"); } --- 385,394 ---- Netchan.Setup(NS_SERVER, svs.clients[i].netchan, adr, qport); ! svs.clients[i].state= cs_connected; SZ.Init(svs.clients[i].datagram, svs.clients[i].datagram_buf, svs.clients[i].datagram_buf.length); ! svs.clients[i].datagram.allowoverflow= true; ! svs.clients[i].lastmessage= svs.realtime; // don't timeout ! svs.clients[i].lastconnect= svs.realtime; Com.DPrintf("new client added.\n"); } *************** *** 423,429 **** String remaining; ! i = Rcon_Validate(); ! String msg = new String(net_message.data, 4, -1); if (i == 0) --- 418,424 ---- String remaining; ! i= Rcon_Validate(); ! String msg= new String(net_message.data, 4, -1); if (i == 0) *************** *** 442,448 **** } else { ! remaining = ""; ! for (i = 2; i < Cmd.Argc(); i++) { remaining += Cmd.Argv(i); remaining += " "; --- 437,443 ---- } else { ! remaining= ""; ! for (i= 2; i < Cmd.Argc(); i++) { remaining += Cmd.Argv(i); remaining += " "; *************** *** 472,480 **** MSG.ReadLong(net_message); // skip the -1 marker ! s = MSG.ReadStringLine(net_message); Cmd.TokenizeString(s.toCharArray(), false); ! c = Cmd.Argv(0); //Com.Printf("Packet " + NET.AdrToString(Netchan.net_from) + " : " + c + "\n"); //Com.Printf(Lib.hexDump(net_message.data, 64, false) + "\n"); --- 467,475 ---- MSG.ReadLong(net_message); // skip the -1 marker ! s= MSG.ReadStringLine(net_message); Cmd.TokenizeString(s.toCharArray(), false); ! c= Cmd.Argv(0); //Com.Printf("Packet " + NET.AdrToString(Netchan.net_from) + " : " + c + "\n"); //Com.Printf(Lib.hexDump(net_message.data, 64, false) + "\n"); *************** *** 494,499 **** else if (0 == strcmp(c, "rcon")) SVC_RemoteCommand(); ! else ! { Com.Printf("bad connectionless packet from " + NET.AdrToString(Netchan.net_from) + "\n"); Com.Printf("[" + s + "]\n"); --- 489,493 ---- else if (0 == strcmp(c, "rcon")) SVC_RemoteCommand(); ! else { Com.Printf("bad connectionless packet from " + NET.AdrToString(Netchan.net_from) + "\n"); Com.Printf("[" + s + "]\n"); *************** *** 516,527 **** int total, count; ! for (i = 0; i < maxclients.value; i++) { ! cl = svs.clients[i]; if (cl.state != cs_spawned) continue; ! total = 0; ! count = 0; ! for (j = 0; j < LATENCY_COUNTS; j++) { if (cl.frame_latency[j] > 0) { count++; --- 510,521 ---- int total, count; ! for (i= 0; i < maxclients.value; i++) { ! cl= svs.clients[i]; if (cl.state != cs_spawned) continue; ! total= 0; ! count= 0; ! for (j= 0; j < LATENCY_COUNTS; j++) { if (cl.frame_latency[j] > 0) { count++; *************** *** 530,539 **** } if (0 == count) ! cl.ping = 0; else ! cl.ping = total / count; // let the game dll know about the ping ! cl.edict.client.ping = cl.ping; } } --- 524,533 ---- } if (0 == count) ! cl.ping= 0; else ! cl.ping= total / count; // let the game dll know about the ping ! cl.edict.client.ping= cl.ping; } } *************** *** 554,563 **** return; ! for (i = 0; i < maxclients.value; i++) { ! cl = svs.clients[i]; if (cl.state == cs_free) continue; ! cl.commandMsec = 1800; // 1600 + some slop } } --- 548,557 ---- return; ! for (i= 0; i < maxclients.value; i++) { ! cl= svs.clients[i]; if (cl.state == cs_free) continue; ! cl.commandMsec= 1800; // 1600 + some slop } } *************** *** 571,575 **** int i; client_t cl; ! int qport =0; while (NET.GetPacket(NS_SERVER, Netchan.net_from, net_message)) { --- 565,569 ---- int i; client_t cl; ! int qport= 0; while (NET.GetPacket(NS_SERVER, Netchan.net_from, net_message)) { *************** *** 589,597 **** MSG.ReadLong(net_message); // sequence number MSG.ReadLong(net_message); // sequence number ! qport = MSG.ReadShort(net_message) & 0xffff; // check for packets from connected clients ! for (i = 0; i < maxclients.value; i++) { ! cl = svs.clients[i]; if (cl.state == cs_free) continue; --- 583,591 ---- MSG.ReadLong(net_message); // sequence number MSG.ReadLong(net_message); // sequence number ! qport= MSG.ReadShort(net_message) & 0xffff; // check for packets from connected clients ! for (i= 0; i < maxclients.value; i++) { ! cl= svs.clients[i]; if (cl.state == cs_free) continue; *************** *** 602,611 **** if (cl.netchan.remote_address.port != Netchan.net_from.port) { Com.Printf("SV_ReadPackets: fixing up a translated port\n"); ! cl.netchan.remote_address.port = Netchan.net_from.port; } if (Netchan.Process(cl.netchan, net_message)) { // this is a valid, sequenced packet, so process it if (cl.state != cs_zombie) { ! cl.lastmessage = svs.realtime; // don't timeout SV_USER.SV_ExecuteClientMessage(cl); } --- 596,605 ---- if (cl.netchan.remote_address.port != Netchan.net_from.port) { Com.Printf("SV_ReadPackets: fixing up a translated port\n"); ! cl.netchan.remote_address.port= Netchan.net_from.port; } if (Netchan.Process(cl.netchan, net_message)) { // this is a valid, sequenced packet, so process it if (cl.state != cs_zombie) { ! cl.lastmessage= svs.realtime; // don't timeout SV_USER.SV_ExecuteClientMessage(cl); } *************** *** 638,652 **** int zombiepoint; ! droppoint = (int) (svs.realtime - 1000 * timeout.value); ! zombiepoint = (int) (svs.realtime - 1000 * zombietime.value); ! for (i = 0; i < maxclients.value; i++) { ! cl = svs.clients[i]; // message times may be wrong across a changelevel if (cl.lastmessage > svs.realtime) ! cl.lastmessage = svs.realtime; if (cl.state == cs_zombie && cl.lastmessage < zombiepoint) { ! cl.state = cs_free; // can now be reused continue; } --- 632,646 ---- int zombiepoint; ! droppoint= (int) (svs.realtime - 1000 * timeout.value); ! zombiepoint= (int) (svs.realtime - 1000 * zombietime.value); ! for (i= 0; i < maxclients.value; i++) { ! cl= svs.clients[i]; // message times may be wrong across a changelevel if (cl.lastmessage > svs.realtime) ! cl.lastmessage= svs.realtime; if (cl.state == cs_zombie && cl.lastmessage < zombiepoint) { ! cl.state= cs_free; // can now be reused continue; } *************** *** 654,658 **** SV_SEND.SV_BroadcastPrintf(PRINT_HIGH, cl.name + " timed out\n"); SV_DropClient(cl); ! cl.state = cs_free; // don't bother with zombie state } } --- 648,652 ---- SV_SEND.SV_BroadcastPrintf(PRINT_HIGH, cl.name + " timed out\n"); SV_DropClient(cl); ! cl.state= cs_free; // don't bother with zombie state } } *************** *** 671,678 **** int i; ! for (i = 0; i < GameBase.num_edicts; i++) { ! ent = GameBase.g_edicts[i]; // events only last for a single message ! ent.s.event = 0; } --- 665,672 ---- int i; ! for (i= 0; i < GameBase.num_edicts; i++) { ! ent= GameBase.g_edicts[i]; // events only last for a single message ! ent.s.event= 0; } *************** *** 686,690 **** public static void SV_RunGameFrame() { if (host_speeds.value != 0) ! time_before_game = Sys.Milliseconds(); // we always need to bump framenum, even if we --- 680,684 ---- public static void SV_RunGameFrame() { if (host_speeds.value != 0) ! time_before_game= Sys.Milliseconds(); // we always need to bump framenum, even if we *************** *** 693,697 **** // has the "current" frame sv.framenum++; ! sv.time = sv.framenum * 100; // don't run if paused --- 687,691 ---- // has the "current" frame sv.framenum++; ! sv.time= sv.framenum * 100; // don't run if paused *************** *** 703,712 **** if (sv_showclamp.value != 0) Com.Printf("sv highclamp\n"); ! svs.realtime = sv.time; } } if (host_speeds.value != 0) ! time_after_game = Sys.Milliseconds(); } --- 697,706 ---- if (sv_showclamp.value != 0) Com.Printf("sv highclamp\n"); ! svs.realtime= sv.time; } } if (host_speeds.value != 0) ! time_after_game= Sys.Milliseconds(); } *************** *** 719,723 **** */ public static void SV_Frame(long msec) { ! Globals.time_before_game = Globals.time_after_game = 0; // if server is not active, do nothing --- 713,717 ---- */ public static void SV_Frame(long msec) { ! Globals.time_before_game= Globals.time_after_game= 0; // if server is not active, do nothing *************** *** 735,749 **** // get packets from clients SV_ReadPackets(); ! //if (Game.g_edicts[1] !=null) // Com.p("player at:" + Lib.vtofsbeaty(Game.g_edicts[1].s.origin )); // move autonomous things around if enough time has passed ! if (0== sv_timedemo.value && svs.realtime < sv.time) { // never let the time get too far off if (sv.time - svs.realtime > 100) { if (sv_showclamp.value != 0) Com.Printf("sv lowclamp\n"); ! svs.realtime = sv.time - 100; } NET.NET_Sleep(sv.time - svs.realtime); --- 729,743 ---- // get packets from clients SV_ReadPackets(); ! //if (Game.g_edicts[1] !=null) // Com.p("player at:" + Lib.vtofsbeaty(Game.g_edicts[1].s.origin )); // move autonomous things around if enough time has passed ! if (0 == sv_timedemo.value && svs.realtime < sv.time) { // never let the time get too far off if (sv.time - svs.realtime > 100) { if (sv_showclamp.value != 0) Com.Printf("sv lowclamp\n"); ! svs.realtime= sv.time - 100; } NET.NET_Sleep(sv.time - svs.realtime); *************** *** 788,792 **** ================ */ ! public static final int HEARTBEAT_SECONDS = 300; public static void Master_Heartbeat() { String string; --- 782,786 ---- ================ */ ! public static final int HEARTBEAT_SECONDS= 300; public static void Master_Heartbeat() { String string; *************** *** 803,818 **** // check for time wraparound if (svs.last_heartbeat > svs.realtime) ! svs.last_heartbeat = svs.realtime; if (svs.realtime - svs.last_heartbeat < HEARTBEAT_SECONDS * 1000) return; // not time to send yet ! svs.last_heartbeat = svs.realtime; // send the same string that we would give for a status OOB command ! string = SV_StatusString(); // send to group master ! for (i = 0; i < MAX_MASTERS; i++) if (master_adr[i].port != 0) { Com.Printf("Sending heartbeat to " + NET.AdrToString(master_adr[i]) + "\n"); --- 797,812 ---- // check for time wraparound if (svs.last_heartbeat > svs.realtime) ! svs.last_heartbeat= svs.realtime; if (svs.realtime - svs.last_heartbeat < HEARTBEAT_SECONDS * 1000) return; // not time to send yet ! svs.last_heartbeat= svs.realtime; // send the same string that we would give for a status OOB command ! string= SV_StatusString(); // send to group master ! for (i= 0; i < MAX_MASTERS; i++) if (master_adr[i].port != 0) { Com.Printf("Sending heartbeat to " + NET.AdrToString(master_adr[i]) + "\n"); *************** *** 840,844 **** // send to group master ! for (i = 0; i < MAX_MASTERS; i++) if (master_adr[i].port != 0) { if (i > 0) --- 834,838 ---- // send to group master ! for (i= 0; i < MAX_MASTERS; i++) if (master_adr[i].port != 0) { if (i > 0) *************** *** 866,870 **** // name for C code ! cl.name = Info.Info_ValueForKey(cl.userinfo, "name"); // mask off high bit --- 860,864 ---- // name for C code ! cl.name= Info.Info_ValueForKey(cl.userinfo, "name"); // mask off high bit *************** *** 874,893 **** // rate command ! val = Info.Info_ValueForKey(cl.userinfo, "rate"); if (val.length() > 0) { ! i = atoi(val); ! cl.rate = i; if (cl.rate < 100) ! cl.rate = 100; if (cl.rate > 15000) ! cl.rate = 15000; } else ! cl.rate = 5000; // msg command ! val = Info.Info_ValueForKey(cl.userinfo, "msg"); if (val.length() > 0) { ! cl.messagelevel = atoi(val); } --- 868,887 ---- // rate command ! val= Info.Info_ValueForKey(cl.userinfo, "rate"); if (val.length() > 0) { ! i= atoi(val); ! cl.rate= i; if (cl.rate < 100) ! cl.rate= 100; if (cl.rate > 15000) ! cl.rate= 15000; } else ! cl.rate= 5000; // msg command ! val= Info.Info_ValueForKey(cl.userinfo, "msg"); if (val.length() > 0) { ! cl.messagelevel= atoi(val); } *************** *** 904,910 **** */ public static void SV_Init() { ! SV_CCMDS.SV_InitOperatorCommands (); //ok. ! rcon_password = Cvar.Get("rcon_password", "", 0); Cvar.Get("skill", "1", 0); Cvar.Get("deathmatch", "0", CVAR_LATCH); --- 898,904 ---- */ public static void SV_Init() { ! SV_CCMDS.SV_InitOperatorCommands(); //ok. ! rcon_password= Cvar.Get("rcon_password", "", 0); Cvar.Get("skill", "1", 0); Cvar.Get("deathmatch", "0", CVAR_LATCH); *************** *** 916,940 **** Cvar.Get("cheats", "1", CVAR_SERVERINFO | CVAR_LATCH); Cvar.Get("protocol", "" + PROTOCOL_VERSION, CVAR_SERVERINFO | CVAR_NOSET); ! ! SV_MAIN.maxclients = Cvar.Get("maxclients", "1", CVAR_SERVERINFO | CVAR_LATCH); ! hostname = Cvar.Get("hostname", "noname", CVAR_SERVERINFO | CVAR_ARCHIVE); ! timeout = Cvar.Get("timeout", "125", 0); ! zombietime = Cvar.Get("zombietime", "2", 0); ! sv_showclamp = Cvar.Get("showclamp", "0", 0); ! sv_paused = Cvar.Get("paused", "0", 0); ! sv_timedemo = Cvar.Get("timedemo", "0", 0); ! sv_enforcetime = Cvar.Get("sv_enforcetime", "0", 0); ! // TODO: carsten, re-allow downloads per default ! allow_download = Cvar.Get("allow_download", "0", CVAR_ARCHIVE); ! allow_download_players = Cvar.Get("allow_download_players", "0", CVAR_ARCHIVE); ! allow_download_models = Cvar.Get("allow_download_models", "1", CVAR_ARCHIVE); ! allow_download_sounds = Cvar.Get("allow_download_sounds", "1", CVAR_ARCHIVE); ! allow_download_maps = Cvar.Get("allow_download_maps", "1", CVAR_ARCHIVE); ! sv_noreload = Cvar.Get("sv_noreload", "0", 0); ! sv_airaccelerate = Cvar.Get("sv_airaccelerate", "0", CVAR_LATCH); ! public_server = Cvar.Get("public", "0", 0); ! sv_reconnect_limit = Cvar.Get("sv_reconnect_limit", "3", CVAR_ARCHIVE); SZ.Init(net_message, net_message_buffer, net_message_buffer.length); --- 910,934 ---- Cvar.Get("cheats", "1", CVAR_SERVERINFO | CVAR_LATCH); Cvar.Get("protocol", "" + PROTOCOL_VERSION, CVAR_SERVERINFO | CVAR_NOSET); ! ! SV_MAIN.maxclients= Cvar.Get("maxclients", "1", CVAR_SERVERINFO | CVAR_LATCH); ! hostname= Cvar.Get("hostname", "noname", CVAR_SERVERINFO | CVAR_ARCHIVE); ! timeout= Cvar.Get("timeout", "125", 0); ! zombietime= Cvar.Get("zombietime", "2", 0); ! sv_showclamp= Cvar.Get("showclamp", "0", 0); ! sv_paused= Cvar.Get("paused", "0", 0); ! sv_timedemo= Cvar.Get("timedemo", "0", 0); ! sv_enforcetime= Cvar.Get("sv_enforcetime", "0", 0); ! // TODO: carsten, re-allow downloads per default ! allow_download= Cvar.Get("allow_download", "0", CVAR_ARCHIVE); ! allow_download_players= Cvar.Get("allow_download_players", "0", CVAR_ARCHIVE); ! allow_download_models= Cvar.Get("allow_download_models", "1", CVAR_ARCHIVE); ! allow_download_sounds= Cvar.Get("allow_download_sounds", "1", CVAR_ARCHIVE); ! allow_download_maps= Cvar.Get("allow_download_maps", "1", CVAR_ARCHIVE); ! sv_noreload= Cvar.Get("sv_noreload", "0", 0); ! sv_airaccelerate= Cvar.Get("sv_airaccelerate", "0", CVAR_LATCH); ! public_server= Cvar.Get("public", "0", 0); ! sv_reconnect_limit= Cvar.Get("sv_reconnect_limit", "3", CVAR_ARCHIVE); SZ.Init(net_message, net_message_buffer, net_message_buffer.length); *************** *** 968,978 **** // stagger the packets to crutch operating system limited buffers ! for (i = 0; i < maxclients.value; i++) { ! cl = svs.clients[i]; if (cl.state >= cs_connected) Netchan.Transmit(cl.netchan, net_message.cursize, net_message.data); } ! for (i = 0; i < maxclients.value; i++) { ! cl = svs.clients[i]; if (cl.state >= cs_connected) Netchan.Transmit(cl.netchan, net_message.cursize, net_message.data); --- 962,972 ---- // stagger the packets to crutch operating system limited buffers ! for (i= 0; i < maxclients.value; i++) { ! cl= svs.clients[i]; if (cl.state >= cs_connected) Netchan.Transmit(cl.netchan, net_message.cursize, net_message.data); } ! for (i= 0; i < maxclients.value; i++) { ! cl= svs.clients[i]; if (cl.state >= cs_connected) Netchan.Transmit(cl.netchan, net_message.cursize, net_message.data); *************** *** 993,998 **** Master_Shutdown(); ! ! SV_GAME.SV_ShutdownGameProgs (); // free current level --- 987,992 ---- Master_Shutdown(); ! ! SV_GAME.SV_ShutdownGameProgs(); // free current level *************** *** 1005,1018 **** } ! //memset (&sv, 0, sizeof(sv)); ! sv = new server_t(); ! ! Globals.server_state= sv.state; ! // free server static data ! //if (svs.clients!=null) ! // Z_Free (svs.clients); ! //if (svs.client_entities) ! // Z_Free (svs.client_entities); if (svs.demofile != null) --- 999,1005 ---- } ! sv= new server_t(); ! Globals.server_state= sv.state; if (svs.demofile != null) *************** *** 1023,1028 **** e1.printStackTrace(); } ! //memset (&svs, 0, sizeof(svs)); ! svs = new server_static_t(); } } --- 1010,1015 ---- e1.printStackTrace(); } ! ! svs= new server_static_t(); } } Index: SV_SEND.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_SEND.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SV_SEND.java 22 Aug 2004 14:25:13 -0000 1.4 --- SV_SEND.java 10 Sep 2004 19:02:56 -0000 1.5 *************** *** 71,84 **** */ public static void SV_ClientPrintf(client_t cl, int level, String s) { ! // va_list argptr; ! // char string[1024]; ! // if (level < cl.messagelevel) return; - // va_start (argptr,fmt); - // vsprintf (string, fmt,argptr); - // va_end (argptr); - MSG.WriteByte(cl.netchan.message, svc_print); MSG.WriteByte(cl.netchan.message, level); --- 71,78 ---- */ public static void SV_ClientPrintf(client_t cl, int level, String s) { ! if (level < cl.messagelevel) return; MSG.WriteByte(cl.netchan.message, svc_print); MSG.WriteByte(cl.netchan.message, level); *************** *** 94,118 **** */ public static void SV_BroadcastPrintf(int level, String s) { - //va_list argptr; - //char string[2048]; - client_t cl; - //int i; ! // va_start (argptr,fmt); ! // vsprintf (string, fmt,argptr); ! // va_end (argptr); // echo to console if (dedicated.value != 0) { - //char copy[1024]; - //int i; - - // mask off high bits - //for (i=0 ; i<1023 && string[i] ; i++) - //copy[i] = string[i]&127; - //copy[i] = 0; - //Com_Printf ("%s", copy); - Com.Printf(s); } --- 88,97 ---- */ public static void SV_BroadcastPrintf(int level, String s) { ! client_t cl; // echo to console if (dedicated.value != 0) { Com.Printf(s); } *************** *** 138,151 **** */ public static void SV_BroadcastCommand(String s) { - // va_list argptr; - // char string[1024]; if (sv.state == 0) return; - // va_start (argptr,fmt); - // vsprintf (string, fmt,argptr); - // va_end (argptr); - MSG.WriteByte(sv.multicast, svc_stufftext); MSG.WriteString(sv.multicast, s); --- 117,124 ---- |
|
From: Rene S. <sa...@us...> - 2004-09-10 19:03:46
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11120/src/jake2/qcommon Modified Files: SZ.java PMove.java Log Message: did some cource cleanups Index: SZ.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/SZ.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SZ.java 8 Jul 2004 15:58:46 -0000 1.2 --- SZ.java 10 Sep 2004 19:02:53 -0000 1.3 *************** *** 40,44 **** public static void Init(sizebuf_t buf, byte data[], int length) { - //memset (buf, 0, sizeof(*buf)); buf.data = data; buf.maxsize = length; --- 40,43 ---- Index: PMove.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/PMove.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PMove.java 22 Aug 2004 14:25:14 -0000 1.3 --- PMove.java 10 Sep 2004 19:02:53 -0000 1.4 *************** *** 1148,1152 **** // clear all pmove local vars - //memset(& pml, 0, sizeof(pml)); pml = new pml_t(); --- 1148,1151 ---- |
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11120/src/jake2/game Modified Files: GameTargetAdapters.java Fire.java GameAIAdapters.java GameFunc.java client_respawn_t.java M_SoldierAdapters.java GameUtilAdapters.java GameSave.java Info.java game_locals_t.java GameBase.java GameSpawn.java GameMisc.java GamePWeapon.java GameAI.java client_persistant_t.java gclient_t.java Removed Files: BigEndianHandler.java field_t.java LittleEndianHandler.java Log Message: did some cource cleanups Index: GameTargetAdapters.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameTargetAdapters.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GameTargetAdapters.java 29 Aug 2004 21:39:24 -0000 1.3 --- GameTargetAdapters.java 10 Sep 2004 19:02:53 -0000 1.4 *************** *** 88,95 **** if ((ent.spawnflags & 1) != 0) - //strncpy(game.helpmessage1, ent.message, sizeof(game.helpmessage2) - 1); GameBase.game.helpmessage1 = ent.message; else - //strncpy(game.helpmessage2, ent.message, sizeof(game.helpmessage1) - 1); GameBase.game.helpmessage2 = ent.message; --- 88,93 ---- Index: Info.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/Info.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Info.java 8 Jul 2004 15:58:44 -0000 1.2 --- Info.java 10 Sep 2004 19:02:54 -0000 1.3 *************** *** 55,59 **** } ! /** DANGEROUS, returns the modified userinfo string, was pointer-pointer manipulation first*/ public static String Info_SetValueForKey1(String s, String key, String value) { --- 55,59 ---- } ! /**TODO RST: DANGEROUS port, returns the modified userinfo string, was pointer-pointer manipulation first*/ public static String Info_SetValueForKey1(String s, String key, String value) { *************** *** 97,101 **** ! /** DANGEROUS, returns now the modified userinfo string.*/ public static String Info_RemoveKey1(String s, String key) { --- 97,101 ---- ! /** TODO RST: DANGEROUS port, returns now the modified userinfo string.*/ public static String Info_RemoveKey1(String s, String key) { Index: GameSave.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameSave.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GameSave.java 4 Sep 2004 19:08:30 -0000 1.5 --- GameSave.java 10 Sep 2004 19:02:54 -0000 1.6 *************** *** 29,48 **** public class GameSave extends GameFunc { - public static field_t levelfields[]= - { - new field_t("changemap", F_LSTRING), - new field_t("sight_client", F_EDICT), - new field_t("sight_entity", F_EDICT), - new field_t("sound_entity", F_EDICT), - new field_t("sound2_entity", F_EDICT), - new field_t(null, F_INT)}; - - public static field_t clientfields[]= - { - new field_t("pers.weapon", F_ITEM), - new field_t("pers.lastweapon", F_ITEM), - new field_t("newweapon", F_ITEM), - new field_t(null, F_INT)}; - public static void CreateEdicts() { g_edicts= new edict_t[game.maxentities]; --- 29,32 ---- *************** *** 131,137 **** CreateEdicts(); - // globals.edicts= g_edicts; - // globals.max_edicts= game.maxentities; - // initialize all clients for this game game.maxclients= (int) maxclients.value; --- 115,118 ---- Index: client_persistant_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/client_persistant_t.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** client_persistant_t.java 20 Aug 2004 21:29:58 -0000 1.5 --- client_persistant_t.java 10 Sep 2004 19:02:55 -0000 1.6 *************** *** 33,66 **** public class client_persistant_t { ! ! public void set(client_persistant_t from) ! { ! userinfo = from.userinfo; ! netname = from.netname; ! hand = from.hand; ! connected = from.connected; ! health = from.health; ! max_health = from.max_health; ! savedFlags = from.savedFlags; ! selected_item = from.selected_item; System.arraycopy(from.inventory, 0, inventory, 0, inventory.length); ! max_bullets = from.max_bullets; ! max_shells = from.max_shells; ! max_rockets = from.max_rockets; ! max_grenades = from.max_grenades; ! max_cells = from.max_cells; ! max_slugs = from.max_slugs; ! weapon = from.weapon; ! lastweapon = from.lastweapon; ! power_cubes = from.power_cubes; ! score = from.score; ! game_helpchanged = from.game_helpchanged; ! helpchanged = from.helpchanged; ! spectator = from.spectator; } // client data that stays across multiple level loads ! String userinfo = ""; ! String netname = ""; int hand; --- 33,66 ---- public class client_persistant_t { ! ! public void set(client_persistant_t from) { ! ! userinfo= from.userinfo; ! netname= from.netname; ! hand= from.hand; ! connected= from.connected; ! health= from.health; ! max_health= from.max_health; ! savedFlags= from.savedFlags; ! selected_item= from.selected_item; System.arraycopy(from.inventory, 0, inventory, 0, inventory.length); ! max_bullets= from.max_bullets; ! max_shells= from.max_shells; ! max_rockets= from.max_rockets; ! max_grenades= from.max_grenades; ! max_cells= from.max_cells; ! max_slugs= from.max_slugs; ! weapon= from.weapon; ! lastweapon= from.lastweapon; ! power_cubes= from.power_cubes; ! score= from.score; ! game_helpchanged= from.game_helpchanged; ! helpchanged= from.helpchanged; ! spectator= from.spectator; } // client data that stays across multiple level loads ! String userinfo= ""; ! String netname= ""; int hand; *************** *** 74,78 **** int selected_item; ! int inventory[] = new int[Defines.MAX_ITEMS]; // ammo capacities --- 74,78 ---- int selected_item; ! int inventory[]= new int[Defines.MAX_ITEMS]; // ammo capacities *************** *** 93,130 **** boolean spectator; // client is a spectator - /** Reads a client_persistant structure from a file. */ public void read(QuakeFile f) throws IOException { ! userinfo = f.readString(); ! netname = f.readString(); ! hand = f.readInt(); ! connected = f.readInt() != 0; ! health = f.readInt(); ! max_health = f.readInt(); ! savedFlags = f.readInt(); ! selected_item = f.readInt(); ! for (int n = 0; n < Defines.MAX_ITEMS; n++) ! inventory[n] = f.readInt(); ! max_bullets = f.readInt(); ! max_shells = f.readInt(); ! max_rockets = f.readInt(); ! max_grenades = f.readInt(); ! max_cells = f.readInt(); ! max_slugs = f.readInt(); ! weapon = f.readItem(); ! lastweapon = f.readItem(); ! power_cubes = f.readInt(); ! score = f.readInt(); ! game_helpchanged = f.readInt(); ! helpchanged = f.readInt(); ! spectator = f.readInt() != 0; } --- 93,129 ---- boolean spectator; // client is a spectator /** Reads a client_persistant structure from a file. */ public void read(QuakeFile f) throws IOException { ! userinfo= f.readString(); ! netname= f.readString(); ! hand= f.readInt(); ! connected= f.readInt() != 0; ! health= f.readInt(); ! max_health= f.readInt(); ! savedFlags= f.readInt(); ! selected_item= f.readInt(); ! for (int n= 0; n < Defines.MAX_ITEMS; n++) ! inventory[n]= f.readInt(); ! max_bullets= f.readInt(); ! max_shells= f.readInt(); ! max_rockets= f.readInt(); ! max_grenades= f.readInt(); ! max_cells= f.readInt(); ! max_slugs= f.readInt(); ! weapon= f.readItem(); ! lastweapon= f.readItem(); ! power_cubes= f.readInt(); ! score= f.readInt(); ! game_helpchanged= f.readInt(); ! helpchanged= f.readInt(); ! spectator= f.readInt() != 0; } *************** *** 137,141 **** f.writeInt(hand); ! f.writeInt(connected ? 1:0); f.writeInt(health); --- 136,140 ---- f.writeInt(hand); ! f.writeInt(connected ? 1 : 0); f.writeInt(health); *************** *** 144,148 **** f.writeInt(selected_item); ! for (int n = 0; n < Defines.MAX_ITEMS; n++) f.writeInt(inventory[n]); --- 143,147 ---- f.writeInt(selected_item); ! for (int n= 0; n < Defines.MAX_ITEMS; n++) f.writeInt(inventory[n]); *************** *** 161,200 **** f.writeInt(game_helpchanged); f.writeInt(helpchanged); ! f.writeInt(spectator?1:0); ! } ! ! ! public void dump() { ! // client persistant_t ! ! System.out.println("userinfo: " + userinfo); ! System.out.println("netname: " + netname); ! ! System.out.println("hand: " + hand); ! ! System.out.println("connected: " + connected); ! System.out.println("health: " + health); ! ! System.out.println("max_health: " + max_health); ! System.out.println("savedFlags: " + savedFlags); ! System.out.println("selected_item: " + selected_item); ! ! for (int n = 0; n < Defines.MAX_ITEMS; n++) ! System.out.println("inventory[" + n + "]: " + inventory[n]); ! ! System.out.println("max_bullets: " + max_bullets); ! System.out.println("max_shells: " + max_shells); ! System.out.println("max_rockets: " + max_rockets); ! System.out.println("max_grenades: " + max_grenades); ! System.out.println("max_cells: " + max_cells); ! System.out.println("max_slugs: " + max_slugs); ! System.out.println("weapon: " + weapon); ! System.out.println("lastweapon: " + lastweapon); ! System.out.println("powercubes: " + power_cubes); ! System.out.println("score: " + score); ! ! System.out.println("gamehelpchanged: " + game_helpchanged); ! System.out.println("helpchanged: " + helpchanged); ! System.out.println("spectator: " + spectator); } } \ No newline at end of file --- 160,164 ---- f.writeInt(game_helpchanged); f.writeInt(helpchanged); ! f.writeInt(spectator ? 1 : 0); } } \ No newline at end of file Index: M_SoldierAdapters.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/M_SoldierAdapters.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** M_SoldierAdapters.java 8 Jul 2004 15:58:44 -0000 1.1 --- M_SoldierAdapters.java 10 Sep 2004 19:02:54 -0000 1.2 *************** *** 628,633 **** }; ! /*QUAKED monster_soldier_ss (1 .5 0) (-16 -16 -24) (16 16 32) Ambush Trigger_Spawn Sight ! */ static EntThinkAdapter SP_monster_soldier_ss = new EntThinkAdapter() { --- 628,634 ---- }; ! /** ! * QUAKED monster_soldier_ss (1 .5 0) (-16 -16 -24) (16 16 32) Ambush Trigger_Spawn Sight ! */ static EntThinkAdapter SP_monster_soldier_ss = new EntThinkAdapter() { Index: GameMisc.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameMisc.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GameMisc.java 8 Jul 2004 15:58:44 -0000 1.2 --- GameMisc.java 10 Sep 2004 19:02:54 -0000 1.3 *************** *** 133,137 **** if (0 == (self.spawnflags & 1)) { ! // gi.dprintf("func_wall missing TRIGGER_SPAWN\n"); self.spawnflags |= 1; } --- 133,137 ---- if (0 == (self.spawnflags & 1)) { ! gi.dprintf("func_wall missing TRIGGER_SPAWN\n"); self.spawnflags |= 1; } *************** *** 687,691 **** func_clock_reset(self); - //self.message = gi.TagMalloc(CLOCK_MESSAGE_SIZE, TAG_LEVEL); self.message = new String(); --- 687,690 ---- Index: GameSpawn.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameSpawn.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GameSpawn.java 4 Sep 2004 19:08:30 -0000 1.7 --- GameSpawn.java 10 Sep 2004 19:02:54 -0000 1.8 *************** *** 28,124 **** public class GameSpawn extends GameSave { ! ! // static EntThinkAdapter SP_func_killbox = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // ! // static EntThinkAdapter SP_trigger_always = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_trigger_once = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_trigger_multiple = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_trigger_relay = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_trigger_push = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_trigger_hurt = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_trigger_key = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_trigger_counter = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_trigger_elevator = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_trigger_gravity = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_trigger_monsterjump = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // ! // static EntThinkAdapter SP_target_temp_entity = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_speaker = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_explosion = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_changelevel = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_secret = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_goal = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_splash = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_spawner = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_blaster = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_crosslevel_trigger = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_crosslevel_target = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_laser = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_help = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_actor = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_lightramp = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_earthquake = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_character = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_target_string = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // ! // //static EntThinkAdapter SP_worldspawn = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_viewthing = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // ! // static EntThinkAdapter SP_light = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_light_mine1 = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_light_mine2 = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_info_null = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_info_notnull = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_path_corner = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_point_combat = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // ! // static EntThinkAdapter SP_misc_explobox = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_banner = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_satellite_dish = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_actor = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_gib_arm = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_gib_leg = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_gib_head = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_insane = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_deadsoldier = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_viper = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_viper_bomb = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_bigviper = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_strogg_ship = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_teleporter = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_teleporter_dest = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_blackhole = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_eastertank = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_easterchick = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_misc_easterchick2 = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // ! // static EntThinkAdapter SP_monster_berserk = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_gladiator = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_gunner = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_infantry = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_soldier_light = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_soldier = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_soldier_ss = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_tank = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_medic = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_flipper = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_chick = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_parasite = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_flyer = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_brain = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_floater = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_hover = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_mutant = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_supertank = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_boss2 = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_jorg = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_monster_boss3_stand = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // ! // static EntThinkAdapter SP_monster_commander_body = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // ! // static EntThinkAdapter SP_turret_breach = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_turret_base = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! // static EntThinkAdapter SP_turret_driver = new EntThinkAdapter() {public boolean think(edict_t ent){ return true;}}; ! /* ============= --- 28,32 ---- public class GameSpawn extends GameSave { ! /* ============= *************** *** 156,160 **** */ static void ED_ParseField(String key, String value, edict_t ent) { - field_t f1; byte b; float v; --- 64,67 ---- Index: GamePWeapon.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GamePWeapon.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GamePWeapon.java 8 Jul 2004 15:58:44 -0000 1.2 --- GamePWeapon.java 10 Sep 2004 19:02:55 -0000 1.3 *************** *** 166,170 **** GameBase.gi.WriteByte(Defines.svc_muzzleflash); - //gi.WriteShort(ent - g_edicts); GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_GRENADE | GamePWeapon.is_silenced); --- 166,169 ---- *************** *** 237,241 **** // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! //gi.WriteShort(ent - g_edicts); GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_ROCKET | GamePWeapon.is_silenced); --- 236,240 ---- // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_ROCKET | GamePWeapon.is_silenced); *************** *** 456,460 **** // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! //gi.WriteShort(ent - g_edicts); GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_SHOTGUN | GamePWeapon.is_silenced); --- 455,459 ---- // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_SHOTGUN | GamePWeapon.is_silenced); *************** *** 532,536 **** // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! //gi.WriteShort(ent - g_edicts); GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_SSHOTGUN | GamePWeapon.is_silenced); --- 531,535 ---- // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_SSHOTGUN | GamePWeapon.is_silenced); *************** *** 597,601 **** // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! //gi.WriteShort(ent - g_edicts); GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_RAILGUN | GamePWeapon.is_silenced); --- 596,600 ---- // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_RAILGUN | GamePWeapon.is_silenced); *************** *** 646,650 **** // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! //gi.WriteShort(ent - g_edicts); GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_BFG | GamePWeapon.is_silenced); --- 645,649 ---- // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_BFG | GamePWeapon.is_silenced); *************** *** 882,886 **** GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! //gi.WriteShort(ent - g_edicts); GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_MACHINEGUN | is_silenced); --- 881,885 ---- GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte(Defines.MZ_MACHINEGUN | is_silenced); *************** *** 1006,1010 **** // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! //gi.WriteShort(ent - g_edicts); GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte((Defines.MZ_CHAINGUN1 + shots - 1) | is_silenced); --- 1005,1009 ---- // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); ! GameBase.gi.WriteShort(ent.index); GameBase.gi.WriteByte((Defines.MZ_CHAINGUN1 + shots - 1) | is_silenced); *************** *** 1066,1070 **** else i= 0; - //ent.s.skinnum = (ent - g_edicts - 1) | i; ent.s.skinnum= (ent.index - 1) | i; } --- 1065,1068 ---- *************** *** 1394,1398 **** // send muzzle flash GameBase.gi.WriteByte(Defines.svc_muzzleflash); - //gi.WriteShort(ent - g_edicts); GameBase.gi.WriteShort(ent.index); if (hyper) --- 1392,1395 ---- Index: gclient_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/gclient_t.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gclient_t.java 20 Aug 2004 21:29:58 -0000 1.3 --- gclient_t.java 10 Sep 2004 19:02:56 -0000 1.4 *************** *** 395,483 **** f.writeInt(8765); } - - public void dump() - { - - Com.Println("ping: " + ping); - - pers.dump(); - resp.dump(); - - old_pmove.dump(); - - Com.Println("showscores: " + showscores); - Com.Println("showinventury: " + showinventory); - Com.Println("showhelp: " + showhelp); - Com.Println("showhelpicon: " + showhelpicon); - Com.Println("ammoindex: " + ammo_index); - - Com.Println("buttons: " + buttons); - Com.Println("oldbuttons: " + oldbuttons); - Com.Println("latchedbuttons: " + latched_buttons); - - Com.Println("weaponthunk: " + weapon_thunk); - - Com.Println("newweapon: " + newweapon); - - Com.Println("damage_armor: " + damage_armor); - Com.Println("damage_parmor: " + damage_parmor); - Com.Println("damage_blood: " + damage_blood); - Com.Println("damage_knockback: " + damage_knockback); - - Lib.printv("damage_from", damage_from); - - Com.Println("killer_yaw: " + killer_yaw); - - Com.Println("weaponstate: " + weaponstate); - - Lib.printv("kick_angles", kick_angles); - Lib.printv("kick_origin", kick_origin); - - Com.Println("v_dmg_roll: " + v_dmg_roll); - Com.Println("v_dmg_pitch: " + v_dmg_pitch); - Com.Println("v_dmg_time: " + v_dmg_time); - - Com.Println("fall_time: " + fall_time); - Com.Println("fall_value: " + fall_value); - Com.Println("damage_alpha: " + damage_alpha); - Com.Println("bonus_alpha: " + bonus_alpha); - - Lib.printv("damage_blend", damage_blend); - - Lib.printv("v_angle", v_angle); - - Com.Println("bobtime: " + bobtime); - - Lib.printv("oldviewangles", oldviewangles); - Lib.printv("oldvelocity", oldvelocity); - - Com.Println("next_downtime: " + next_drown_time); - - Com.Println("old_waterlevel: " + old_waterlevel); - Com.Println("breathersound: " + breather_sound); - Com.Println("machinegun_shots: " + machinegun_shots); - Com.Println("anim_end: " + anim_end); - Com.Println("anim_priority: " + anim_priority); - Com.Println("anim_duck: " + anim_duck); - Com.Println("anim_run: " + anim_run); - - Com.Println("quad_framenum: " + quad_framenum); - Com.Println("invincible_framenum: " + invincible_framenum); - Com.Println("breather_framenum: " + breather_framenum); - Com.Println("enviro_framenum: " + enviro_framenum); - - Com.Println("grenade_blew_up: " + grenade_blew_up); - Com.Println("grenade_time: " + grenade_time); - Com.Println("silencer_shots: " + silencer_shots); - Com.Println("weapon_sound: " + weapon_sound); - Com.Println("pickup_msg_time: " + pickup_msg_time); - Com.Println("flood_locktill: " + flood_locktill); - - Lib.printv("flood_when", flood_when); - - Com.Println("flood_whenhead: " + flood_whenhead); - Com.Println("respawn_time: " + respawn_time); - Com.Println("chase_target: " + chase_target); - Com.Println("update_chase: " + update_chase); - } } --- 395,397 ---- Index: GameFunc.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameFunc.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GameFunc.java 9 Jul 2004 06:50:49 -0000 1.3 --- GameFunc.java 10 Sep 2004 19:02:53 -0000 1.4 *************** *** 375,379 **** if (Lib.Q_stricmp(t.classname, "func_areaportal") == 0) { - //Com.p("Setting portalstate to:" + open); gi.SetAreaPortalState(t.style, open); } --- 375,378 ---- Index: GameUtilAdapters.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameUtilAdapters.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GameUtilAdapters.java 8 Sep 2004 20:19:12 -0000 1.3 --- GameUtilAdapters.java 10 Sep 2004 19:02:54 -0000 1.4 *************** *** 67,70 **** --- 67,71 ---- } }; + static EntThinkAdapter DoRespawn = new EntThinkAdapter() { *************** *** 429,451 **** } }; - // ====================================================================== - /* - static ItemUseAdapter Use_Invulnerability = new ItemUseAdapter() - { - public void use(edict_t ent, gitem_t item) - { - - ent.client.pers.inventory[ITEM_INDEX(item)]--; - ValidateSelectedItem(ent); - - if (ent.client.invincible_framenum > level.framenum) - ent.client.invincible_framenum += 300; - else - ent.client.invincible_framenum = level.framenum + 300; - - gi.sound(ent, CHAN_ITEM, gi.soundindex("items/protect.wav"), 1, ATTN_NORM, 0); - } - }; - */ // ====================================================================== --- 430,433 ---- Index: Fire.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/Fire.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Fire.java 8 Jul 2004 15:58:43 -0000 1.2 --- Fire.java 10 Sep 2004 19:02:53 -0000 1.3 *************** *** 311,314 **** --- 311,315 ---- fire_lead(self, start, aimdir, damage, kick, Defines.TE_SHOTGUN, hspread, vspread, mod); } + public static void fire_blaster(edict_t self, float[] start, float[] dir, int damage, int speed, int effect, boolean hyper) { Index: GameBase.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameBase.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GameBase.java 29 Aug 2004 21:39:24 -0000 1.6 --- GameBase.java 10 Sep 2004 19:02:54 -0000 1.7 *************** *** 689,715 **** } }; - - //globals.apiversion= GAME_API_VERSION; - /* - globals.Init = InitGame; - globals.Shutdown = ShutdownGame; - globals.SpawnEntities = SpawnEntities; - - globals.WriteGame = WriteGame; - globals.ReadGame = ReadGame; - globals.WriteLevel = WriteLevel; - globals.ReadLevel = ReadLevel; - - globals.ClientThink = ClientThink; - globals.ClientConnect = ClientConnect; - globals.ClientUserinfoChanged = ClientUserinfoChanged; - globals.ClientDisconnect = ClientDisconnect; - globals.ClientBegin = ClientBegin; - globals.ClientCommand = ClientCommand; - globals.RunFrame = G_RunFrame; - globals.ServerCommand = ServerCommand; - */ - - //return globals; } } \ No newline at end of file --- 689,692 ---- Index: GameAI.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameAI.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GameAI.java 28 Aug 2004 16:40:12 -0000 1.3 --- GameAI.java 10 Sep 2004 19:02:55 -0000 1.4 *************** *** 1669,1673 **** public static void InitItems() { - //game.num_items = sizeof(itemlist)/sizeof(itemlist[0]) - 1; game.num_items = GameAI.itemlist.length - 1; } --- 1669,1672 ---- Index: GameAIAdapters.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameAIAdapters.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GameAIAdapters.java 22 Aug 2004 15:46:19 -0000 1.3 --- GameAIAdapters.java 10 Sep 2004 19:02:53 -0000 1.4 *************** *** 167,177 **** public static EntThinkAdapter swimmonster_start= new EntThinkAdapter() { public boolean think(edict_t self) { ! ! { ! self.flags |= Defines.FL_SWIM; ! self.think= swimmonster_start_go; ! Monster.monster_start(self); ! return true; ! } } }; --- 167,174 ---- public static EntThinkAdapter swimmonster_start= new EntThinkAdapter() { public boolean think(edict_t self) { ! self.flags |= Defines.FL_SWIM; ! self.think= swimmonster_start_go; ! Monster.monster_start(self); ! return true; } }; *************** *** 380,384 **** M.M_MoveToGoal(self, dist); self.monsterinfo.search_time= 0; ! // dprint("search timeout\n"); return; } --- 377,381 ---- M.M_MoveToGoal(self, dist); self.monsterinfo.search_time= 0; ! //dprint("search timeout\n"); return; } Index: game_locals_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/game_locals_t.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** game_locals_t.java 4 Sep 2004 19:08:29 -0000 1.5 --- game_locals_t.java 10 Sep 2004 19:02:54 -0000 1.6 *************** *** 108,127 **** f.writeInt(1928); } - - /** Prints the game locals.*/ - public void dump() - { - Com.Println("String helpmessage1: " + helpmessage1); - Com.Println("String helpmessage2: " + helpmessage2); - - Com.Println("spawnpoit: " + spawnpoint); - Com.Println("maxclients: " + maxclients); - Com.Println("maxentities: " + maxentities); - Com.Println("serverflags: " + serverflags); - Com.Println("numitems: " + num_items); - Com.Println("autosaved: " + autosaved); - - for (int i = 0; i < maxclients; i++) - clients[i].dump(); - } } --- 108,110 ---- --- BigEndianHandler.java DELETED --- Index: client_respawn_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/client_respawn_t.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** client_respawn_t.java 20 Aug 2004 21:29:57 -0000 1.5 --- client_respawn_t.java 10 Sep 2004 19:02:54 -0000 1.6 *************** *** 95,109 **** f.writeInt(spectator?1:0); } - - - - /** Prints out a client_respawn_t to the quake console.*/ - public void dump() - { - coop_respawn.dump(); - Com.Println("enterframe: " + enterframe); - Com.Println("score: " + score); - Lib.printv("cmd_angles", cmd_angles); - Com.Println("spectator: " + spectator); - } } --- 95,97 ---- --- field_t.java DELETED --- --- LittleEndianHandler.java DELETED --- |
|
From: Rene S. <sa...@us...> - 2004-09-10 19:03:20
|
Update of /cvsroot/jake2/jake2/src/jake2/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11120/src/jake2/util Modified Files: QuakeFile.java Math3D.java Log Message: did some cource cleanups Index: Math3D.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/util/Math3D.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Math3D.java 19 Jul 2004 19:32:12 -0000 1.5 --- Math3D.java 10 Sep 2004 19:02:56 -0000 1.6 *************** *** 117,132 **** return length; } ! // public static final float VectorNormalize2(float[] v, float[] to) { ! // float length, ilength; ! // ! // length = VectorLength(v); ! // if (length != 0.0f) { ! // ilength = 1.0f / length; ! // to[0] = v[0] * ilength; ! // to[1] = v[1] * ilength; ! // to[2] = v[2] * ilength; ! // } ! // return length; ! // } public static final float VectorLength(float v[]) { return (float) Math.sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]); --- 117,121 ---- return length; } ! public static final float VectorLength(float v[]) { return (float) Math.sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]); *************** *** 200,210 **** private static float tmpmat[][] = new float[3][3]; private static float zrot[][] = new float[3][3]; public static void RotatePointAroundVector(float[] dst, float[] dir, float[] point, float degrees) { - - //float m[][] = new float[3][3]; - //float im[][] = new float[3][3]; - //float zrot[][] = new float[3][3]; - //float tmpmat[][] = new float[3][3]; - //float rot[][] = new float[3][3]; float[] vr = { 0.0f, 0.0f, 0.0f }; --- 189,194 ---- private static float tmpmat[][] = new float[3][3]; private static float zrot[][] = new float[3][3]; + public static void RotatePointAroundVector(float[] dst, float[] dir, float[] point, float degrees) { float[] vr = { 0.0f, 0.0f, 0.0f }; *************** *** 231,236 **** m[2][2] = vf[2]; - //Math3D.MatCopy(m, im); // achtung: src -> dst - im[0][0] = m[0][0]; im[0][1] = m[1][0]; --- 215,218 ---- *************** *** 250,255 **** zrot[0][1] = (float) Math.sin(Math3D.DEG2RAD(degrees)); zrot[1][0] = -zrot[0][1]; - //zrot[1][0] = - (float) Math.sin(Math3D.DEG2RAD(degrees)); - //zrot[1][1] = (float) Math.cos(Math3D.DEG2RAD(degrees)); Math3D.R_ConcatRotations(m, zrot, tmpmat); --- 232,235 ---- *************** *** 486,505 **** } - // public static void MatClear(float m[][]) { - // m[0][0] = m[0][1] = m[0][2] = m[1][0] = m[1][1] = m[1][2] = m[2][0] = m[2][1] = m[2][2] = 0.0f; - // } - - // private static final void MatCopy(float src[][], float dst[][]) { - // dst[0][0]=src[0][0]; - // dst[0][1]=src[0][1]; - // dst[0][2]=src[0][2]; - // dst[1][0]=src[1][0]; - // dst[1][1]=src[1][1]; - // dst[1][2]=src[1][2]; - // dst[2][0]=src[2][0]; - // dst[2][1]=src[2][1]; - // dst[2][2]=src[2][2]; - // } - public static void G_ProjectSource(float[] point, float[] distance, float[] forward, float[] right, float[] result) { result[0] = point[0] + forward[0] * distance[0] + right[0] * distance[1]; --- 466,469 ---- Index: QuakeFile.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/util/QuakeFile.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** QuakeFile.java 4 Sep 2004 19:08:30 -0000 1.2 --- QuakeFile.java 10 Sep 2004 19:02:56 -0000 1.3 *************** *** 32,37 **** import java.io.*; ! /** RandomAccessFile, bur handles readString/WriteString specially and ! * offers other helper functions */ public class QuakeFile extends RandomAccessFile { --- 32,39 ---- import java.io.*; ! /** ! * RandomAccessFile, but handles readString/WriteString specially and ! * offers other helper functions ! */ public class QuakeFile extends RandomAccessFile { |
|
From: Holger Z. <hz...@us...> - 2004-09-08 21:18:56
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19469 Modified Files: Tag: r_0_9 build.xml Log Message: hopefully the last change for 0.9.3 Index: build.xml =================================================================== RCS file: /cvsroot/jake2/jake2/build.xml,v retrieving revision 1.3.2.5 retrieving revision 1.3.2.6 diff -C2 -d -r1.3.2.5 -r1.3.2.6 *** build.xml 8 Sep 2004 20:57:08 -0000 1.3.2.5 --- build.xml 8 Sep 2004 21:18:46 -0000 1.3.2.6 *************** *** 23,31 **** <!-- usage --> <target name="usage"> ! <echo message="command line arguments of build.sh or build.bat"/> <echo message=""/> ! <echo message="bindist build only binary distibution"/> ! <echo message="srcdist build only source distibution"/> ! <echo message="all build source and binary distibution"/> <echo message="clean delete classfiles keep jake2*.tar.gz and jake2*.zip"/> <echo message="distclean delete all generated files"/> --- 23,31 ---- <!-- usage --> <target name="usage"> ! <echo message="command line arguments for build.sh or build.bat"/> <echo message=""/> ! <echo message="bindist build only binary distribution"/> ! <echo message="srcdist build only source distribution"/> ! <echo message="all build source and binary distribution"/> <echo message="clean delete classfiles keep jake2*.tar.gz and jake2*.zip"/> <echo message="distclean delete all generated files"/> |
|
From: Carsten W. <ca...@us...> - 2004-09-08 21:10:15
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18017 Modified Files: build.xml Log Message: syntax error :-) Index: build.xml =================================================================== RCS file: /cvsroot/jake2/jake2/build.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** build.xml 8 Sep 2004 20:42:48 -0000 1.6 --- build.xml 8 Sep 2004 21:10:04 -0000 1.7 *************** *** 23,31 **** <!-- usage --> <target name="usage"> ! <echo message="command line arguments of build.sh or build.bat"/> <echo message=""/> ! <echo message="bindist build only binary distibution"/> ! <echo message="srcdist build only source distibution"/> ! <echo message="all build source and binary distibution"/> <echo message="clean delete classfiles keep jake2*.tar.gz and jake2*.zip"/> <echo message="distclean delete all generated files"/> --- 23,31 ---- <!-- usage --> <target name="usage"> ! <echo message="command line arguments for build.sh or build.bat"/> <echo message=""/> ! <echo message="bindist build only binary distribution"/> ! <echo message="srcdist build only source distribution"/> ! <echo message="all build source and binary distribution"/> <echo message="clean delete classfiles keep jake2*.tar.gz and jake2*.zip"/> <echo message="distclean delete all generated files"/> |
|
From: Holger Z. <hz...@us...> - 2004-09-08 20:57:18
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15869/src/jake2/game Modified Files: Tag: r_0_9 GameUtilAdapters.java Log Message: last changes for 0.9.3 Index: GameUtilAdapters.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameUtilAdapters.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** GameUtilAdapters.java 9 Jul 2004 08:38:29 -0000 1.1.2.1 --- GameUtilAdapters.java 8 Sep 2004 20:57:08 -0000 1.1.2.2 *************** *** 79,83 **** master = ent.teammaster; - // tiefe zählen // count the depth for (count = 0, ent = master; ent != null; ent = ent.chain, count++); --- 79,82 ---- |
|
From: Holger Z. <hz...@us...> - 2004-09-08 20:57:18
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15869 Modified Files: Tag: r_0_9 build.xml ChangeLog Log Message: last changes for 0.9.3 Index: build.xml =================================================================== RCS file: /cvsroot/jake2/jake2/build.xml,v retrieving revision 1.3.2.4 retrieving revision 1.3.2.5 diff -C2 -d -r1.3.2.4 -r1.3.2.5 *** build.xml 6 Sep 2004 19:39:19 -0000 1.3.2.4 --- build.xml 8 Sep 2004 20:57:08 -0000 1.3.2.5 *************** *** 1,4 **** <!-- Buildfile --> ! <project name="jake2" default="dist" basedir="."> <taskdef name="proguard" classname="proguard.ant.ProGuardTask"> --- 1,4 ---- <!-- Buildfile --> ! <project name="jake2" default="usage" basedir="."> <taskdef name="proguard" classname="proguard.ant.ProGuardTask"> *************** *** 21,24 **** --- 21,37 ---- </path> + <!-- usage --> + <target name="usage"> + <echo message="command line arguments of build.sh or build.bat"/> + <echo message=""/> + <echo message="bindist build only binary distibution"/> + <echo message="srcdist build only source distibution"/> + <echo message="all build source and binary distibution"/> + <echo message="clean delete classfiles keep jake2*.tar.gz and jake2*.zip"/> + <echo message="distclean delete all generated files"/> + <echo message="jar build only dist/lib/jake2.jar"/> + <echo message=""/> + </target> + <!-- initialize directories --> <target name="init"> *************** *** 130,134 **** <!-- source distribution --> ! <target name="srcdist" > <tar destfile="jake2src-${version}.tar.gz" compression="gzip"> <tarfileset dir="." prefix="Jake2" mode="755"> --- 143,147 ---- <!-- source distribution --> ! <target name="srcdist"> <tar destfile="jake2src-${version}.tar.gz" compression="gzip"> <tarfileset dir="." prefix="Jake2" mode="755"> *************** *** 166,170 **** <target name="clean"> <delete dir="${build}"/> - <delete dir="${gensrc}"/> </target> --- 179,182 ---- Index: ChangeLog =================================================================== RCS file: /cvsroot/jake2/jake2/ChangeLog,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** ChangeLog 6 Sep 2004 19:39:20 -0000 1.1.2.3 --- ChangeLog 8 Sep 2004 20:57:08 -0000 1.1.2.4 *************** *** 1,3 **** ! 0.9.3 2004-09-06 - savegames --- 1,3 ---- ! 0.9.3 2004-09-09 - savegames *************** *** 5,8 **** --- 5,9 ---- - better fullscreen vidmode selection - memory footprint reduced + - improved performance - bugfixes |
|
From: Holger Z. <hz...@us...> - 2004-09-08 20:43:11
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12969 Modified Files: build.xml Log Message: usage message Index: build.xml =================================================================== RCS file: /cvsroot/jake2/jake2/build.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** build.xml 8 Sep 2004 20:18:02 -0000 1.5 --- build.xml 8 Sep 2004 20:42:48 -0000 1.6 *************** *** 25,34 **** <echo message="command line arguments of build.sh or build.bat"/> <echo message=""/> ! <echo message="bindist only binary distibution"/> ! <echo message="srcdist only source distibution"/> ! <echo message="all source and binary distibution"/> ! <echo message="clean keep jake2-cvs.tar.gz and jake2-cvs.zip"/> ! <echo message="distclean delete all"/> ! <echo message="jar only dist/lib/jake2.jar"/> <echo message=""/> </target> --- 25,34 ---- <echo message="command line arguments of build.sh or build.bat"/> <echo message=""/> ! <echo message="bindist build only binary distibution"/> ! <echo message="srcdist build only source distibution"/> ! <echo message="all build source and binary distibution"/> ! <echo message="clean delete classfiles keep jake2*.tar.gz and jake2*.zip"/> ! <echo message="distclean delete all generated files"/> ! <echo message="jar build only dist/lib/jake2.jar"/> <echo message=""/> </target> *************** *** 179,183 **** <target name="clean"> <delete dir="${build}"/> - <delete dir="${gensrc}"/> </target> --- 179,182 ---- |
|
From: Holger Z. <hz...@us...> - 2004-09-08 20:41:35
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12764 Modified Files: ChangeLog Log Message: changes for 0.9.3 Index: ChangeLog =================================================================== RCS file: /cvsroot/jake2/jake2/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ChangeLog 30 Aug 2004 06:25:33 -0000 1.3 --- ChangeLog 8 Sep 2004 20:41:20 -0000 1.4 *************** *** 1,3 **** ! 0.9.3 - savegames --- 1,3 ---- ! 0.9.3 2004-09-09 - savegames *************** *** 5,8 **** --- 5,9 ---- - better fullscreen vidmode selection - memory footprint reduced + - improved performance - bugfixes |
|
From: Carsten W. <ca...@us...> - 2004-09-08 20:19:22
|
Update of /cvsroot/jake2/jake2/src/jake2/game In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8462/src/jake2/game Modified Files: GameUtilAdapters.java Log Message: use only ASCII in source :-) Index: GameUtilAdapters.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameUtilAdapters.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GameUtilAdapters.java 9 Jul 2004 06:50:49 -0000 1.2 --- GameUtilAdapters.java 8 Sep 2004 20:19:12 -0000 1.3 *************** *** 79,83 **** master = ent.teammaster; - // tiefe zählen // count the depth for (count = 0, ent = master; ent != null; ent = ent.chain, count++); --- 79,82 ---- |
|
From: Carsten W. <ca...@us...> - 2004-09-08 20:18:12
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8222 Modified Files: build.xml Log Message: default target usage Index: build.xml =================================================================== RCS file: /cvsroot/jake2/jake2/build.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** build.xml 9 Jul 2004 06:50:48 -0000 1.4 --- build.xml 8 Sep 2004 20:18:02 -0000 1.5 *************** *** 1,4 **** <!-- Buildfile --> ! <project name="jake2" default="dist" basedir="."> <taskdef name="proguard" classname="proguard.ant.ProGuardTask"> --- 1,4 ---- <!-- Buildfile --> ! <project name="jake2" default="usage" basedir="."> <taskdef name="proguard" classname="proguard.ant.ProGuardTask"> *************** *** 21,24 **** --- 21,37 ---- </path> + <!-- usage --> + <target name="usage"> + <echo message="command line arguments of build.sh or build.bat"/> + <echo message=""/> + <echo message="bindist only binary distibution"/> + <echo message="srcdist only source distibution"/> + <echo message="all source and binary distibution"/> + <echo message="clean keep jake2-cvs.tar.gz and jake2-cvs.zip"/> + <echo message="distclean delete all"/> + <echo message="jar only dist/lib/jake2.jar"/> + <echo message=""/> + </target> + <!-- initialize directories --> <target name="init"> |
|
From: Holger Z. <hz...@us...> - 2004-09-08 09:52:01
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17961 Modified Files: README README_DE Log Message: update CVS instructions Index: README =================================================================== RCS file: /cvsroot/jake2/jake2/README,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** README 8 Sep 2004 06:38:20 -0000 1.3 --- README 8 Sep 2004 09:51:51 -0000 1.4 *************** *** 45,50 **** Jake2 sources from CVS. - "cvs -d:pserver:ano...@cv...:/cvsroot/jake2 login" ! - when askesd for password jut hit return ! - "cvs co jake2" - procced with the build from source instructions --- 45,50 ---- Jake2 sources from CVS. - "cvs -d:pserver:ano...@cv...:/cvsroot/jake2 login" ! - when askesd for password simply press the Enter key ! - "cvs -d:pserver:ano...@cv...:/cvsroot/jake2 co jake2" - procced with the build from source instructions Index: README_DE =================================================================== RCS file: /cvsroot/jake2/jake2/README_DE,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** README_DE 8 Sep 2004 06:38:21 -0000 1.3 --- README_DE 8 Sep 2004 09:51:51 -0000 1.4 *************** *** 48,53 **** Sourcetree per anonymous CVS ausgecheckt werden. - "cvs -d:pserver:ano...@cv...:/cvsroot/jake2 login" ! - bei der Frage nach dem Passwort gehts mit RETURN weiter ! - "cvs co jake2" - dann gehts weiter wie oben für die Sourcedistribution beschrieben --- 48,53 ---- Sourcetree per anonymous CVS ausgecheckt werden. - "cvs -d:pserver:ano...@cv...:/cvsroot/jake2 login" ! - bei der Frage nach dem Passwort einfach Enter drücken ! - "cvs -d:pserver:ano...@cv...:/cvsroot/jake2 co jake2" - dann gehts weiter wie oben für die Sourcedistribution beschrieben |
|
From: Holger Z. <hz...@us...> - 2004-09-08 09:46:08
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16527/src/jake2/client Modified Files: Tag: r_0_9 CL.java Log Message: merge late changes for 0.9.3 Index: CL.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL.java,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -C2 -d -r1.4.2.2 -r1.4.2.3 *** CL.java 6 Sep 2004 19:39:13 -0000 1.4.2.2 --- CL.java 8 Sep 2004 09:45:29 -0000 1.4.2.3 *************** *** 1261,1265 **** cl_run = Cvar.Get("cl_run", "0", CVAR_ARCHIVE); - freelook = Cvar.Get("freelook", "0", CVAR_ARCHIVE); lookspring = Cvar.Get("lookspring", "0", CVAR_ARCHIVE); lookstrafe = Cvar.Get("lookstrafe", "0", CVAR_ARCHIVE); --- 1261,1264 ---- |
2 messages has been excluded from this view by a project administrator.
