aboutsummaryrefslogtreecommitdiffstats
path: root/src/jake2/qcommon
diff options
context:
space:
mode:
Diffstat (limited to 'src/jake2/qcommon')
-rw-r--r--src/jake2/qcommon/CM.java32
-rw-r--r--src/jake2/qcommon/Cbuf.java7
-rw-r--r--src/jake2/qcommon/Com.java46
-rw-r--r--src/jake2/qcommon/FS.java4
-rw-r--r--src/jake2/qcommon/MSG.java8
-rw-r--r--src/jake2/qcommon/Netchan.java6
-rw-r--r--src/jake2/qcommon/PMove.java9
-rw-r--r--src/jake2/qcommon/Qcommon.java29
-rw-r--r--src/jake2/qcommon/SZ.java8
-rw-r--r--src/jake2/qcommon/Z.java63
-rw-r--r--src/jake2/qcommon/netadr_t.java33
-rw-r--r--src/jake2/qcommon/qfiles.java7
-rw-r--r--src/jake2/qcommon/texinfo_t.java6
-rw-r--r--src/jake2/qcommon/zhead_t.java38
14 files changed, 82 insertions, 214 deletions
diff --git a/src/jake2/qcommon/CM.java b/src/jake2/qcommon/CM.java
index 6cb141f..8c5a203 100644
--- a/src/jake2/qcommon/CM.java
+++ b/src/jake2/qcommon/CM.java
@@ -19,17 +19,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// Created on 02.01.2004 by RST.
-// $Id: CM.java,v 1.1 2004-07-07 19:59:29 hzi Exp $
+// $Id: CM.java,v 1.2 2004-07-08 15:58:46 hzi Exp $
package jake2.qcommon;
import jake2.Defines;
import jake2.game.*;
-import jake2.util.Lib;
-import jake2.util.Math3D;
-import jake2.util.Vargs;
+import jake2.util.*;
-import java.io.FileNotFoundException;
import java.io.RandomAccessFile;
import java.nio.*;
import java.util.Arrays;
@@ -171,9 +168,6 @@ public class CM extends Game {
public static cvar_t map_noareas;
- public static int c_pointcontents;
- public static int c_traces, c_brush_traces;
-
/*
===============================================================================
@@ -282,15 +276,15 @@ public class CM extends Game {
map_name = name;
- // debug (rst)
+ // debug (rst)
+ /*
Com.p("Testing pointleafes:");
for (int n = 0; n < 20; n++) {
float pos[] = new float[] {(float) (Math.random() * 1000), (float) (Math.random() * 1000), 0 };
int x = CM_PointLeafnum(pos);
-
Com.p(Lib.vtofsbeaty(pos) + " ---> leaf=" + x + " area = " +map_leafs[x].area);
}
-
+ */
return map_cmodels[0];
}
@@ -785,6 +779,7 @@ public class CM extends Game {
}
}
+
/*
=================
CMod_LoadVisibility
@@ -1052,7 +1047,8 @@ public class CM extends Game {
while (true) {
if (nodenum < 0) {
if (leaf_count >= leaf_maxcount) {
- Com.DPrintf("CM_BoxLeafnums_r: overflow\n");
+ //TODO: here is still an error.
+ //Com.DPrintf("CM_BoxLeafnums_r: overflow\n");
return;
}
leaf_list[leaf_count++] = -1 - nodenum;
@@ -1728,7 +1724,7 @@ public class CM extends Game {
*/
public static void FloodArea_r(carea_t area, int floodnum) {
- Com.DPrintf("FloodArea_r(" + floodnum + ")...\n");
+ //Com.Printf("FloodArea_r(" + floodnum + ")...\n");
int i;
qfiles.dareaportal_t p;
@@ -1880,16 +1876,12 @@ public class CM extends Game {
byte buf[] = new byte[len];
- try {
- FS.Read(buf, len, f);
- }
- catch (FileNotFoundException e) {
- Com.Printf("ERROR:" + e);
- }
+
+ FS.Read(buf, len, f);
+
ByteBuffer bb = ByteBuffer.wrap(buf);
IntBuffer ib = bb.asIntBuffer();
- //TODO: i assume upward counting (rst)
for (int n = 0; n < portalopen.length; n++)
portalopen[n] = ib.get() != 0;
diff --git a/src/jake2/qcommon/Cbuf.java b/src/jake2/qcommon/Cbuf.java
index 7a28a6c..5281081 100644
--- a/src/jake2/qcommon/Cbuf.java
+++ b/src/jake2/qcommon/Cbuf.java
@@ -2,7 +2,7 @@
* Cbuf.java
* Copyright (C) 2003
*
- * $Id: Cbuf.java,v 1.1 2004-07-07 19:59:27 hzi Exp $
+ * $Id: Cbuf.java,v 1.2 2004-07-08 15:58:46 hzi Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -155,7 +155,7 @@ public final class Cbuf {
byte[] line = new byte[1024];
Globals.alias_count = 0; // don't allow infinite alias loops
-
+
while (Globals.cmd_text.cursize != 0) {
// find a \n or ; line break
text = Globals.cmd_text.data;
@@ -194,11 +194,8 @@ public final class Cbuf {
// execute the command line
int len = jake2.util.Lib.strlen(line);
- //System.out.println("Cbuf.executelen:" + Globals.cmd_text.cursize + "/" + len);
String cmd = new String(line, 0, len);
- //System.out.println("Cbuf.data :" + new String(text,0,16).replace('\n','.').replace('\r','.'));
- //System.out.println("Cbuf.execute:" + xxx.replace('\n','.').replace('\r','.') );
Cmd.ExecuteString(cmd);
if (Globals.cmd_wait) {
diff --git a/src/jake2/qcommon/Com.java b/src/jake2/qcommon/Com.java
index 63b7d0e..c938fdb 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.1 2004-07-07 19:59:30 hzi Exp $
+ * $Id: Com.java,v 1.2 2004-07-08 15:58:46 hzi Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -30,27 +30,23 @@ import jake2.Globals;
import jake2.client.CL;
import jake2.client.Console;
import jake2.game.Cmd;
-import jake2.server.SV;
import jake2.server.SV_MAIN;
import jake2.sys.Sys;
-import jake2.util.Lib;
-import jake2.util.PrintfFormat;
-import jake2.util.Vargs;
+import jake2.util.*;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.util.logging.Logger;
+import java.io.*;
/**
* Com
* TODO complete Com interface
*/
public final class Com {
-
- public static class RD_Flusher {
- public void rd_flush(int target, byte [] buffer) {
- }
+
+ 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 int rd_target;
@@ -83,8 +79,6 @@ public final class Com {
static String msg = "";
- private static Logger logger = Logger.getLogger(Com.class.getName());
-
// helper class to replace the pointer-pointer
public static class ParseHelp {
@@ -211,7 +205,7 @@ public final class Com {
c = hlp.nextchar();
if (c == '\"' || c == 0) {
- char xxx = hlp.nextchar();
+ hlp.nextchar();
com_token[len] = '?';
return new String(com_token, 0, len);
}
@@ -276,7 +270,7 @@ public final class Com {
SV_MAIN.SV_Shutdown("Server crashed: " + msg + "\n", false);
CL.Drop();
recursive = false;
- //throw new longjmpException();
+ throw new longjmpException();
}
else {
SV_MAIN.SV_Shutdown("Server fatal crashed: %s" + msg + "\n", false);
@@ -296,12 +290,12 @@ public final class Com {
Com.Error(Globals.ERR_FATAL, "argc > MAX_NUM_ARGVS");
}
- Globals.com_argc = args.length;
- for (int i = 0; i < Globals.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)
- Globals.com_argv[i] = "";
+ Com.com_argv[i] = "";
else
- Globals.com_argv[i] = args[i];
+ Com.com_argv[i] = args[i];
}
}
@@ -417,19 +411,19 @@ public final class Com {
}
public static int Argc() {
- return Globals.com_argc;
+ return Com.com_argc;
}
public static String Argv(int arg) {
- if (arg < 0 || arg >= Globals.com_argc || Globals.com_argv[arg].length() < 1)
+ if (arg < 0 || arg >= Com.com_argc || Com.com_argv[arg].length() < 1)
return "";
- return Globals.com_argv[arg];
+ return Com.com_argv[arg];
}
public static void ClearArgv(int arg) {
- if (arg < 0 || arg >= Globals.com_argc || Globals.com_argv[arg].length() < 1)
+ if (arg < 0 || arg >= Com.com_argc || Com.com_argv[arg].length() < 1)
return;
- Globals.com_argv[arg] = "";
+ Com.com_argv[arg] = "";
}
public static void Quit() {
diff --git a/src/jake2/qcommon/FS.java b/src/jake2/qcommon/FS.java
index 47d760c..98975a6 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.1 2004-07-07 19:59:31 hzi Exp $
+ * $Id: FS.java,v 1.2 2004-07-08 15:58:46 hzi Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -376,7 +376,7 @@ public final class FS extends Globals {
=============
*/
public static void FreeFile(byte[] buffer) {
- Z.Free(buffer);
+ buffer = null;
}
static final int IDPAKHEADER = (('K' << 24) + ('C' << 16) + ('A' << 8) + 'P');
diff --git a/src/jake2/qcommon/MSG.java b/src/jake2/qcommon/MSG.java
index cdad707..3d18798 100644
--- a/src/jake2/qcommon/MSG.java
+++ b/src/jake2/qcommon/MSG.java
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// Created on 29.11.2003 by RST.
-// $Id: MSG.java,v 1.1 2004-07-07 19:59:31 hzi Exp $
+// $Id: MSG.java,v 1.2 2004-07-08 15:58:46 hzi Exp $
package jake2.qcommon;
@@ -479,19 +479,17 @@ public class MSG extends GameBase {
public static byte readbuf[] = new byte[2048];
public static String ReadString(sizebuf_t msg_read) {
- String string = "";
byte c;
int l = 0;
do {
- c = (byte) ReadByte(msg_read);
+ c = (byte)ReadByte(msg_read);
if (c == -1 || c == 0)
break;
readbuf[l] = c;
l++;
- }
- while (l < 2047);
+ } while (l < 2047);
//readbuf[l] = 0;
return new String(readbuf, 0, l);
diff --git a/src/jake2/qcommon/Netchan.java b/src/jake2/qcommon/Netchan.java
index d949588..31699c3 100644
--- a/src/jake2/qcommon/Netchan.java
+++ b/src/jake2/qcommon/Netchan.java
@@ -2,7 +2,7 @@
* NetChannel.java
* Copyright (C) 2003
*
- * $Id: Netchan.java,v 1.1 2004-07-07 19:59:32 hzi Exp $
+ * $Id: Netchan.java,v 1.2 2004-07-08 15:58:46 hzi Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -158,9 +158,9 @@ public final class Netchan extends SV_MAIN {
chan.clear();
chan.sock = sock;
- chan.remote_address = adr.copy();
+ chan.remote_address.set(adr);
chan.qport = qport;
- chan.last_received = (int) Globals.curtime;
+ chan.last_received = Globals.curtime;
chan.incoming_sequence = 0;
chan.outgoing_sequence = 1;
diff --git a/src/jake2/qcommon/PMove.java b/src/jake2/qcommon/PMove.java
index ed82432..75459fc 100644
--- a/src/jake2/qcommon/PMove.java
+++ b/src/jake2/qcommon/PMove.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: PMove.java,v 1.1 2004-07-07 19:59:33 hzi Exp $
+// $Id: PMove.java,v 1.2 2004-07-08 15:58:46 hzi Exp $
package jake2.qcommon;
@@ -160,8 +160,8 @@ public class PMove extends Game
// save entity for contact
if (pm.numtouch < MAXTOUCH && trace.ent != null)
{
- if (trace.ent.index != -1)
- Com.p("touch: " + trace.ent.classname + " (" + trace.ent.index + ")" );
+ //if (trace.ent.index != -1 && trace.ent.index != 0)
+ //Com.p("touch: " + trace.ent.classname + " (" + trace.ent.index + ")" );
pm.touchents[pm.numtouch] = trace.ent;
pm.numtouch++;
@@ -646,7 +646,6 @@ public class PMove extends Game
else
{
pm.groundentity = trace.ent;
-
// hitting solid ground will end a waterjump
if ((pm.s.pm_flags & PMF_TIME_WATERJUMP) != 0)
{
@@ -655,7 +654,7 @@ public class PMove extends Game
}
if (0 == (pm.s.pm_flags & PMF_ON_GROUND))
- { // just hit the ground
+ { // just hit the ground
pm.s.pm_flags |= PMF_ON_GROUND;
// don't do landing time if we were just going down a slope
if (pml.velocity[2] < -200)
diff --git a/src/jake2/qcommon/Qcommon.java b/src/jake2/qcommon/Qcommon.java
index b55f4d9..bf7771c 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.1 2004-07-07 19:59:33 hzi Exp $
+ * $Id: Qcommon.java,v 1.2 2004-07-08 15:58:46 hzi Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -28,6 +28,8 @@ package jake2.qcommon;
import jake2.Globals;
import jake2.client.*;
import jake2.game.Cmd;
+import jake2.game.EntThinkAdapter;
+import jake2.game.GamePWeapon;
import jake2.game.Swap;
import jake2.server.SV_MAIN;
import jake2.sys.NET;
@@ -43,6 +45,9 @@ import java.io.IOException;
*/
public final class Qcommon extends Globals {
+ public static final String BUILDSTRING = "Java";
+ public static final String CPUSTRING = "jvm";
+
/**
* This function initializes the different subsystems of
* the game engine. The setjmp/longjmp mechanism of the original
@@ -51,7 +56,6 @@ public final class Qcommon extends Globals {
*/
public static void InitForTestMap(String[] args) {
try {
- Z.chain.next= Z.chain.prev= Z.chain;
// prepare enough of the subsystems to handle
// cvar and command buffer management
@@ -83,7 +87,6 @@ public final class Qcommon extends Globals {
//
// init commands and vars
//
- Cmd.AddCommand("z_stats", Z.Stats_f);
Cmd.AddCommand("error", Com.Error_f);
Globals.host_speeds= Cvar.Get("host_speeds", "0", 0);
@@ -98,9 +101,9 @@ public final class Qcommon extends Globals {
String s = Com.sprintf("%4.2f %s %s %s",
new Vargs(4)
.add(Globals.VERSION)
- .add(Globals.CPUSTRING)
+ .add(CPUSTRING)
.add(Globals.__DATE__)
- .add(Globals.BUILDSTRING));
+ .add(BUILDSTRING));
Cvar.Get("version", s, CVAR_SERVERINFO | CVAR_NOSET);
@@ -144,7 +147,9 @@ public final class Qcommon extends Globals {
Swap.Init();
Cbuf.Init();
-
+ //rst bugfix
+ //GamePWeapon xxx = new GamePWeapon();
+
Cmd.Init();
Cvar.Init();
@@ -168,7 +173,6 @@ public final class Qcommon extends Globals {
//
// init commands and vars
//
- Cmd.AddCommand("z_stats", Z.Stats_f);
Cmd.AddCommand("error", Com.Error_f);
Globals.host_speeds= Cvar.Get("host_speeds", "0", 0);
@@ -179,13 +183,13 @@ public final class Qcommon extends Globals {
Globals.logfile_active= Cvar.Get("logfile", "0", 0);
Globals.showtrace= Cvar.Get("showtrace", "0", 0);
Globals.dedicated= Cvar.Get("dedicated", "0", CVAR_NOSET);
-
+ Globals.slomo= Cvar.Get("slomo", "1", 0);
String s = Com.sprintf("%4.2f %s %s %s",
new Vargs(4)
.add(Globals.VERSION)
- .add(Globals.CPUSTRING)
+ .add(CPUSTRING)
.add(Globals.__DATE__)
- .add(Globals.BUILDSTRING));
+ .add(BUILDSTRING));
Cvar.Get("version", s, CVAR_SERVERINFO | CVAR_NOSET);
@@ -198,7 +202,7 @@ public final class Qcommon extends Globals {
// add + commands from command line
if (!Cbuf.AddLateCommands()) {
// if the user didn't give any commands, run default action
-// Cbuf.AddText("d1\n");
+ Cbuf.AddText("d1\n");
Cbuf.Execute();
} else {
// the user asked for something explicit
@@ -277,7 +281,7 @@ public final class Qcommon extends Globals {
Globals.c_pointcontents= 0;
}
- Cbuf.Execute ();
+ Cbuf.Execute();
int time_before= 0;
int time_between= 0;
@@ -312,4 +316,5 @@ public final class Qcommon extends Globals {
}
}
+
}
diff --git a/src/jake2/qcommon/SZ.java b/src/jake2/qcommon/SZ.java
index f17daa2..08ec6dc 100644
--- a/src/jake2/qcommon/SZ.java
+++ b/src/jake2/qcommon/SZ.java
@@ -2,7 +2,7 @@
* SZ.java
* Copyright (C) 2003
*
- * $Id: SZ.java,v 1.1 2004-07-07 19:59:33 hzi Exp $
+ * $Id: SZ.java,v 1.2 2004-07-08 15:58:46 hzi Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -25,8 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
package jake2.qcommon;
-import java.util.Arrays;
-
import jake2.Defines;
/**
@@ -42,10 +40,10 @@ public final class SZ {
public static void Init(sizebuf_t buf, byte data[], int length) {
//memset (buf, 0, sizeof(*buf));
- //TODO: slow but safe;
- Arrays.fill(data,(byte)0);
buf.data = data;
buf.maxsize = length;
+ buf.cursize = 0;
+ buf.allowoverflow = buf.overflowed = false;
}
diff --git a/src/jake2/qcommon/Z.java b/src/jake2/qcommon/Z.java
deleted file mode 100644
index f25e4eb..0000000
--- a/src/jake2/qcommon/Z.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Z.java
- * Copyright (C) 2003
- *
- * $Id: Z.java,v 1.1 2004-07-07 19:59:34 hzi Exp $
- */
- /*
-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.
-
-*/
-package jake2.qcommon;
-
-import java.nio.ByteBuffer;
-
-
-/**
- * Z implements special memory management.
- */
-public final class Z {
-
- public static xcommand_t Stats_f = new xcommand_t() {
- public void execute() {
- Com.Printf("abstract xccommand_t not overloaded.");
- }
- };
-
- static final zhead_t chain = new zhead_t();
- static final short MAGIC = 0x1d1d;
-
- static int count = 0;
- static int bytes = 0;
-
- public static byte[] Malloc(int size) {
- return TagMalloc(size, 0);
- }
-
- static byte [] TagMalloc(int size, int tag) {
- return new byte[size];
- }
-
- public static void Free(byte[] ptr) {
- }
-
- public static void Free(ByteBuffer buffer) {
- buffer.clear();
- buffer.limit(0);
- }
-}
diff --git a/src/jake2/qcommon/netadr_t.java b/src/jake2/qcommon/netadr_t.java
index 3d45b0c..b448861 100644
--- a/src/jake2/qcommon/netadr_t.java
+++ b/src/jake2/qcommon/netadr_t.java
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// Created on 27.11.2003 by RST.
-// $Id: netadr_t.java,v 1.1 2004-07-07 19:59:34 hzi Exp $
+// $Id: netadr_t.java,v 1.2 2004-07-08 15:58:46 hzi Exp $
package jake2.qcommon;
@@ -27,23 +27,10 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
public class netadr_t {
-
- public netadr_t()
- {}
- public netadr_t(netadr_t from)
- {
- type = from.type;
- port = from.port;
- ip= new byte [4];
- ip[0] = from.ip[0];
- ip[1] = from.ip[1];
- ip[2] = from.ip[2];
- ip[3] = from.ip[3];
- }
public int type;
public int port;
- public byte ip[] = {1,2,3,4};
+ public byte ip[] = {0,0,0,0};
//public byte ipx[] = new byte[10];
InetAddress ia = null;
@@ -55,11 +42,13 @@ public class netadr_t {
return ia;
}
-
- public netadr_t copy()
- {
-
- // TODO Auto-generated method stub
- return new netadr_t(this);
- }
+
+ public void set(netadr_t from) {
+ type = from.type;
+ port = from.port;
+ ip[0] = from.ip[0];
+ ip[1] = from.ip[1];
+ ip[2] = from.ip[2];
+ ip[3] = from.ip[3];
+ }
}
diff --git a/src/jake2/qcommon/qfiles.java b/src/jake2/qcommon/qfiles.java
index 6a51fd4..bda2233 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.1 2004-07-07 19:59:34 hzi Exp $
+ * $Id: qfiles.java,v 1.2 2004-07-08 15:58:46 hzi Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -625,9 +625,8 @@ public class qfiles {
public dareaportal_t(ByteBuffer bb) {
bb.order(ByteOrder.LITTLE_ENDIAN);
-
- portalnum = bb.getShort();
- otherarea = bb.getShort();
+ portalnum = bb.getInt();
+ otherarea = bb.getInt();
}
int portalnum;
diff --git a/src/jake2/qcommon/texinfo_t.java b/src/jake2/qcommon/texinfo_t.java
index aa23894..81b32b2 100644
--- a/src/jake2/qcommon/texinfo_t.java
+++ b/src/jake2/qcommon/texinfo_t.java
@@ -19,17 +19,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// Created on 02.01.2004 by RST.
-// $Id: texinfo_t.java,v 1.1 2004-07-07 19:59:34 hzi Exp $
+// $Id: texinfo_t.java,v 1.2 2004-07-08 15:58:46 hzi Exp $
package jake2.qcommon;
-import jake2.game.EndianHandler;
+import jake2.util.Lib;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
-import jake2.util.*;
-
public class texinfo_t {
// works fine.
diff --git a/src/jake2/qcommon/zhead_t.java b/src/jake2/qcommon/zhead_t.java
deleted file mode 100644
index f2f1119..0000000
--- a/src/jake2/qcommon/zhead_t.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * zhead_t.java
- * Copyright (C) 2003
- *
- * $Id: zhead_t.java,v 1.1 2004-07-07 19:59:34 hzi Exp $
- */
-/*
-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.
-
-*/
-package jake2.qcommon;
-
-/**
- * zhead_t
- */
-public final class zhead_t {
- zhead_t prev = null;
- zhead_t next = null;
- short magic = 0;
- short tag = 0;
- int size = 0;
- byte[] buf = null;
-}