aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/jake2/qcommon/Q2DataDialog.java8
-rw-r--r--src/jake2/render/basic/Surf.java25
-rw-r--r--src/jake2/render/basic/Warp.java5
-rw-r--r--src/jake2/sys/LWJGLKBD.java4
-rw-r--r--src/jake2/sys/Timer.java4
5 files changed, 14 insertions, 32 deletions
diff --git a/src/jake2/qcommon/Q2DataDialog.java b/src/jake2/qcommon/Q2DataDialog.java
index 2d28629..7195710 100644
--- a/src/jake2/qcommon/Q2DataDialog.java
+++ b/src/jake2/qcommon/Q2DataDialog.java
@@ -1,8 +1,6 @@
/*
* Q2DataDialog.java
* Copyright (C) 2003
- *
- * $Id: Q2DataDialog.java,v 1.14 2005-05-26 16:56:32 hzi Exp $
*/
package jake2.qcommon;
@@ -14,7 +12,9 @@ import java.awt.event.*;
import java.io.*;
import java.net.URL;
import java.net.URLConnection;
-import java.util.*;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.Vector;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@@ -220,7 +220,6 @@ public class Q2DataDialog extends javax.swing.JDialog {
private javax.swing.JButton changeButton;
private javax.swing.JButton exitButton;
private javax.swing.JButton cancelButton;
- private Jake2Canvas canvas;
private javax.swing.JPanel choosePanel;
private JPanel statusPanel;
private ProgressPanel progressPanel;
@@ -534,7 +533,6 @@ public class Q2DataDialog extends javax.swing.JDialog {
InputStream in = getClass().getResourceAsStream("/mirrors");
BufferedReader r = new BufferedReader(new InputStreamReader(in));
try {
- int i = 0;
while (true) {
String name = r.readLine();
String value = r.readLine();
diff --git a/src/jake2/render/basic/Surf.java b/src/jake2/render/basic/Surf.java
index 31ecf24..3d88373 100644
--- a/src/jake2/render/basic/Surf.java
+++ b/src/jake2/render/basic/Surf.java
@@ -1,8 +1,6 @@
/*
* Surf.java
* Copyright (C) 2003
- *
- * $Id: Surf.java,v 1.2 2006-11-21 00:50:46 cawe Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -681,9 +679,8 @@ public abstract class Surf extends Draw {
void GL_RenderLightmappedPoly( msurface_t surf )
{
- int i, nv = surf.polys.numverts;
- int map = 0;
- float[] v;
+ int nv = surf.polys.numverts;
+ int map;
image_t image = R_TextureAnimation( surf.texinfo );
boolean is_dynamic = false;
int lmtex = surf.lightmaptexturenum;
@@ -777,7 +774,7 @@ public abstract class Surf extends Draw {
for ( p = surf.polys; p != null; p = p.chain )
{
gl.glBegin (GL_POLYGON);
- for (i=0 ; i< nv; i++)
+ for (int i=0 ; i< nv; i++)
{
gl.glMultiTexCoord2f(GL_TEXTURE0, p.s1(i) + scroll, p.t1(i));
gl.glMultiTexCoord2f(GL_TEXTURE1, p.s2(i), p.t2(i));
@@ -793,7 +790,7 @@ public abstract class Surf extends Draw {
for ( p = surf.polys; p != null; p = p.chain )
{
gl.glBegin (GL_POLYGON);
- for (i=0 ; i< nv; i++)
+ for (int i=0 ; i< nv; i++)
{
gl.glMultiTexCoord2f(GL_TEXTURE0, p.s1(i), p.t1(i));
gl.glMultiTexCoord2f(GL_TEXTURE1, p.s2(i), p.t2(i));
@@ -827,7 +824,7 @@ public abstract class Surf extends Draw {
for ( p = surf.polys; p != null; p = p.chain )
{
gl.glBegin(GL_POLYGON);
- for (i=0 ; i< nv; i++)
+ for (int i=0 ; i< nv; i++)
{
gl.glMultiTexCoord2f(GL_TEXTURE0, p.s1(i) + scroll, p.t1(i));
gl.glMultiTexCoord2f(GL_TEXTURE1, p.s2(i), p.t2(i));
@@ -845,7 +842,7 @@ public abstract class Surf extends Draw {
for ( p = surf.polys; p != null; p = p.chain )
{
gl.glBegin (GL_POLYGON);
- for (i=0 ; i< nv; i++)
+ for (int i=0 ; i< nv; i++)
{
gl.glMultiTexCoord2f(GL_TEXTURE0, p.s1(i), p.t1(i));
gl.glMultiTexCoord2f(GL_TEXTURE1, p.s2(i), p.t2(i));
@@ -1387,7 +1384,6 @@ public abstract class Surf extends Draw {
boolean LM_AllocBlock (int w, int h, pos_t pos)
{
int x = pos.x;
- int y = pos.y;
int i, j;
int best, best2;
@@ -1407,7 +1403,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;
}
}
@@ -1427,10 +1423,9 @@ public abstract class Surf extends Draw {
*/
void GL_BuildPolygonFromSurface(msurface_t fa)
{
- int i, lindex, lnumverts;
+ int lindex, lnumverts;
medge_t[] pedges;
medge_t r_pedge;
- int vertpage;
float[] vec;
float s, t;
glpoly_t poly;
@@ -1439,8 +1434,6 @@ public abstract class Surf extends Draw {
// reconstruct the polygon
pedges = currentmodel.edges;
lnumverts = fa.numedges;
- vertpage = 0;
-
Math3D.VectorClear(total);
//
// draw texture
@@ -1452,7 +1445,7 @@ public abstract class Surf extends Draw {
poly.flags = fa.flags;
fa.polys = poly;
- for (i=0 ; i<lnumverts ; i++)
+ for (int i=0 ; i<lnumverts ; i++)
{
lindex = currentmodel.surfedges[fa.firstedge + i];
diff --git a/src/jake2/render/basic/Warp.java b/src/jake2/render/basic/Warp.java
index 16a1a0e..cd4ec59 100644
--- a/src/jake2/render/basic/Warp.java
+++ b/src/jake2/render/basic/Warp.java
@@ -2,7 +2,7 @@
* Warp.java
* Copyright (C) 2003
*
- * $Id: Warp.java,v 1.2 2006-11-21 00:50:46 cawe Exp $
+ * $Id: Warp.java,v 1.3 2007-02-27 14:37:25 cawe Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -350,8 +350,7 @@ public abstract class Warp extends Model {
float[] av = { 0, 0, 0 };
float s, t, dv;
int axis;
- float[] vp;
-
+
c_sky++;
// decide which face it maps to
Math3D.VectorCopy(Globals.vec3_origin, v);
diff --git a/src/jake2/sys/LWJGLKBD.java b/src/jake2/sys/LWJGLKBD.java
index 9373cba..8826360 100644
--- a/src/jake2/sys/LWJGLKBD.java
+++ b/src/jake2/sys/LWJGLKBD.java
@@ -17,8 +17,6 @@ public class LWJGLKBD extends KBD {
private char[] lwjglKeycodeMap = null;
private int pressed[] = null;
- private boolean mouseHasTwoButtons = false;
-
public void Init()
{
try
@@ -29,8 +27,6 @@ public class LWJGLKBD extends KBD {
if (lwjglKeycodeMap == null) lwjglKeycodeMap = new char[256];
if (pressed == null) pressed = new int[256];
- mouseHasTwoButtons = (Mouse.getButtonCount() == 2);
-
lastRepeat = Timer.Milliseconds();
} catch (Exception e) {;}
}
diff --git a/src/jake2/sys/Timer.java b/src/jake2/sys/Timer.java
index 683e6b6..e9796cc 100644
--- a/src/jake2/sys/Timer.java
+++ b/src/jake2/sys/Timer.java
@@ -1,8 +1,6 @@
/*
* Timer.java
* Copyright (C) 2005
- *
- * $Id: Timer.java,v 1.2 2005-07-01 14:20:54 hzi Exp $
*/
package jake2.sys;
@@ -13,8 +11,6 @@ import jake2.qcommon.Com;
public abstract class Timer {
abstract public long currentTimeMillis();
- private static long time = 0;
-
static Timer t;
static {
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 07:28:38 +0000