diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | README | 16 | ||||
| -rw-r--r-- | README_DE | 34 | ||||
| -rw-r--r-- | build.xml | 14 | ||||
| -rw-r--r-- | install.xml | 96 | ||||
| -rw-r--r-- | scripts/Jake2.bat | 4 | ||||
| -rw-r--r-- | scripts/Jake2.sh | 4 | ||||
| -rw-r--r-- | scripts/Jake2_lwjgl.bat | 4 | ||||
| -rw-r--r-- | scripts/Jake2_lwjgl.sh | 6 | ||||
| -rw-r--r-- | scripts/Jake2_mac.sh | 6 | ||||
| -rw-r--r-- | scripts/Jake2_mac_lwjgl.sh | 6 | ||||
| -rw-r--r-- | src/jake2/client/VID.java | 20 | ||||
| -rw-r--r-- | src/jake2/qcommon/Cvar.java | 15 | ||||
| -rw-r--r-- | src/jake2/qcommon/FS.java | 9 | ||||
| -rw-r--r-- | src/jake2/qcommon/Q2DataDialog.java | 12 | ||||
| -rw-r--r-- | src/jake2/qcommon/Qcommon.java | 6 | ||||
| -rw-r--r-- | src/jake2/sound/S.java | 4 | ||||
| -rw-r--r-- | src/jake2/util/Lib.java | 8 | ||||
| -rw-r--r-- | webstart/jake2_jogl11.jnlp | 2 | ||||
| -rw-r--r-- | webstart/jake2_jogl11ATI.jnlp | 2 | ||||
| -rw-r--r-- | webstart/jake2_lwjgl.jnlp | 2 |
21 files changed, 192 insertions, 82 deletions
@@ -1,4 +1,4 @@ -0.9.4 +0.9.4 2005-05-26 - multiplayer client and server functionality - Mac OS X support @@ -7,6 +7,8 @@ - standalone installer - online installation of Quake2 demo data files - mouse wheel support + - very fast screenshot function + - memory footprint reduced - bugfixes 0.9.3 2004-09-09 @@ -6,7 +6,7 @@ distributed under the terms of the GPL (see LICENSE). The port was done completely in Java. No native libraries are used for the game functionality. We use the jogl Java OpenGL bindings for graphics rendering -and Java OpenAL (joal) for sound. The latest release comes with an lwjgl driver +and Java OpenAL (joal) for sound. The 0.9.4 release comes with an lwjgl driver as an alternative for the jogl/joal combination. Jake2 is still under development. Send bug reports and feedback to @@ -23,10 +23,12 @@ Installation ------------ from binary distribution: -- run the installer with "java -jar Jake2-Install.jar" +- run the installer with "java -jar Jake2-0.9.4-install.jar" - follow the instructions - change to the installation directory - run the game with Jake2.sh or Jake2.bat +- to run Jake2 with the lwjgl OpenGL/OpenAL driver use Jake2_lwjgl.sh + or Jake2_lwjgl.bat build from source: - unpack jake2src-version.tar.gz or jake2-version.zip @@ -43,7 +45,7 @@ Jake2 sources from CVS. - "cvs -d:pserver:[email protected]:/cvsroot/jake2 login" - when askesd for password simply press the Enter key - "cvs -d:pserver:[email protected]:/cvsroot/jake2 co jake2" -- procced with the build from source instructions +- proceed with the build from source instructions 3rd party components -------------------- @@ -60,14 +62,16 @@ ant build tool http://ant.apache.org xerces XML library http://xml.apache.org proguard obfuscator http://proguard.sourceforge.net - +Use <[email protected]> for bug reports and feedback. have fun! bytonic Software - +---------------- Holger Zickner <[email protected]> Carsten Weisse <[email protected]> Rene Stoeckel <[email protected]> -Use <[email protected]> for bug reports and feedback.
\ No newline at end of file +Contributors +------------ +David Sanders lwjgl support @@ -8,8 +8,9 @@ lizensiert. Jake2 ist eine reine Java Anwendung. Als native Library kommen im Moment nur jogl f�r die OpenGL Anbindung und joal f�r OpenAudio Soundunterst�tzung zum -Einsatz. Die komplette Funktionalit�t der Engine wurde ausschliesslich mit Java -realisiert. +Einsatz. Seit Version 0.9.4 ist auch ein lwjgl Treiber als Alternative zur +jogl/joal Kombination enthalten. Die komplette Funktionalit�t der Engine wurde +ausschliesslich mit Java realisiert. Jake2 befindet sich noch im Entwicklungsstadium. Die Kontaktaddresse f�r Bugreports und R�ckmeldungen ist [email protected]. @@ -27,10 +28,12 @@ Installation ------------ ausgehend von der Bin�rdistribution: -- Installationsprogramm mit "java -jar Jake2-Install.jar" starten +- Installationsprogramm mit "java -jar Jake2-0.9.4-install.jar" starten - den Anweisungen folgen - ins Installationsverzeichnis wechseln - Jake2 mit "jake2.sh" oder "jake2.bat" aus dem Installationsverzeichnis starten +- um den lwjgl OpenGL/OpenAL Treiber zu nutzen Jake2 mit "jake2_lwjgl.sh" oder + "jake2_lwjgl.bat" aus dem Installationsverzeichnis starten ausgehend von Sourcedistribution: - jake2src-version.tar.gz oder jake2src-version.zip entpacken @@ -54,24 +57,27 @@ externe Komponenten ------------------- Jake2 benutzt: -jogl OpenGL bindings https://jogl.dev.java.net -joal OpenAL bindings https://joal.dev.java.net -openal Audio library http://www.openal.org -izpack Installer http://www.izforge.com/ +jogl OpenGL bindings https://jogl.dev.java.net +joal OpenAL bindings https://joal.dev.java.net +lwjgl Light Weight Java Game Library http://www.lwjgl.org +openal Audio library http://www.openal.org +izpack Installer http://www.izforge.com/ the source distribution comes with: -ant build tool http://ant.apache.org -xerces XML library http://xml.apache.org -proguard obfuscator http://proguard.sourceforge.net +ant build tool http://ant.apache.org +xerces XML library http://xml.apache.org +proguard obfuscator http://proguard.sourceforge.net +<[email protected]> f�r Bugreports und R�ckmeldungen. - -viel Spass! +have fun! bytonic Software - +---------------- Holger Zickner <[email protected]> Carsten Weisse <[email protected]> Rene Stoeckel <[email protected]> -<[email protected]> f�r Bugreports und R�ckmeldungen.
\ No newline at end of file +Contributors +------------ +David Sanders lwjgl Unterst�tzung @@ -112,7 +112,7 @@ </copy> <copy todir="${dist}"> <fileset dir="scripts"> - <include name="Jake2.*"/> + <include name="Jake2*"/> </fileset> <fileset dir="."> <include name="ChangeLog"/> @@ -190,18 +190,23 @@ </tarfileset> <tarfileset dir="." prefix="Jake2"> <include name="src/jake2/**"/> + <include name="patch/**"/> + <include name="resources/**"/> <include name="lib/**"/> <include name="build.xml"/> <include name="build.bat"/> <include name="ChangeLog"/> <include name="LICENSE"/> - <include name="README"/> + <include name="README*"/> + <include name="install.xml"/> <include name="readme.id"/> </tarfileset> </tar> <zip destfile="jake2src-${version}.zip"> <zipfileset dir="." prefix="Jake2"> <include name="src/jake2/**"/> + <include name="patch/**"/> + <include name="resources/**"/> <include name="scripts/*.*"/> <include name="lib/**"/> <include name="build.xml"/> @@ -209,7 +214,8 @@ <include name="build.bat"/> <include name="ChangeLog"/> <include name="LICENSE"/> - <include name="README"/> + <include name="README*"/> + <include name="install.xml"/> <include name="readme.id"/> </zipfileset> </zip> @@ -218,7 +224,7 @@ <!-- standalone installer --> <target name="installer" depends="dist"> <izpack input="${basedir}/install.xml" - output="${basedir}/Jake2-install.jar" + output="${basedir}/Jake2-${version}-install.jar" installerType="standard" basedir="${dist}" izPackDir="${basedir}/lib/izpack"/> diff --git a/install.xml b/install.xml index e1edf6e..871b787 100644 --- a/install.xml +++ b/install.xml @@ -21,7 +21,7 @@ <resources> <res id="LicencePanel.licence" src="LICENSE"/> <res id="InfoPanel.info" src="README"/> - <res src="../shortcutSpec.xml" id="shortcutSpec.xml" /> + <!-- res src="../shortcutSpec.xml" id="shortcutSpec.xml" / --> <!-- res id="Installer.image" src="../resources/icon.png"/ --> </resources> @@ -39,78 +39,124 @@ <packs> <pack name="Jake2" required="yes"> <description>Jake2 files</description> + <os family="windows"/> <fileset dir="." targetdir="$INSTALL_PATH"> <include name="*"/> <include name="lib/jake2.jar"/> - <exclude name="*.bat"/> <exclude name="*.sh"/> + <exclude name="*lwjgl.bat"/> </fileset> + </pack> + <pack name="Jake2" required="yes"> + <description>Jake2 files</description> + <os name="Linux"/> <fileset dir="." targetdir="$INSTALL_PATH"> - <os family="windows"/> - <include name="*.bat"/> + <include name="*"/> + <include name="lib/jake2.jar"/> + <exclude name="*.bat"/> + <exclude name="*mac.sh"/> + <exclude name="*lwjgl.sh"/> </fileset> - <fileset dir="." targetdir="$INSTALL_PATH"> - <os name="Linux"/> - <include name="*.sh"/> - </fileset> + <executable targetfile="$INSTALL_PATH/Jake2.sh"/> </pack> + <pack name="Jake2" required="yes"> + <description>Jake2 files</description> + <os name="Mac OS X"/> + <fileset dir="." targetdir="$INSTALL_PATH"> + <include name="*"/> + <include name="lib/jake2.jar"/> + <exclude name="*.bat"/> + <exclude name="*.sh"/> + <include name="*mac.sh"/> + </fileset> + <executable targetfile="$INSTALL_PATH/Jake2_mac.sh"/> + </pack> <pack name="jogl OpenGL library" required="yes"> <description>default OpenGL library</description> + <os family="windows"/> <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <os family="windows"/> <include name="windows/jogl*"/> <include name="jogl.jar"/> </fileset> - <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <os name="Linux"/> + </pack> + <pack name="jogl OpenGL library" required="yes"> + <description>default OpenGL library</description> + <os name="Linux"/> + <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> <include name="linux/*jogl*"/> <include name="jogl.jar"/> </fileset> - <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <os name="Mac OS X"/> - <include name="osx/*jogl*"/> + </pack> + <pack name="jogl OpenGL library" required="yes"> + <description>default OpenGL library</description> + <os name="Mac OS X"/> + <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> + <include name="osx/*jogl*"/> <include name="jogl.jar"/> </fileset> - </pack> - + </pack> + <pack name="joal sound library" required="no"> <description>default sound library</description> + <os family="windows"/> <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <os family="windows"/> <include name="windows/joal*"/> <include name="windows/OpenAL*"/> </fileset> + </pack> + <pack name="joal sound library" required="no"> + <description>default sound library</description> + <os name="Linux"/> <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <os name="Linux"/> <include name="linux/*joal*"/> <include name="linux/*openal*"/> </fileset> + </pack> + <pack name="joal sound library" required="no"> + <description>default sound library</description> + <os name="Mac OS X"/> <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <os name="Mac OS X"/> <include name="osx/*joal*"/> <include name="osx/*openal*"/> </fileset> </pack> - + <pack name="lwjgl library" required="no"> <description>alternative OpenGL and sound driver</description> - <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <os family="windows"/> + <os family="windows"/> + <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> <include name="windows/lwjgl*"/> <include name="lwjgl*.jar"/> </fileset> + <fileset dir="." targetdir="$INSTALL_PATH"> + <include name="*lwjgl.bat"/> + </fileset> + </pack> + <pack name="lwjgl library" required="no"> + <description>alternative OpenGL and sound driver</description> + <os name="Linux"/> <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <os name="Linux"/> <include name="linux/lwjgl/*"/> <include name="lwjgl*.jar"/> </fileset> + <fileset dir="." targetdir="$INSTALL_PATH"> + <include name="Jake2_lwjgl.sh"/> + </fileset> + <executable targetfile="$INSTALL_PATH/Jake2_lwjgl.sh"/> + </pack> + <pack name="lwjgl library" required="no"> + <description>alternative OpenGL and sound driver</description> + <os name="Mac OS X"/> <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <os name="Mac OS X"/> <include name="osx/lwjgl/*"/> <include name="lwjgl*.jar"/> </fileset> - </pack> + <fileset dir="." targetdir="$INSTALL_PATH"> + <include name="Jake2_mac_lwjgl.sh"/> + </fileset> + <executable targetfile="$INSTALL_PATH/Jake2_mac_lwjgl.sh"/> + </pack> </packs> <!-- native type="izpack" name="ShellLink.dll"/ --> diff --git a/scripts/Jake2.bat b/scripts/Jake2.bat index 68b691c..ed0bd82 100644 --- a/scripts/Jake2.bat +++ b/scripts/Jake2.bat @@ -1,4 +1,4 @@ @echo off SET PATH=lib\windows;%PATH% -SET CP=lib/jake2.jar;lib/jogl.jar;lib/windows/joal.jar;lib/lwjgl.jar;lib/lwjgl_util.jar -java -Xmx80M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows -cp %CP% jake2.Jake2
\ No newline at end of file +SET CP=lib/jake2.jar;lib/jogl.jar;lib/windows/joal.jar +java -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows -cp %CP% jake2.Jake2
\ No newline at end of file diff --git a/scripts/Jake2.sh b/scripts/Jake2.sh index 8a360ff..900e934 100644 --- a/scripts/Jake2.sh +++ b/scripts/Jake2.sh @@ -1,6 +1,6 @@ #!/bin/bash export LD_LIBRARY_PATH=lib/linux -CP=lib/jake2.jar:lib/jogl.jar:lib/linux/joal.jar:lib/lwjgl.jar:lib/lwjgl_util.jar +CP=lib/jake2.jar:lib/jogl.jar:lib/linux/joal.jar -exec java -Xmx80M -Djava.library.path=lib/linux -cp $CP jake2.Jake2 +exec java -Xmx100M -Djava.library.path=lib/linux -cp $CP jake2.Jake2 diff --git a/scripts/Jake2_lwjgl.bat b/scripts/Jake2_lwjgl.bat new file mode 100644 index 0000000..1a17719 --- /dev/null +++ b/scripts/Jake2_lwjgl.bat @@ -0,0 +1,4 @@ +@echo off +SET PATH=lib\windows;%PATH% +SET CP=lib/jake2.jar;lib/lwjgl.jar;lib/lwjgl_util.jar +java -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows -cp %CP% jake2.Jake2
\ No newline at end of file diff --git a/scripts/Jake2_lwjgl.sh b/scripts/Jake2_lwjgl.sh new file mode 100644 index 0000000..bd06e11 --- /dev/null +++ b/scripts/Jake2_lwjgl.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +export LD_LIBRARY_PATH=lib/linux/lwjgl +CP=lib/jake2.jar:lib/lwjgl.jar:lib/lwjgl_util.jar + +exec java -Xmx100M -Djava.library.path=lib/linux/lwjgl -cp $CP jake2.Jake2 diff --git a/scripts/Jake2_mac.sh b/scripts/Jake2_mac.sh new file mode 100644 index 0000000..d106a05 --- /dev/null +++ b/scripts/Jake2_mac.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +export LD_LIBRARY_PATH=lib/osx +CP=lib/jake2.jar:lib/jogl.jar:lib/linux/joal.jar + +exec java -Xmx100M -Djava.library.path=lib/osx -cp $CP jake2.Jake2 diff --git a/scripts/Jake2_mac_lwjgl.sh b/scripts/Jake2_mac_lwjgl.sh new file mode 100644 index 0000000..7ac46c6 --- /dev/null +++ b/scripts/Jake2_mac_lwjgl.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +export LD_LIBRARY_PATH=lib/linux/osx +CP=lib/jake2.jar:lib/lwjgl.jar:lib/lwjgl_util.jar + +exec java -Xmx100M -Djava.library.path=lib/osx -cp $CP jake2.Jake2 diff --git a/src/jake2/client/VID.java b/src/jake2/client/VID.java index b095e74..4b39403 100644 --- a/src/jake2/client/VID.java +++ b/src/jake2/client/VID.java @@ -2,7 +2,7 @@ * VID.java * Copyright (C) 2003 * - * $Id: VID.java,v 1.15 2005-04-07 15:29:21 cawe Exp $ + * $Id: VID.java,v 1.16 2005-05-26 16:56:33 hzi Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -255,23 +255,31 @@ public class VID extends Globals { Globals.cl.refresh_prepped = false; Globals.cls.disable_screen = 1.0f; // true; - String defaultName = Renderer.getDefaultName(); if ( !LoadRefresh( vid_ref.string ) ) { - if ( vid_ref.string.equals(defaultName) ) { + String renderer; + if (vid_ref.string.equals(Renderer.getPreferedName())) { + // try the default renderer as fallback after prefered + renderer = Renderer.getDefaultName(); + } else { + // try the prefered renderer as first fallback + renderer = Renderer.getPreferedName(); + } + if ( vid_ref.string.equals(Renderer.getDefaultName())) { + renderer = vid_ref.string; Com.Printf("Refresh failed\n"); gl_mode = Cvar.Get( "gl_mode", "0", 0 ); if (gl_mode.value != 0.0f) { Com.Printf("Trying mode 0\n"); Cvar.SetValue("gl_mode", 0); if ( !LoadRefresh( vid_ref.string ) ) - Com.Error(Defines.ERR_FATAL, "Couldn't fall back to " + defaultName +" refresh!"); + Com.Error(Defines.ERR_FATAL, "Couldn't fall back to " + renderer +" refresh!"); } else - Com.Error(Defines.ERR_FATAL, "Couldn't fall back to " + defaultName +" refresh!"); + Com.Error(Defines.ERR_FATAL, "Couldn't fall back to " + renderer +" refresh!"); } - Cvar.Set("vid_ref", defaultName); + Cvar.Set("vid_ref", renderer); /* * drop the console if we fail to load a refresh diff --git a/src/jake2/qcommon/Cvar.java b/src/jake2/qcommon/Cvar.java index d14cadd..c0aa6ab 100644 --- a/src/jake2/qcommon/Cvar.java +++ b/src/jake2/qcommon/Cvar.java @@ -2,7 +2,7 @@ * Cvar.java * Copyright (C) 2003 * - * $Id: Cvar.java,v 1.7 2005-02-08 18:00:02 cawe Exp $ + * $Id: Cvar.java,v 1.8 2005-05-26 16:56:32 hzi Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -294,10 +294,21 @@ public class Cvar extends Globals { /* * ============ Cvar_SetValue ============ */ - public static void SetValue(String var_name, float value) { + // the overloading is very important + // there was a problem with networt "rate" string + // 10000 became "10000.0" and that wasn't right + public static void SetValue(String var_name, int value) { Cvar.Set(var_name, "" + value); } + public static void SetValue(String var_name, float value) { + if (value == (int)value) { + Cvar.Set(var_name, "" + (int)value); + } else { + Cvar.Set(var_name, "" + value); + } + } + /* * ============ Cvar_VariableValue ============ */ diff --git a/src/jake2/qcommon/FS.java b/src/jake2/qcommon/FS.java index b4fe7eb..0bea72b 100644 --- a/src/jake2/qcommon/FS.java +++ b/src/jake2/qcommon/FS.java @@ -2,7 +2,7 @@ * FS.java * Copyright (C) 2003 * - * $Id: FS.java,v 1.13 2005-05-20 15:05:54 cawe Exp $ + * $Id: FS.java,v 1.14 2005-05-26 16:56:32 hzi Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -659,14 +659,11 @@ public final class FS extends Globals { * ExecAutoexec */ public static void ExecAutoexec() { + String dir = fs_userdir; - String dir; String name; - - dir = Cvar.VariableString("gamedir"); - if (dir != null && dir.length() > 0) { - name = fs_basedir.string + '/' + dir + "/autoexec.cfg"; + name = dir + "/autoexec.cfg"; } else { name = fs_basedir.string + '/' + Globals.BASEDIRNAME + "/autoexec.cfg"; diff --git a/src/jake2/qcommon/Q2DataDialog.java b/src/jake2/qcommon/Q2DataDialog.java index 16c1bf5..2d28629 100644 --- a/src/jake2/qcommon/Q2DataDialog.java +++ b/src/jake2/qcommon/Q2DataDialog.java @@ -2,7 +2,7 @@ * Q2DataDialog.java * Copyright (C) 2003 * - * $Id: Q2DataDialog.java,v 1.13 2005-05-12 12:52:50 hzi Exp $ + * $Id: Q2DataDialog.java,v 1.14 2005-05-26 16:56:32 hzi Exp $ */ package jake2.qcommon; @@ -35,7 +35,7 @@ public class Q2DataDialog extends javax.swing.JDialog { int x = (mode.getWidth() - getWidth()) / 2; int y = (mode.getHeight() - getHeight()) / 2; setLocation(x, y); - dir = home + sep + "jake2" + sep + "baseq2"; + dir = home + sep + "Jake2" + sep + "baseq2"; jTextField1.setText(dir); } @@ -183,7 +183,7 @@ public class Q2DataDialog extends javax.swing.JDialog { } private void okButtonActionPerformed(java.awt.event.ActionEvent evt) { - + dir = jTextField1.getText(); if (dir != null) { Cvar.Set("cddir", dir); FS.setCDDir(); @@ -227,7 +227,7 @@ public class Q2DataDialog extends javax.swing.JDialog { private InstallPanel installPanel; private NotFoundPanel notFoundPanel; private JLabel status; - private javax.swing.JTextField jTextField1; + javax.swing.JTextField jTextField1; private javax.swing.JButton okButton; // End of variables declaration//GEN-END:variables @@ -441,7 +441,7 @@ public class Q2DataDialog extends javax.swing.JDialog { public InstallPanel(Q2DataDialog d) { initComponents(); - String dir = Q2DataDialog.home + Q2DataDialog.sep + "jake2"; + String dir = Q2DataDialog.home + Q2DataDialog.sep + "Jake2"; destDir.setText(dir); initMirrors(); parent = d; @@ -760,7 +760,7 @@ public class Q2DataDialog extends javax.swing.JDialog { void endInstall(String message) { parent.notFoundPanel.message.setText(message); - parent.dir = destDir + "/baseq2"; + parent.jTextField1.setText(destDir + "/baseq2"); parent.showChooseDialog(); parent.okButtonActionPerformed(null); } diff --git a/src/jake2/qcommon/Qcommon.java b/src/jake2/qcommon/Qcommon.java index ed81b71..1035b73 100644 --- a/src/jake2/qcommon/Qcommon.java +++ b/src/jake2/qcommon/Qcommon.java @@ -2,7 +2,7 @@ * Qcommon.java * Copyright 2003 * - * $Id: Qcommon.java,v 1.16 2005-05-14 10:10:45 hzi Exp $ + * $Id: Qcommon.java,v 1.17 2005-05-26 16:56:32 hzi Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -246,6 +246,10 @@ public final class Qcommon extends Globals { Cbuf.AddText("exec default.cfg\n"); Cbuf.AddText("bind MWHEELUP weapnext\n"); Cbuf.AddText("bind MWHEELDOWN weapprev\n"); + Cbuf.AddText("bind w +forward\n"); + Cbuf.AddText("bind s +back\n"); + Cbuf.AddText("bind a +moveleft\n"); + Cbuf.AddText("bind d +moveright\n"); Cbuf.Execute(); Cvar.Set("vid_fullscreen", "0"); Cbuf.AddText("exec config.cfg\n"); diff --git a/src/jake2/sound/S.java b/src/jake2/sound/S.java index 8295c8b..8a3e133 100644 --- a/src/jake2/sound/S.java +++ b/src/jake2/sound/S.java @@ -2,7 +2,7 @@ * S.java * Copyright (C) 2003 * - * $Id: S.java,v 1.10 2005-02-07 17:23:50 cawe Exp $ + * $Id: S.java,v 1.11 2005-05-26 16:56:33 hzi Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -92,7 +92,7 @@ public class S { } } // if driver not found use dummy - impl = (Sound)drivers.firstElement(); + impl = (Sound)drivers.lastElement(); } public static void Init() { diff --git a/src/jake2/util/Lib.java b/src/jake2/util/Lib.java index 4f709d4..51829c1 100644 --- a/src/jake2/util/Lib.java +++ b/src/jake2/util/Lib.java @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // Created on 09.12.2003 by RST. -// $Id: Lib.java,v 1.12 2005-01-09 23:41:53 cawe Exp $ +// $Id: Lib.java,v 1.13 2005-05-26 16:56:31 hzi Exp $ package jake2.util; @@ -89,7 +89,11 @@ public class Lib { return Integer.parseInt(in); } catch (Exception e) { - return 0; + try { + return (int)Double.parseDouble(in); + } catch (Exception e1) { + return 0; + } } } public static float[] atov(String v) { diff --git a/webstart/jake2_jogl11.jnlp b/webstart/jake2_jogl11.jnlp index 79a05e7..7d0b68d 100644 --- a/webstart/jake2_jogl11.jnlp +++ b/webstart/jake2_jogl11.jnlp @@ -17,7 +17,7 @@ </security> <resources> - <j2se version="1.4+" max-heap-size="80M"/> + <j2se version="1.4+" max-heap-size="100M"/> <jar href="http://jake2.sourceforge.net/lib/jake2.jar"/> <property name="sun.java2d.noddraw" value="true"/> <property name="ATI_WORKAROUND" value="false"/> diff --git a/webstart/jake2_jogl11ATI.jnlp b/webstart/jake2_jogl11ATI.jnlp index 714da22..ca6771b 100644 --- a/webstart/jake2_jogl11ATI.jnlp +++ b/webstart/jake2_jogl11ATI.jnlp @@ -17,7 +17,7 @@ </security> <resources> - <j2se version="1.4+" max-heap-size="80M"/> + <j2se version="1.4+" max-heap-size="100M"/> <jar href="http://jake2.sourceforge.net/lib/jake2.jar"/> <property name="sun.java2d.noddraw" value="true"/> <property name="ATI_WORKAROUND" value="true"/> diff --git a/webstart/jake2_lwjgl.jnlp b/webstart/jake2_lwjgl.jnlp index 1899f43..85facaf 100644 --- a/webstart/jake2_lwjgl.jnlp +++ b/webstart/jake2_lwjgl.jnlp @@ -17,7 +17,7 @@ </security> <resources> - <j2se version="1.4+" max-heap-size="80M"/> + <j2se version="1.4+" max-heap-size="100M"/> <jar href="http://jake2.sourceforge.net/lib/jake2.jar"/> <jar href="http://jake2.sourceforge.net/lib/lwjgl.jar"/> <jar href="http://jake2.sourceforge.net/lib/lwjgl_util.jar"/> |