aboutsummaryrefslogtreecommitdiffstats
path: root/src/jake2/qcommon
diff options
context:
space:
mode:
authorHolger Zickner <[email protected]>2004-07-09 08:38:30 +0000
committerHolger Zickner <[email protected]>2004-07-09 08:38:30 +0000
commit76230d5ab9be20bfc25de6f3e50504a4287575d0 (patch)
tree8ec5a6485478c7fde8944e6477e466e3adceab36 /src/jake2/qcommon
parent1e132c95409d6a7f3baf499b50f0bc7d22969b07 (diff)
import of Jake2 version v_0_9_2v_0_9_2
Diffstat (limited to 'src/jake2/qcommon')
-rw-r--r--src/jake2/qcommon/CM.java26
-rw-r--r--src/jake2/qcommon/CRC.java2
-rw-r--r--src/jake2/qcommon/Com.java1336
-rw-r--r--src/jake2/qcommon/FS.java4
-rw-r--r--src/jake2/qcommon/MD4.java14
-rw-r--r--src/jake2/qcommon/Qcommon.java2
-rw-r--r--src/jake2/qcommon/qfiles.java19
7 files changed, 1240 insertions, 163 deletions
diff --git a/src/jake2/qcommon/CM.java b/src/jake2/qcommon/CM.java
index 8c5a203..1de50da 100644
--- a/src/jake2/qcommon/CM.java
+++ b/src/jake2/qcommon/CM.java
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// Created on 02.01.2004 by RST.
-// $Id: CM.java,v 1.2 2004-07-08 15:58:46 hzi Exp $
+// $Id: CM.java,v 1.2.2.1 2004-07-09 08:38:29 hzi Exp $
package jake2.qcommon;
@@ -189,7 +189,7 @@ public class CM extends Game {
Loads in the map and all submodels
==================
*/
- public static cmodel_t CM_LoadMap(String name, boolean clientload, intwrap checksum) {
+ public static cmodel_t CM_LoadMap(String name, boolean clientload, int checksum[]) {
Com.DPrintf("CM_LoadMap...\n");
byte buf[];
int i;
@@ -200,7 +200,7 @@ public class CM extends Game {
if (0 == strcmp(map_name, name) && (clientload || 0 == Cvar.VariableValue("flushmap"))) {
- checksum.i = last_checksum;
+ checksum[0] = last_checksum;
if (!clientload) {
Arrays.fill(portalopen, false);
@@ -222,7 +222,7 @@ public class CM extends Game {
numleafs = 1;
numclusters = 1;
numareas = 1;
- checksum.i = 0;
+ checksum[0] = 0;
return map_cmodels[0];
// cinematic servers won't have anything at all
}
@@ -240,7 +240,7 @@ public class CM extends Game {
ByteBuffer bbuf = ByteBuffer.wrap(buf);
last_checksum = MD4.Com_BlockChecksum(buf, length);
- checksum.i = last_checksum;
+ checksum[0] = last_checksum;
header = new qfiles.dheader_t(bbuf.slice());
@@ -796,7 +796,6 @@ public class CM extends Game {
if (l.filelen > MAX_MAP_VISIBILITY)
Com.Error(ERR_DROP, "Map has too large visibility lump");
- //was: memcpy(map_visibility, cmod_base + l.fileofs, l.filelen);
System.arraycopy(cmod_base, l.fileofs, map_visibility, 0, l.filelen);
ByteBuffer bb = ByteBuffer.wrap(map_visibility, 0, l.filelen);
@@ -1074,7 +1073,7 @@ public class CM extends Game {
}
}
- public static int CM_BoxLeafnums_headnode(float[] mins, float[] maxs, int list[], int listsize, int headnode, intwrap topnode) {
+ public static int CM_BoxLeafnums_headnode(float[] mins, float[] maxs, int list[], int listsize, int headnode, int topnode[]) {
leaf_list = list;
leaf_count = 0;
leaf_maxcount = listsize;
@@ -1086,22 +1085,23 @@ public class CM extends Game {
CM_BoxLeafnums_r(headnode);
if (topnode != null)
- topnode.i = leaf_topnode;
+ topnode[0] = leaf_topnode;
return leaf_count;
}
- public static int CM_BoxLeafnums(float[] mins, float[] maxs, int list[], int listsize, intwrap topnode) {
+ public static int CM_BoxLeafnums(float[] mins, float[] maxs, int list[], int listsize, int topnode[]) {
return CM_BoxLeafnums_headnode(mins, maxs, list, listsize, map_cmodels[0].headnode, topnode);
}
- public static class intwrap {
+ /*
+ public static class intwrap1 {
public intwrap(int i) {
this.i = i;
}
public int i;
}
-
+ */
/*
==================
CM_PointContents
@@ -1539,10 +1539,10 @@ public class CM extends Game {
c2[i] += 1;
}
- intwrap tn = new intwrap(topnode);
+ int tn[] = {topnode};
numleafs = CM_BoxLeafnums_headnode(c1, c2, leafs, 1024, headnode, tn);
- topnode = tn.i;
+ topnode = tn[0];
for (i = 0; i < numleafs; i++) {
CM_TestInLeaf(leafs[i]);
if (trace_trace.allsolid)
diff --git a/src/jake2/qcommon/CRC.java b/src/jake2/qcommon/CRC.java
index ca22d9b..fd2ca20 100644
--- a/src/jake2/qcommon/CRC.java
+++ b/src/jake2/qcommon/CRC.java
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// Created on 25.01.2004 by RST.
-// $Id: CRC.java,v 1.1 2004-07-09 06:50:49 hzi Exp $
+// $Id: CRC.java,v 1.1.2.1 2004-07-09 08:38:29 hzi Exp $
package jake2.qcommon;
import jake2.util.Vargs;
diff --git a/src/jake2/qcommon/Com.java b/src/jake2/qcommon/Com.java
index c938fdb..ca9b4ec 100644
--- a/src/jake2/qcommon/Com.java
+++ b/src/jake2/qcommon/Com.java
@@ -2,7 +2,7 @@
* Com.java
* Copyright (C) 2003
*
- * $Id: Com.java,v 1.2 2004-07-08 15:58:46 hzi Exp $
+ * $Id: Com.java,v 1.2.2.1 2004-07-09 08:38:29 hzi Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -38,15 +38,17 @@ import java.io.*;
/**
* Com
- * TODO complete Com interface
+ *
*/
-public final class Com {
-
+public final class Com
+{
+
static int com_argc;
- static String[] com_argv = new String[Defines.MAX_NUM_ARGVS];
-
- public abstract static class RD_Flusher {
- public abstract void rd_flush(int target, byte [] buffer);
+ static String[] com_argv= new String[Defines.MAX_NUM_ARGVS];
+
+ public abstract static class RD_Flusher
+ {
+ public abstract void rd_flush(int target, byte[] buffer);
}
static int rd_target;
@@ -54,80 +56,95 @@ public final class Com {
static int rd_buffersize;
static RD_Flusher rd_flusher;
- public static void BeginRedirect(int target, byte [] buffer, int buffersize, RD_Flusher flush) {
+ public static void BeginRedirect(int target, byte[] buffer, int buffersize, RD_Flusher flush)
+ {
if (0 == target || null == buffer || 0 == buffersize || null == flush)
return;
- rd_target = target;
- rd_buffer = buffer;
- rd_buffersize = buffersize;
- rd_flusher = flush;
+ rd_target= target;
+ rd_buffer= buffer;
+ rd_buffersize= buffersize;
+ rd_flusher= flush;
- rd_buffer = null;
+ rd_buffer= null;
}
- public static void EndRedirect() {
+ public static void EndRedirect()
+ {
rd_flusher.rd_flush(rd_target, rd_buffer);
- rd_target = 0;
- rd_buffer = null;
- rd_buffersize = 0;
- rd_flusher = null;
+ rd_target= 0;
+ rd_buffer= null;
+ rd_buffersize= 0;
+ rd_flusher= null;
}
- static boolean recursive = false;
+ static boolean recursive= false;
- static String msg = "";
+ static String msg= "";
// helper class to replace the pointer-pointer
- public static class ParseHelp {
+ public static class ParseHelp
+ {
- public ParseHelp(String in, int offset) {
+ public ParseHelp(String in, int offset)
+ {
this(in.toCharArray(), offset);
}
- public ParseHelp(String in) {
- if (in == null) {
- data = null;
+ public ParseHelp(String in)
+ {
+ if (in == null)
+ {
+ data= null;
}
- else {
- data = in.toCharArray();
+ else
+ {
+ data= in.toCharArray();
}
- index = 0;
+ index= 0;
}
- public ParseHelp(char in[]) {
+ public ParseHelp(char in[])
+ {
this(in, 0);
}
- public ParseHelp(char in[], int offset) {
+ public ParseHelp(char in[], int offset)
+ {
if (in == null || in.length == 0)
- data = null;
+ data= null;
else
- data = in;
- index = offset;
+ data= in;
+ index= offset;
}
- public char getchar() {
+ public char getchar()
+ {
// faster than if
- try {
+ try
+ {
return data[index];
}
- catch (Exception e) {
- data = null;
+ catch (Exception e)
+ {
+ data= null;
// last char
return 0;
}
}
- public char nextchar() {
+ public char nextchar()
+ {
// faster than if
- try {
+ try
+ {
index++;
return data[index];
}
- catch (Exception e) {
- data = null;
+ catch (Exception e)
+ {
+ data= null;
// avoid int wraps;
index--;
// last char
@@ -135,144 +152,170 @@ public final class Com {
}
}
- public boolean isEof() {
+ public boolean isEof()
+ {
return data == null;
}
public int index;
public char data[];
- public char skipwhites() {
+ public char skipwhites()
+ {
char c;
- while (((c = getchar()) <= ' ') && c != 0)
+ while (((c= getchar()) <= ' ') && c != 0)
index++;
return c;
}
- public char skipwhitestoeol() {
+ public char skipwhitestoeol()
+ {
char c;
- while (((c = getchar()) <= ' ') && c != '\n' && c != 0)
+ while (((c= getchar()) <= ' ') && c != '\n' && c != 0)
index++;
return c;
}
- public char skiptoeol() {
+ public char skiptoeol()
+ {
char c;
- while ((c = getchar()) != '\n' && c != 0)
+ while ((c= getchar()) != '\n' && c != 0)
index++;
return c;
}
}
- public static char com_token[] = new char[Defines.MAX_TOKEN_CHARS];
+ public static char com_token[]= new char[Defines.MAX_TOKEN_CHARS];
// See GameSpanw.ED_ParseEdict() to see how to use it now.
// works perfect !
- public static String Parse(ParseHelp hlp) {
+ public static String Parse(ParseHelp hlp)
+ {
int c;
- int len = 0;
- len = 0;
+ int len= 0;
+ len= 0;
- com_token[0] = 0;
+ com_token[0]= 0;
- if (hlp.data == null) {
+ if (hlp.data == null)
+ {
return "";
}
// skip whitespace
hlp.skipwhites();
- if (hlp.isEof()) {
+ if (hlp.isEof())
+ {
return "";
}
// skip // comments
- if (hlp.getchar() == '/') {
- if (hlp.nextchar() == '/') {
- if ((hlp.skiptoeol() == 0) || (hlp.skipwhites() == 0)) {
+ if (hlp.getchar() == '/')
+ {
+ if (hlp.nextchar() == '/')
+ {
+ if ((hlp.skiptoeol() == 0) || (hlp.skipwhites() == 0))
+ {
return "";
}
}
- else {
- com_token[len] = '/';
+ else
+ {
+ com_token[len]= '/';
len++;
}
}
// handle quoted strings specially
- if (hlp.getchar() == '\"') {
- while (true) {
- c = hlp.nextchar();
- if (c == '\"' || c == 0) {
+ if (hlp.getchar() == '\"')
+ {
+ while (true)
+ {
+ c= hlp.nextchar();
+ if (c == '\"' || c == 0)
+ {
hlp.nextchar();
- com_token[len] = '?';
+ com_token[len]= '?';
return new String(com_token, 0, len);
}
- if (len < Defines.MAX_TOKEN_CHARS) {
- com_token[len] = hlp.getchar();
+ if (len < Defines.MAX_TOKEN_CHARS)
+ {
+ com_token[len]= hlp.getchar();
len++;
}
}
}
// parse a regular word
- do {
- if (len < Defines.MAX_TOKEN_CHARS) {
- com_token[len] = hlp.getchar();
+ do
+ {
+ if (len < Defines.MAX_TOKEN_CHARS)
+ {
+ com_token[len]= hlp.getchar();
len++;
}
- c = hlp.nextchar();
+ c= hlp.nextchar();
}
while (c > 32);
- if (len == Defines.MAX_TOKEN_CHARS) {
+ if (len == Defines.MAX_TOKEN_CHARS)
+ {
Printf("Token exceeded " + Defines.MAX_TOKEN_CHARS + " chars, discarded.\n");
- len = 0;
+ len= 0;
}
// trigger the eof
hlp.skipwhites();
- com_token[len] = 0;
+ com_token[len]= 0;
return new String(com_token, 0, len);
}
- public static xcommand_t Error_f = new xcommand_t() {
- public void execute() throws longjmpException {
+ public static xcommand_t Error_f= new xcommand_t()
+ {
+ public void execute() throws longjmpException
+ {
Error(Globals.ERR_FATAL, Cmd.Argv(1));
}
};
- public static void Error(int code, String fmt) throws longjmpException {
+ public static void Error(int code, String fmt) throws longjmpException
+ {
Error(code, fmt, null);
}
- public static void Error(int code, String fmt, Vargs vargs) throws longjmpException {
+ public static void Error(int code, String fmt, Vargs vargs) throws longjmpException
+ {
// va_list argptr;
// static char msg[MAXPRINTMSG];
- if (recursive) {
+ if (recursive)
+ {
Sys.Error("recursive error after: " + msg);
}
- recursive = true;
+ recursive= true;
- msg = sprintf(fmt, vargs);
+ msg= sprintf(fmt, vargs);
- if (code == Defines.ERR_DISCONNECT) {
+ if (code == Defines.ERR_DISCONNECT)
+ {
CL.Drop();
- recursive = false;
+ recursive= false;
throw new longjmpException();
}
- else if (code == Defines.ERR_DROP) {
+ else if (code == Defines.ERR_DROP)
+ {
Com.Printf("********************\nERROR: " + msg + "\n********************\n");
SV_MAIN.SV_Shutdown("Server crashed: " + msg + "\n", false);
CL.Drop();
- recursive = false;
+ recursive= false;
throw new longjmpException();
}
- else {
+ else
+ {
SV_MAIN.SV_Shutdown("Server fatal crashed: %s" + msg + "\n", false);
CL.Shutdown();
}
@@ -284,43 +327,51 @@ public final class Com {
* Com_InitArgv checks the number of command line arguments
* and copies all arguments with valid length into com_argv.
*/
- static void InitArgv(String[] args) throws longjmpException {
+ static void InitArgv(String[] args) throws longjmpException
+ {
- if (args.length > Globals.MAX_NUM_ARGVS) {
+ if (args.length > Globals.MAX_NUM_ARGVS)
+ {
Com.Error(Globals.ERR_FATAL, "argc > MAX_NUM_ARGVS");
}
- Com.com_argc = args.length;
- for (int i = 0; i < Com.com_argc; i++) {
+ Com.com_argc= args.length;
+ for (int i= 0; i < Com.com_argc; i++)
+ {
if (args[i].length() >= Globals.MAX_TOKEN_CHARS)
- Com.com_argv[i] = "";
+ Com.com_argv[i]= "";
else
- Com.com_argv[i] = args[i];
+ Com.com_argv[i]= args[i];
}
}
- public static void DPrintf(String fmt) {
+ public static void DPrintf(String fmt)
+ {
DPrintf(fmt, null);
}
-
- public static void d(String fmt) {
+
+ public static void d(String fmt)
+ {
DPrintf(fmt + "\n", null);
}
-
- public static void Printf(String fmt) {
+
+ public static void Printf(String fmt)
+ {
Printf(fmt, null);
}
- public static void DPrintf(String fmt, Vargs vargs) {
+ public static void DPrintf(String fmt, Vargs vargs)
+ {
if (Globals.developer == null || Globals.developer.value == 0)
return; // don't confuse non-developers with techie stuff...
Printf(fmt, vargs);
}
- public static void Printf(String fmt, Vargs vargs) {
+ public static void Printf(String fmt, Vargs vargs)
+ {
// TODO Com.Printf ist nur zum testen
- String msg = sprintf(fmt, vargs);
+ String msg= sprintf(fmt, vargs);
if (rd_target != 0)
{
@@ -328,7 +379,7 @@ public final class Com {
{
rd_flusher.rd_flush(rd_target, rd_buffer);
// *rd_buffer = 0;
- rd_buffer[rd_buffersize] = '\0';
+ rd_buffer[rd_buffersize]= '\0';
}
// TODO handle rd_buffer
// strcat(rd_buffer, msg);
@@ -336,7 +387,7 @@ public final class Com {
}
Console.Print(msg);
-
+
// also echo to debugging console
Sys.ConsoleOutput(msg);
@@ -344,14 +395,14 @@ public final class Com {
if (Globals.logfile_active != null && Globals.logfile_active.value != 0)
{
String name;
-
+
if (Globals.logfile == null)
{
- name = FS.Gamedir() + "/qconsole.log";
+ name= FS.Gamedir() + "/qconsole.log";
if (Globals.logfile_active.value > 2)
try
{
- Globals.logfile = new RandomAccessFile(name, "a");
+ Globals.logfile= new RandomAccessFile(name, "a");
}
catch (FileNotFoundException e)
{
@@ -361,7 +412,7 @@ public final class Com {
else
try
{
- Globals.logfile = new RandomAccessFile(name, "rw");
+ Globals.logfile= new RandomAccessFile(name, "rw");
}
catch (FileNotFoundException e1)
{
@@ -379,58 +430,68 @@ public final class Com {
// TODO: do quake2 error handling!
e.printStackTrace();
}
- if (Globals.logfile_active.value > 1)
- ; // do nothing
- // fflush (logfile); // force it to save every time
+ if (Globals.logfile_active.value > 1); // do nothing
+ // fflush (logfile); // force it to save every time
}
}
- public static void Println(String fmt) {
+ public static void Println(String fmt)
+ {
Printf(fmt);
Printf("\n");
}
-
- public static void p(String fmt) {
+
+ public static void p(String fmt)
+ {
Printf(fmt);
Printf("\n");
}
- public static String sprintf(String fmt, Vargs vargs) {
- String msg = "";
- if (vargs == null || vargs.size() == 0) {
- msg = fmt;
+ public static String sprintf(String fmt, Vargs vargs)
+ {
+ String msg= "";
+ if (vargs == null || vargs.size() == 0)
+ {
+ msg= fmt;
}
- else {
- msg = new PrintfFormat(fmt).sprintf(vargs.toArray());
+ else
+ {
+ msg= new PrintfFormat(fmt).sprintf(vargs.toArray());
}
return msg;
}
- public static int ServerState() {
+ public static int ServerState()
+ {
return Globals.server_state;
}
- public static int Argc() {
+ public static int Argc()
+ {
return Com.com_argc;
}
- public static String Argv(int arg) {
+ public static String Argv(int arg)
+ {
if (arg < 0 || arg >= Com.com_argc || Com.com_argv[arg].length() < 1)
return "";
return Com.com_argv[arg];
}
- public static void ClearArgv(int arg) {
+ public static void ClearArgv(int arg)
+ {
if (arg < 0 || arg >= Com.com_argc || Com.com_argv[arg].length() < 1)
return;
- Com.com_argv[arg] = "";
+ Com.com_argv[arg]= "";
}
- public static void Quit() {
+ public static void Quit()
+ {
SV_MAIN.SV_Shutdown("Server quit\n", false);
CL.Shutdown();
- if (Globals.logfile != null) {
+ if (Globals.logfile != null)
+ {
try
{
Globals.logfile.close();
@@ -438,25 +499,1036 @@ public final class Com {
catch (IOException e)
{
}
- Globals.logfile = null;
+ Globals.logfile= null;
}
Sys.Quit();
}
-
public static void SetServerState(int i)
{
- Globals.server_state = i;
+ Globals.server_state= i;
}
-
public static int BlockChecksum(byte[] buf, int length)
{
return MD4.Com_BlockChecksum(buf, length);
}
- public static void StripExtension(String string, String string2) {
- // TODO implement!
+ public static void StripExtension(String string, String string2)
+ {
+ // TODO implement StripExtension
}
+
+ /**
+ * CRC table.
+ */
+
+ static int chktbl[]=
+ {
+ 0x84,
+ 0x47,
+ 0x51,
+ 0xc1,
+ 0x93,
+ 0x22,
+ 0x21,
+ 0x24,
+ 0x2f,
+ 0x66,
+ 0x60,
+ 0x4d,
+ 0xb0,
+ 0x7c,
+ 0xda,
+ 0x88,
+ 0x54,
+ 0x15,
+ 0x2b,
+ 0xc6,
+ 0x6c,
+ 0x89,
+ 0xc5,
+ 0x9d,
+ 0x48,
+ 0xee,
+ 0xe6,
+ 0x8a,
+ 0xb5,
+ 0xf4,
+ 0xcb,
+ 0xfb,
+ 0xf1,
+ 0x0c,
+ 0x2e,
+ 0xa0,
+ 0xd7,
+ 0xc9,
+ 0x1f,
+ 0xd6,
+ 0x06,
+ 0x9a,
+ 0x09,
+ 0x41,
+ 0x54,
+ 0x67,
+ 0x46,
+ 0xc7,
+ 0x74,
+ 0xe3,
+ 0xc8,
+ 0xb6,
+ 0x5d,
+ 0xa6,
+ 0x36,
+ 0xc4,
+ 0xab,
+ 0x2c,
+ 0x7e,
+ 0x85,
+ 0xa8,
+ 0xa4,
+ 0xa6,
+ 0x4d,
+ 0x96,
+ 0x19,
+ 0x19,
+ 0x9a,
+ 0xcc,
+ 0xd8,
+ 0xac,
+ 0x39,
+ 0x5e,
+ 0x3c,
+ 0xf2,
+ 0xf5,
+ 0x5a,
+ 0x72,
+ 0xe5,
+ 0xa9,
+ 0xd1,
+ 0xb3,
+ 0x23,
+ 0x82,
+ 0x6f,
+ 0x29,
+ 0xcb,
+ 0xd1,
+ 0xcc,
+ 0x71,
+ 0xfb,
+ 0xea,
+ 0x92,
+ 0xeb,
+ 0x1c,
+ 0xca,
+ 0x4c,
+ 0x70,
+ 0xfe,
+ 0x4d,
+ 0xc9,
+ 0x67,
+ 0x43,
+ 0x47,
+ 0x94,
+ 0xb9,
+ 0x47,
+ 0xbc,
+ 0x3f,
+ 0x01,
+ 0xab,
+ 0x7b,
+ 0xa6,
+ 0xe2,
+ 0x76,
+ 0xef,
+ 0x5a,
+ 0x7a,
+ 0x29,
+ 0x0b,
+ 0x51,
+ 0x54,
+ 0x67,
+ 0xd8,
+ 0x1c,
+ 0x14,
+ 0x3e,
+ 0x29,
+ 0xec,
+ 0xe9,
+ 0x2d,
+ 0x48,
+ 0x67,
+ 0xff,
+ 0xed,
+ 0x54,
+ 0x4f,
+ 0x48,
+ 0xc0,
+ 0xaa,
+ 0x61,
+ 0xf7,
+ 0x78,
+ 0x12,
+ 0x03,
+ 0x7a,
+ 0x9e,
+ 0x8b,
+ 0xcf,
+ 0x83,
+ 0x7b,
+ 0xae,
+ 0xca,
+ 0x7b,
+ 0xd9,
+ 0xe9,
+ 0x53,
+ 0x2a,
+ 0xeb,
+ 0xd2,
+ 0xd8,
+ 0xcd,
+ 0xa3,
+ 0x10,
+ 0x25,
+ 0x78,
+ 0x5a,
+ 0xb5,
+ 0x23,
+ 0x06,
+ 0x93,
+ 0xb7,
+ 0x84,
+ 0xd2,
+ 0xbd,
+ 0x96,
+ 0x75,
+ 0xa5,
+ 0x5e,
+ 0xcf,
+ 0x4e,
+ 0xe9,
+ 0x50,
+ 0xa1,
+ 0xe6,
+ 0x9d,
+ 0xb1,
+ 0xe3,
+ 0x85,
+ 0x66,
+ 0x28,
+ 0x4e,
+ 0x43,
+ 0xdc,
+ 0x6e,
+ 0xbb,
+ 0x33,
+ 0x9e,
+ 0xf3,
+ 0x0d,
+ 0x00,
+ 0xc1,
+ 0xcf,
+ 0x67,
+ 0x34,
+ 0x06,
+ 0x7c,
+ 0x71,
+ 0xe3,
+ 0x63,
+ 0xb7,
+ 0xb7,
+ 0xdf,
+ 0x92,
+ 0xc4,
+ 0xc2,
+ 0x25,
+ 0x5c,
+ 0xff,
+ 0xc3,
+ 0x6e,
+ 0xfc,
+ 0xaa,
+ 0x1e,
+ 0x2a,
+ 0x48,
+ 0x11,
+ 0x1c,
+ 0x36,
+ 0x68,
+ 0x78,
+ 0x86,
+ 0x79,
+ 0x30,
+ 0xc3,
+ 0xd6,
+ 0xde,
+ 0xbc,
+ 0x3a,
+ 0x2a,
+ 0x6d,
+ 0x1e,
+ 0x46,
+ 0xdd,
+ 0xe0,
+ 0x80,
+ 0x1e,
+ 0x44,
+ 0x3b,
+ 0x6f,
+ 0xaf,
+ 0x31,
+ 0xda,
+ 0xa2,
+ 0xbd,
+ 0x77,
+ 0x06,
+ 0x56,
+ 0xc0,
+ 0xb7,
+ 0x92,
+ 0x4b,
+ 0x37,
+ 0xc0,
+ 0xfc,
+ 0xc2,
+ 0xd5,
+ 0xfb,
+ 0xa8,
+ 0xda,
+ 0xf5,
+ 0x57,
+ 0xa8,
+ 0x18,
+ 0xc0,
+ 0xdf,
+ 0xe7,
+ 0xaa,
+ 0x2a,
+ 0xe0,
+ 0x7c,
+ 0x6f,
+ 0x77,
+ 0xb1,
+ 0x26,
+ 0xba,
+ 0xf9,
+ 0x2e,
+ 0x1d,
+ 0x16,
+ 0xcb,
+ 0xb8,
+ 0xa2,
+ 0x44,
+ 0xd5,
+ 0x2f,
+ 0x1a,
+ 0x79,
+ 0x74,
+ 0x87,
+ 0x4b,
+ 0x00,
+ 0xc9,
+ 0x4a,
+ 0x3a,
+ 0x65,
+ 0x8f,
+ 0xe6,
+ 0x5d,
+ 0xe5,
+ 0x0a,
+ 0x77,
+ 0xd8,
+ 0x1a,
+ 0x14,
+ 0x41,
+ 0x75,
+ 0xb1,
+ 0xe2,
+ 0x50,
+ 0x2c,
+ 0x93,
+ 0x38,
+ 0x2b,
+ 0x6d,
+ 0xf3,
+ 0xf6,
+ 0xdb,
+ 0x1f,
+ 0xcd,
+ 0xff,
+ 0x14,
+ 0x70,
+ 0xe7,
+ 0x16,
+ 0xe8,
+ 0x3d,
+ 0xf0,
+ 0xe3,
+ 0xbc,
+ 0x5e,
+ 0xb6,
+ 0x3f,
+ 0xcc,
+ 0x81,
+ 0x24,
+ 0x67,
+ 0xf3,
+ 0x97,
+ 0x3b,
+ 0xfe,
+ 0x3a,
+ 0x96,
+ 0x85,
+ 0xdf,
+ 0xe4,
+ 0x6e,
+ 0x3c,
+ 0x85,
+ 0x05,
+ 0x0e,
+ 0xa3,
+ 0x2b,
+ 0x07,
+ 0xc8,
+ 0xbf,
+ 0xe5,
+ 0x13,
+ 0x82,
+ 0x62,
+ 0x08,
+ 0x61,
+ 0x69,
+ 0x4b,
+ 0x47,
+ 0x62,
+ 0x73,
+ 0x44,
+ 0x64,
+ 0x8e,
+ 0xe2,
+ 0x91,
+ 0xa6,
+ 0x9a,
+ 0xb7,
+ 0xe9,
+ 0x04,
+ 0xb6,
+ 0x54,
+ 0x0c,
+ 0xc5,
+ 0xa9,
+ 0x47,
+ 0xa6,
+ 0xc9,
+ 0x08,
+ 0xfe,
+ 0x4e,
+ 0xa6,
+ 0xcc,
+ 0x8a,
+ 0x5b,
+ 0x90,
+ 0x6f,
+ 0x2b,
+ 0x3f,
+ 0xb6,
+ 0x0a,
+ 0x96,
+ 0xc0,
+ 0x78,
+ 0x58,
+ 0x3c,
+ 0x76,
+ 0x6d,
+ 0x94,
+ 0x1a,
+ 0xe4,
+ 0x4e,
+ 0xb8,
+ 0x38,
+ 0xbb,
+ 0xf5,
+ 0xeb,
+ 0x29,
+ 0xd8,
+ 0xb0,
+ 0xf3,
+ 0x15,
+ 0x1e,
+ 0x99,
+ 0x96,
+ 0x3c,
+ 0x5d,
+ 0x63,
+ 0xd5,
+ 0xb1,
+ 0xad,
+ 0x52,
+ 0xb8,
+ 0x55,
+ 0x70,
+ 0x75,
+ 0x3e,
+ 0x1a,
+ 0xd5,
+ 0xda,
+ 0xf6,
+ 0x7a,
+ 0x48,
+ 0x7d,
+ 0x44,
+ 0x41,
+ 0xf9,
+ 0x11,
+ 0xce,
+ 0xd7,
+ 0xca,
+ 0xa5,
+ 0x3d,
+ 0x7a,
+ 0x79,
+ 0x7e,
+ 0x7d,
+ 0x25,
+ 0x1b,
+ 0x77,
+ 0xbc,
+ 0xf7,
+ 0xc7,
+ 0x0f,
+ 0x84,
+ 0x95,
+ 0x10,
+ 0x92,
+ 0x67,
+ 0x15,
+ 0x11,
+ 0x5a,
+ 0x5e,
+ 0x41,
+ 0x66,
+ 0x0f,
+ 0x38,
+ 0x03,
+ 0xb2,
+ 0xf1,
+ 0x5d,
+ 0xf8,
+ 0xab,
+ 0xc0,
+ 0x02,
+ 0x76,
+ 0x84,
+ 0x28,
+ 0xf4,
+ 0x9d,
+ 0x56,
+ 0x46,
+ 0x60,
+ 0x20,
+ 0xdb,
+ 0x68,
+ 0xa7,
+ 0xbb,
+ 0xee,
+ 0xac,
+ 0x15,
+ 0x01,
+ 0x2f,
+ 0x20,
+ 0x09,
+ 0xdb,
+ 0xc0,
+ 0x16,
+ 0xa1,
+ 0x89,
+ 0xf9,
+ 0x94,
+ 0x59,
+ 0x00,
+ 0xc1,
+ 0x76,
+ 0xbf,
+ 0xc1,
+ 0x4d,
+ 0x5d,
+ 0x2d,
+ 0xa9,
+ 0x85,
+ 0x2c,
+ 0xd6,
+ 0xd3,
+ 0x14,
+ 0xcc,
+ 0x02,
+ 0xc3,
+ 0xc2,
+ 0xfa,
+ 0x6b,
+ 0xb7,
+ 0xa6,
+ 0xef,
+ 0xdd,
+ 0x12,
+ 0x26,
+ 0xa4,
+ 0x63,
+ 0xe3,
+ 0x62,
+ 0xbd,
+ 0x56,
+ 0x8a,
+ 0x52,
+ 0x2b,
+ 0xb9,
+ 0xdf,
+ 0x09,
+ 0xbc,
+ 0x0e,
+ 0x97,
+ 0xa9,
+ 0xb0,
+ 0x82,
+ 0x46,
+ 0x08,
+ 0xd5,
+ 0x1a,
+ 0x8e,
+ 0x1b,
+ 0xa7,
+ 0x90,
+ 0x98,
+ 0xb9,
+ 0xbb,
+ 0x3c,
+ 0x17,
+ 0x9a,
+ 0xf2,
+ 0x82,
+ 0xba,
+ 0x64,
+ 0x0a,
+ 0x7f,
+ 0xca,
+ 0x5a,
+ 0x8c,
+ 0x7c,
+ 0xd3,
+ 0x79,
+ 0x09,
+ 0x5b,
+ 0x26,
+ 0xbb,
+ 0xbd,
+ 0x25,
+ 0xdf,
+ 0x3d,
+ 0x6f,
+ 0x9a,
+ 0x8f,
+ 0xee,
+ 0x21,
+ 0x66,
+ 0xb0,
+ 0x8d,
+ 0x84,
+ 0x4c,
+ 0x91,
+ 0x45,
+ 0xd4,
+ 0x77,
+ 0x4f,
+ 0xb3,
+ 0x8c,
+ 0xbc,
+ 0xa8,
+ 0x99,
+ 0xaa,
+ 0x19,
+ 0x53,
+ 0x7c,
+ 0x02,
+ 0x87,
+ 0xbb,
+ 0x0b,
+ 0x7c,
+ 0x1a,
+ 0x2d,
+ 0xdf,
+ 0x48,
+ 0x44,
+ 0x06,
+ 0xd6,
+ 0x7d,
+ 0x0c,
+ 0x2d,
+ 0x35,
+ 0x76,
+ 0xae,
+ 0xc4,
+ 0x5f,
+ 0x71,
+ 0x85,
+ 0x97,
+ 0xc4,
+ 0x3d,
+ 0xef,
+ 0x52,
+ 0xbe,
+ 0x00,
+ 0xe4,
+ 0xcd,
+ 0x49,
+ 0xd1,
+ 0xd1,
+ 0x1c,
+ 0x3c,
+ 0xd0,
+ 0x1c,
+ 0x42,
+ 0xaf,
+ 0xd4,
+ 0xbd,
+ 0x58,
+ 0x34,
+ 0x07,
+ 0x32,
+ 0xee,
+ 0xb9,
+ 0xb5,
+ 0xea,
+ 0xff,
+ 0xd7,
+ 0x8c,
+ 0x0d,
+ 0x2e,
+ 0x2f,
+ 0xaf,
+ 0x87,
+ 0xbb,
+ 0xe6,
+ 0x52,
+ 0x71,
+ 0x22,
+ 0xf5,
+ 0x25,
+ 0x17,
+ 0xa1,
+ 0x82,
+ 0x04,
+ 0xc2,
+ 0x4a,
+ 0xbd,
+ 0x57,
+ 0xc6,
+ 0xab,
+ 0xc8,
+ 0x35,
+ 0x0c,
+ 0x3c,
+ 0xd9,
+ 0xc2,
+ 0x43,
+ 0xdb,
+ 0x27,
+ 0x92,
+ 0xcf,
+ 0xb8,
+ 0x25,
+ 0x60,
+ 0xfa,
+ 0x21,
+ 0x3b,
+ 0x04,
+ 0x52,
+ 0xc8,
+ 0x96,
+ 0xba,
+ 0x74,
+ 0xe3,
+ 0x67,
+ 0x3e,
+ 0x8e,
+ 0x8d,
+ 0x61,
+ 0x90,
+ 0x92,
+ 0x59,
+ 0xb6,
+ 0x1a,
+ 0x1c,
+ 0x5e,
+ 0x21,
+ 0xc1,
+ 0x65,
+ 0xe5,
+ 0xa6,
+ 0x34,
+ 0x05,
+ 0x6f,
+ 0xc5,
+ 0x60,
+ 0xb1,
+ 0x83,
+ 0xc1,
+ 0xd5,
+ 0xd5,
+ 0xed,
+ 0xd9,
+ 0xc7,
+ 0x11,
+ 0x7b,
+ 0x49,
+ 0x7a,
+ 0xf9,
+ 0xf9,
+ 0x84,
+ 0x47,
+ 0x9b,
+ 0xe2,
+ 0xa5,
+ 0x82,
+ 0xe0,
+ 0xc2,
+ 0x88,
+ 0xd0,
+ 0xb2,
+ 0x58,
+ 0x88,
+ 0x7f,
+ 0x45,
+ 0x09,
+ 0x67,
+ 0x74,
+ 0x61,
+ 0xbf,
+ 0xe6,
+ 0x40,
+ 0xe2,
+ 0x9d,
+ 0xc2,
+ 0x47,
+ 0x05,
+ 0x89,
+ 0xed,
+ 0xcb,
+ 0xbb,
+ 0xb7,
+ 0x27,
+ 0xe7,
+ 0xdc,
+ 0x7a,
+ 0xfd,
+ 0xbf,
+ 0xa8,
+ 0xd0,
+ 0xaa,
+ 0x10,
+ 0x39,
+ 0x3c,
+ 0x20,
+ 0xf0,
+ 0xd3,
+ 0x6e,
+ 0xb1,
+ 0x72,
+ 0xf8,
+ 0xe6,
+ 0x0f,
+ 0xef,
+ 0x37,
+ 0xe5,
+ 0x09,
+ 0x33,
+ 0x5a,
+ 0x83,
+ 0x43,
+ 0x80,
+ 0x4f,
+ 0x65,
+ 0x2f,
+ 0x7c,
+ 0x8c,
+ 0x6a,
+ 0xa0,
+ 0x82,
+ 0x0c,
+ 0xd4,
+ 0xd4,
+ 0xfa,
+ 0x81,
+ 0x60,
+ 0x3d,
+ 0xdf,
+ 0x06,
+ 0xf1,
+ 0x5f,
+ 0x08,
+ 0x0d,
+ 0x6d,
+ 0x43,
+ 0xf2,
+ 0xe3,
+ 0x11,
+ 0x7d,
+ 0x80,
+ 0x32,
+ 0xc5,
+ 0xfb,
+ 0xc5,
+ 0xd9,
+ 0x27,
+ 0xec,
+ 0xc6,
+ 0x4e,
+ 0x65,
+ 0x27,
+ 0x76,
+ 0x87,
+ 0xa6,
+ 0xee,
+ 0xee,
+ 0xd7,
+ 0x8b,
+ 0xd1,
+ 0xa0,
+ 0x5c,
+ 0xb0,
+ 0x42,
+ 0x13,
+ 0x0e,
+ 0x95,
+ 0x4a,
+ 0xf2,
+ 0x06,
+ 0xc6,
+ 0x43,
+ 0x33,
+ 0xf4,
+ 0xc7,
+ 0xf8,
+ 0xe7,
+ 0x1f,
+ 0xdd,
+ 0xe4,
+ 0x46,
+ 0x4a,
+ 0x70,
+ 0x39,
+ 0x6c,
+ 0xd0,
+ 0xed,
+ 0xca,
+ 0xbe,
+ 0x60,
+ 0x3b,
+ 0xd1,
+ 0x7b,
+ 0x57,
+ 0x48,
+ 0xe5,
+ 0x3a,
+ 0x79,
+ 0xc1,
+ 0x69,
+ 0x33,
+ 0x53,
+ 0x1b,
+ 0x80,
+ 0xb8,
+ 0x91,
+ 0x7d,
+ 0xb4,
+ 0xf6,
+ 0x17,
+ 0x1a,
+ 0x1d,
+ 0x5a,
+ 0x32,
+ 0xd6,
+ 0xcc,
+ 0x71,
+ 0x29,
+ 0x3f,
+ 0x28,
+ 0xbb,
+ 0xf3,
+ 0x5e,
+ 0x71,
+ 0xb8,
+ 0x43,
+ 0xaf,
+ 0xf8,
+ 0xb9,
+ 0x64,
+ 0xef,
+ 0xc4,
+ 0xa5,
+ 0x6c,
+ 0x08,
+ 0x53,
+ 0xc7,
+ 0x00,
+ 0x10,
+ 0x39,
+ 0x4f,
+ 0xdd,
+ 0xe4,
+ 0xb6,
+ 0x19,
+ 0x27,
+ 0xfb,
+ 0xb8,
+ 0xf5,
+ 0x32,
+ 0x73,
+ 0xe5,
+ 0xcb,
+ 0x32,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
+ static byte chkb[] = new byte [60 + 4];
+
+ /**
+ * Calculates a crc checksum-sequence over an array.
+ */
+ public static byte BlockSequenceCRCByte(byte base[], int offset, int length, int sequence)
+ {
+ int n;
+ int p_ndx;
+ short x;
+
+ short crc;
+
+ if (sequence < 0)
+ Sys.Error("sequence < 0, this shouldn't happen\n");
+
+ //p_ndx = (sequence % (sizeof(chktbl) - 4));
+ p_ndx = (sequence % (1024 - 4));
+
+ //memcpy(chkb, base, length);
+ System.arraycopy(base, offset , chkb, 0, Math.max(60, length));
+
+ chkb[length]= (byte) chktbl[p_ndx + 0];
+ chkb[length + 1]= (byte) chktbl[p_ndx + 1];
+ chkb[length + 2]= (byte) chktbl[p_ndx + 2];
+ chkb[length + 3]= (byte) chktbl[p_ndx + 3];
+
+
+ length += 4;
+
+ crc = CRC.CRC_Block(chkb, length);
+
+ for (x= 0, n= 0; n < length; n++)
+ x += chkb[n];
+
+ crc ^= x;
+
+ return (byte)(crc & 0xFF);
+ }
+
} \ No newline at end of file
diff --git a/src/jake2/qcommon/FS.java b/src/jake2/qcommon/FS.java
index 6a505d0..0babfe4 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.2.2.1 2004-07-09 08:09:08 hzi Exp $
+ * $Id: FS.java,v 1.2.2.2 2004-07-09 08:38:29 hzi Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -116,7 +116,7 @@ public final class FS extends Globals {
if (index > 0) {
File f = new File(path.substring(0, index));
if (!f.mkdirs()) {
- Com.Printf("can't create path \"" + path + '"');
+ Com.Printf("can't create path \"" + path + '"' + "\n" );
}
}
}
diff --git a/src/jake2/qcommon/MD4.java b/src/jake2/qcommon/MD4.java
index 45fdf7c..e6a2add 100644
--- a/src/jake2/qcommon/MD4.java
+++ b/src/jake2/qcommon/MD4.java
@@ -19,11 +19,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// Created on 02.02.2004 by RST.
-// $Id: MD4.java,v 1.1 2004-07-07 19:59:31 hzi Exp $
+// $Id: MD4.java,v 1.1.1.1.2.1 2004-07-09 08:38:29 hzi Exp $
package jake2.qcommon;
import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
import java.security.MessageDigest;
import jake2.*;
@@ -295,17 +296,18 @@ public class MD4 extends MessageDigest implements Cloneable {
return t << s | t >>> (32 - s);
}
+ /**
+ * Bugfixed, now works prima (RST).
+ */
public static int Com_BlockChecksum(byte[] buffer, int length) {
- byte digest[] = new byte[16];
+
int val;
MD4 md4 = new MD4();
md4.engineUpdate(buffer, 0, length);
- byte data[] = md4.engineDigest();
- Com.Printf("md4: " + Lib.hexDump(data, 16, false));
-
+ byte data[] = md4.engineDigest();
ByteBuffer bb = ByteBuffer.wrap(data);
- //val = digest[0] ^ digest[1] ^ digest[2] ^ digest[3];
+ bb.order(ByteOrder.LITTLE_ENDIAN);
val = bb.getInt() ^ bb.getInt() ^ bb.getInt() ^ bb.getInt();
return val;
}
diff --git a/src/jake2/qcommon/Qcommon.java b/src/jake2/qcommon/Qcommon.java
index 02da212..c8d8624 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.3.2.1 2004-07-09 08:09:08 hzi Exp $
+ * $Id: Qcommon.java,v 1.3.2.2 2004-07-09 08:38:29 hzi Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
diff --git a/src/jake2/qcommon/qfiles.java b/src/jake2/qcommon/qfiles.java
index ae7fdf6..2d9cfdc 100644
--- a/src/jake2/qcommon/qfiles.java
+++ b/src/jake2/qcommon/qfiles.java
@@ -2,7 +2,7 @@
* qfiles.java
* Copyright (C) 2003
*
- * $Id: qfiles.java,v 1.3 2004-07-08 20:24:48 hzi Exp $
+ * $Id: qfiles.java,v 1.3.2.1 2004-07-09 08:38:29 hzi Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -25,14 +25,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
package jake2.qcommon;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
+import jake2.Defines;
-import jake2.*;
-import jake2.client.*;
-import jake2.game.*;
-import jake2.render.*;
-import jake2.server.*;
+import java.nio.*;
/**
* qfiles
@@ -292,6 +287,14 @@ public class qfiles {
ofs_glcmds = b.getInt();
ofs_end = b.getInt(); // end of file
}
+
+ /*
+ * new members for vertex array handling
+ */
+ public FloatBuffer textureCoordBuf = null;
+ public IntBuffer vertexIndexBuf = null;
+ public int[] counts = null;
+ public IntBuffer[] indexElements = null;
}
/*