summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Weisse <[email protected]>2006-11-21 02:22:19 +0000
committerCarsten Weisse <[email protected]>2006-11-21 02:22:19 +0000
commit60a03cf93bfcafa6fc542bcaacd6fe0d28072caf (patch)
tree544de78f9fa838e8b34d0a67ab4e0d46a8eeb694
parenta292c9893728f19d03b6e5512f9cf15b19ab4683 (diff)
clean up: unused declarations removed
-rw-r--r--src/jake2/render/LwjglRenderer.java10
-rw-r--r--src/jake2/render/fast/Image.java4
-rw-r--r--src/jake2/render/fast/Light.java4
-rw-r--r--src/jake2/render/fast/Main.java3
-rw-r--r--src/jake2/render/fast/Mesh.java3
-rw-r--r--src/jake2/render/fast/Model.java10
-rw-r--r--src/jake2/render/fast/Surf.java8
-rw-r--r--src/jake2/render/opengl/GLDriver.java1
8 files changed, 15 insertions, 28 deletions
diff --git a/src/jake2/render/LwjglRenderer.java b/src/jake2/render/LwjglRenderer.java
index 3cf5b0b..9490b2d 100644
--- a/src/jake2/render/LwjglRenderer.java
+++ b/src/jake2/render/LwjglRenderer.java
@@ -2,7 +2,7 @@
* LwjglRenderer.java
* Copyright (C) 2004
*
- * $Id: LwjglRenderer.java,v 1.2 2006-11-21 00:51:22 cawe Exp $
+ * $Id: LwjglRenderer.java,v 1.3 2006-11-21 02:22:19 cawe Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -26,13 +26,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
package jake2.render;
import jake2.Defines;
-import jake2.client.*;
-import jake2.qcommon.xcommand_t;
+import jake2.client.refdef_t;
+import jake2.client.refexport_t;
import jake2.render.opengl.LwjglDriver;
-import jake2.sys.*;
+import jake2.sys.KBD;
+import jake2.sys.LWJGLKBD;
import java.awt.Dimension;
-import java.awt.DisplayMode;
/**
* LwjglRenderer
diff --git a/src/jake2/render/fast/Image.java b/src/jake2/render/fast/Image.java
index a724cb7..a1566e7 100644
--- a/src/jake2/render/fast/Image.java
+++ b/src/jake2/render/fast/Image.java
@@ -2,7 +2,7 @@
* Image.java
* Copyright (C) 2003
*
- * $Id: Image.java,v 1.2 2006-11-21 00:50:46 cawe Exp $
+ * $Id: Image.java,v 1.3 2006-11-21 02:22:19 cawe Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -534,7 +534,6 @@ public abstract class Image extends Main {
int row, column;
byte[] raw;
ByteBuffer buf_p;
- int length;
qfiles.tga_t targa_header;
byte[] pic = null;
@@ -1264,7 +1263,6 @@ public abstract class Image extends Main {
}
else {
int p;
- int rgb;
for (int i = 0; i < s; i++) {
p = data[i] & 0xff;
trans[i] = d_8to24table[p];
diff --git a/src/jake2/render/fast/Light.java b/src/jake2/render/fast/Light.java
index c0d0a32..c1a2193 100644
--- a/src/jake2/render/fast/Light.java
+++ b/src/jake2/render/fast/Light.java
@@ -2,7 +2,7 @@
* Light.java
* Copyright (C) 2003
*
- * $Id: Light.java,v 1.2 2006-11-21 00:50:46 cawe Exp $
+ * $Id: Light.java,v 1.3 2006-11-21 02:22:19 cawe Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -496,8 +496,6 @@ public abstract class Light extends Warp {
try {
// set to full bright if no light data
if (surf.samples == null) {
- int maps;
-
for (i = 0; i < size * 3; i++)
s_blocklights[i] = 255;
diff --git a/src/jake2/render/fast/Main.java b/src/jake2/render/fast/Main.java
index 9a4cacf..a40bc94 100644
--- a/src/jake2/render/fast/Main.java
+++ b/src/jake2/render/fast/Main.java
@@ -2,7 +2,7 @@
* Main.java
* Copyright (C) 2003
*
- * $Id: Main.java,v 1.2 2006-11-21 00:50:46 cawe Exp $
+ * $Id: Main.java,v 1.3 2006-11-21 02:22:19 cawe Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -26,7 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
package jake2.render.fast;
import jake2.Defines;
-import jake2.Globals;
import jake2.client.*;
import jake2.game.*;
import jake2.qcommon.*;
diff --git a/src/jake2/render/fast/Mesh.java b/src/jake2/render/fast/Mesh.java
index 2cd7d81..4840d18 100644
--- a/src/jake2/render/fast/Mesh.java
+++ b/src/jake2/render/fast/Mesh.java
@@ -2,7 +2,7 @@
* Mesh.java
* Copyright (C) 2003
*
- * $Id: Mesh.java,v 1.2 2006-11-21 00:50:46 cawe Exp $
+ * $Id: Mesh.java,v 1.3 2006-11-21 02:22:19 cawe Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -262,7 +262,6 @@ public abstract class Mesh extends Light {
void GL_DrawAliasShadow(qfiles.dmdl_t paliashdr, int posenum)
{
float lheight = currententity.origin[2] - lightspot[2];
- qfiles.daliasframe_t frame = paliashdr.aliasFrames[currententity.frame];
int[] order = paliashdr.glCmds;
float height = -lheight + 1.0f;
diff --git a/src/jake2/render/fast/Model.java b/src/jake2/render/fast/Model.java
index 47541d9..93180d5 100644
--- a/src/jake2/render/fast/Model.java
+++ b/src/jake2/render/fast/Model.java
@@ -2,7 +2,7 @@
* Model.java
* Copyright (C) 2003
*
- * $Id: Model.java,v 1.2 2006-11-21 00:50:46 cawe Exp $
+ * $Id: Model.java,v 1.3 2006-11-21 02:22:19 cawe Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -344,8 +344,6 @@ public abstract class Model extends Surf {
*/
void Mod_LoadVisibility(lump_t l)
{
- int i;
-
if (l.filelen == 0)
{
loadmodel.vis = null;
@@ -501,7 +499,7 @@ public abstract class Model extends Surf {
texinfo_t in;
mtexinfo_t[] out;
mtexinfo_t step;
- int i, j, count;
+ int i, count;
int next;
String name;
@@ -782,7 +780,7 @@ public abstract class Model extends Surf {
{
qfiles.dleaf_t in;
mleaf_t[] out;
- int i, j, count, p;
+ int i, j, count;
if ((l.filelen % qfiles.dleaf_t.SIZE) != 0)
Com.Error (Defines.ERR_DROP, "MOD_LoadBmodel: funny lump size in " + loadmodel.name);
@@ -1008,7 +1006,7 @@ public abstract class Model extends Surf {
*/
void Mod_LoadAliasModel (model_t mod, ByteBuffer buffer)
{
- int i, j;
+ int i;
qfiles.dmdl_t pheader;
qfiles.dstvert_t[] poutst;
qfiles.dtriangle_t[] pouttri;
diff --git a/src/jake2/render/fast/Surf.java b/src/jake2/render/fast/Surf.java
index c9312ff..14713fe 100644
--- a/src/jake2/render/fast/Surf.java
+++ b/src/jake2/render/fast/Surf.java
@@ -2,7 +2,7 @@
* Surf.java
* Copyright (C) 2003
*
- * $Id: Surf.java,v 1.2 2006-11-21 00:50:46 cawe Exp $
+ * $Id: Surf.java,v 1.3 2006-11-21 02:22:19 cawe Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -434,7 +434,6 @@ public abstract class Surf extends Draw {
}
glpoly_t p;
- FloatBuffer texCoord = globalPolygonInterleavedBuf;
image_t image = R_TextureAnimation( surf.texinfo );
int lmtex = surf.lightmaptexturenum;
@@ -1045,8 +1044,6 @@ public abstract class Surf extends Draw {
{
int best = BLOCK_HEIGHT;
int x = pos.x;
- int y = pos.y;
-
int best2;
int i, j;
for (i=0 ; i<BLOCK_WIDTH-w ; i++)
@@ -1063,7 +1060,7 @@ public abstract class Surf extends Draw {
if (j == w)
{ // this is a valid spot
pos.x = x = i;
- pos.y = y = best = best2;
+ pos.y = best = best2;
}
}
@@ -1084,7 +1081,6 @@ public abstract class Surf extends Draw {
// reconstruct the polygon
medge_t[] pedges = currentmodel.edges;
int lnumverts = fa.numedges;
- int vertpage = 0;
//
// draw texture
//
diff --git a/src/jake2/render/opengl/GLDriver.java b/src/jake2/render/opengl/GLDriver.java
index aa28947..7f3ea56 100644
--- a/src/jake2/render/opengl/GLDriver.java
+++ b/src/jake2/render/opengl/GLDriver.java
@@ -1,7 +1,6 @@
package jake2.render.opengl;
import jake2.qcommon.xcommand_t;
-import jake2.sys.KBD;
import java.awt.Dimension;