better string handling and error messages

3 files changed, 57 insertions, 53 deletions

diff --git a/src/jake2/render/fastjogl/Misc.java b/src/jake2/render/fastjogl/Misc.java
index 5fd7418..00d6839 100644
--- a/src/jake2/render/fastjogl/Misc.java
+++ b/src/jake2/render/fastjogl/Misc.java
@@ -2,7 +2,7 @@
  * Misc.java
  * Copyright (C) 2003
  *
- * $Id: Misc.java,v 1.5 2005-05-06 17:47:10 cawe Exp $
+ * $Id: Misc.java,v 1.6 2005-05-07 19:49:37 cawe Exp $
  */
 /*
 Copyright (C) 1997-2001 Id Software, Inc.
@@ -30,8 +30,7 @@ import jake2.client.VID;
 import jake2.qcommon.FS;
 import jake2.qcommon.xcommand_t;
 
-import java.io.File;
-import java.io.RandomAccessFile;
+import java.io.*;
 import java.nio.ByteBuffer;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
@@ -128,15 +127,18 @@ public abstract class Misc extends Mesh {
 	};
 	
 	private void screenshot_f() {
-	    FS.CreatePath(FS.Gamedir() + "/scrshot/jake00.tga");
-	    File file = new File(FS.Gamedir() + "/scrshot/jake00.tga");
+	    StringBuffer sb = new StringBuffer(FS.Gamedir() + "/scrshot/jake00.tga");
+	    FS.CreatePath(sb.toString());
+	    File file = new File(sb.toString());
 	    // find a valid file name
-	    int i = 0;
+	    int i = 0; int offset = sb.length() - 6;
 	    while (file.exists() && i++ < 100) {
-	        file = new File(FS.Gamedir() + "/scrshot/jake" + (i/10) + (i%10) + ".tga");
+	        sb.setCharAt(offset, (char) ((i/10) + '0'));
+	        sb.setCharAt(offset + 1, (char) ((i%10) + '0'));
+	        file = new File(sb.toString());
         }
 	    if (i == 100) {
-		    VID.Printf(Defines.PRINT_ALL, "Couldn't create a new screenshot file\n");
+		    VID.Printf(Defines.PRINT_ALL, "Clean up your screenshots\n");
 		    return;
 	    }
 	    
@@ -165,12 +167,12 @@ public abstract class Misc extends Mesh {
 	        // OpenGL 1.2+ supports the GL_BGR color format
 	        // check the GL_VERSION to use the TARGA BGR order if possible
 	        // e.g.: 1.5.2 NVIDIA 66.29
-	        int colorFormat = (gl_config.version_string.charAt(2) > '1') ? GL.GL_BGR : GL.GL_RGB;
-	        // read the BGR/RGB values into the image buffer
-	        gl.glReadPixels(0, 0, vid.width, vid.height, colorFormat,
-	                GL.GL_UNSIGNED_BYTE, rgb);
-	        
-	        if (colorFormat == GL.GL_RGB) {
+	        if (gl_config.getOpenGLVersion() >= 1.2f) {
+	            // read the BGR values into the image buffer
+	            gl.glReadPixels(0, 0, vid.width, vid.height, GL.GL_BGR, GL.GL_UNSIGNED_BYTE, rgb);
+	        } else {
+	            // read the RGB values into the image buffer
+	            gl.glReadPixels(0, 0, vid.width, vid.height, GL.GL_RGB, GL.GL_UNSIGNED_BYTE, rgb);
 		        // flip RGB to BGR
 		        byte tmp;
 		        for (i = TGA_HEADER_SIZE; i < fileLength; i += 3) {
@@ -181,9 +183,8 @@ public abstract class Misc extends Mesh {
 	        }
 	        // close the file channel
 	        ch.close();
-	    } catch (Exception e) {
-	        // TODO Auto-generated catch block
-	        e.printStackTrace();
+	    } catch (IOException e) {
+		    VID.Printf(Defines.PRINT_ALL, e.getMessage() + '\n');
 	    }
 
 	    VID.Printf(Defines.PRINT_ALL, "Wrote " + file + '\n');
diff --git a/src/jake2/render/jogl/Misc.java b/src/jake2/render/jogl/Misc.java
index da3bb0d..147eb10 100644
--- a/src/jake2/render/jogl/Misc.java
+++ b/src/jake2/render/jogl/Misc.java
@@ -2,7 +2,7 @@
  * Misc.java
  * Copyright (C) 2003
  *
- * $Id: Misc.java,v 1.5 2005-05-06 17:47:09 cawe Exp $
+ * $Id: Misc.java,v 1.6 2005-05-07 19:49:37 cawe Exp $
  */
 /*
 Copyright (C) 1997-2001 Id Software, Inc.
@@ -30,8 +30,7 @@ import jake2.client.VID;
 import jake2.qcommon.FS;
 import jake2.qcommon.xcommand_t;
 
-import java.io.File;
-import java.io.RandomAccessFile;
+import java.io.*;
 import java.nio.ByteBuffer;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
@@ -140,15 +139,18 @@ public abstract class Misc extends Mesh {
 	};
 	
 	private void screenshot_f() {
-	    FS.CreatePath(FS.Gamedir() + "/scrshot/jake00.tga");
-	    File file = new File(FS.Gamedir() + "/scrshot/jake00.tga");
+	    StringBuffer sb = new StringBuffer(FS.Gamedir() + "/scrshot/jake00.tga");
+	    FS.CreatePath(sb.toString());
+	    File file = new File(sb.toString());
 	    // find a valid file name
-	    int i = 0;
+	    int i = 0; int offset = sb.length() - 6;
 	    while (file.exists() && i++ < 100) {
-	        file = new File(FS.Gamedir() + "/scrshot/jake" + (i/10) + (i%10) + ".tga");
+	        sb.setCharAt(offset, (char) ((i/10) + '0'));
+	        sb.setCharAt(offset + 1, (char) ((i%10) + '0'));
+	        file = new File(sb.toString());
         }
 	    if (i == 100) {
-		    VID.Printf(Defines.PRINT_ALL, "Couldn't create a new screenshot file\n");
+		    VID.Printf(Defines.PRINT_ALL, "Clean up your screenshots\n");
 		    return;
 	    }
 	    
@@ -177,12 +179,12 @@ public abstract class Misc extends Mesh {
 	        // OpenGL 1.2+ supports the GL_BGR color format
 	        // check the GL_VERSION to use the TARGA BGR order if possible
 	        // e.g.: 1.5.2 NVIDIA 66.29
-	        int colorFormat = (gl_config.version_string.charAt(2) > '1') ? GL.GL_BGR : GL.GL_RGB;
-	        // read the BGR/RGB values into the image buffer
-	        gl.glReadPixels(0, 0, vid.width, vid.height, colorFormat,
-	                GL.GL_UNSIGNED_BYTE, rgb);
-	        
-	        if (colorFormat == GL.GL_RGB) {
+	        if (gl_config.getOpenGLVersion() >= 1.2f) {
+	            // read the BGR values into the image buffer
+	            gl.glReadPixels(0, 0, vid.width, vid.height, GL.GL_BGR, GL.GL_UNSIGNED_BYTE, rgb);
+	        } else {
+	            // read the RGB values into the image buffer
+	            gl.glReadPixels(0, 0, vid.width, vid.height, GL.GL_RGB, GL.GL_UNSIGNED_BYTE, rgb);
 		        // flip RGB to BGR
 		        byte tmp;
 		        for (i = TGA_HEADER_SIZE; i < fileLength; i += 3) {
@@ -193,9 +195,8 @@ public abstract class Misc extends Mesh {
 	        }
 	        // close the file channel
 	        ch.close();
-	    } catch (Exception e) {
-	        // TODO Auto-generated catch block
-	        e.printStackTrace();
+	    } catch (IOException e) {
+		    VID.Printf(Defines.PRINT_ALL, e.getMessage() + '\n');
 	    }
 
 	    VID.Printf(Defines.PRINT_ALL, "Wrote " + file + '\n');
diff --git a/src/jake2/render/lwjgl/Misc.java b/src/jake2/render/lwjgl/Misc.java
index 2d52345..c06cc6e 100644
--- a/src/jake2/render/lwjgl/Misc.java
+++ b/src/jake2/render/lwjgl/Misc.java
@@ -2,7 +2,7 @@
  * Misc.java
  * Copyright (C) 2003
  *
- * $Id: Misc.java,v 1.6 2005-05-06 23:22:04 cawe Exp $
+ * $Id: Misc.java,v 1.7 2005-05-07 19:49:38 cawe Exp $
  */
 /*
 Copyright (C) 1997-2001 Id Software, Inc.
@@ -29,12 +29,13 @@ import jake2.Defines;
 import jake2.client.VID;
 import jake2.qcommon.FS;
 
-import java.io.File;
-import java.io.RandomAccessFile;
+import java.io.*;
 import java.nio.FloatBuffer;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
 
+import net.java.games.jogl.GL;
+
 import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.*;
 
@@ -122,17 +123,19 @@ public abstract class Misc extends Mesh {
 	GL_ScreenShot_f
 	================== 
 	*/  
-	void GL_ScreenShot_f() 
-	{
-	    FS.CreatePath(FS.Gamedir() + "/scrshot/jake00.tga");
-	    File file = new File(FS.Gamedir() + "/scrshot/jake00.tga");
+	void GL_ScreenShot_f() {
+	    StringBuffer sb = new StringBuffer(FS.Gamedir() + "/scrshot/jake00.tga");
+	    FS.CreatePath(sb.toString());
+	    File file = new File(sb.toString());
 	    // find a valid file name
-	    int i = 0;
+	    int i = 0; int offset = sb.length() - 6;
 	    while (file.exists() && i++ < 100) {
-	        file = new File(FS.Gamedir() + "/scrshot/jake" + (i/10) + (i%10) + ".tga");
+	        sb.setCharAt(offset, (char) ((i/10) + '0'));
+	        sb.setCharAt(offset + 1, (char) ((i%10) + '0'));
+	        file = new File(sb.toString());
         }
 	    if (i == 100) {
-		    VID.Printf(Defines.PRINT_ALL, "Couldn't create a new screenshot file\n");
+		    VID.Printf(Defines.PRINT_ALL, "Clean up your screenshots\n");
 		    return;
 	    }
 	    
@@ -159,12 +162,12 @@ public abstract class Misc extends Mesh {
 	        // OpenGL 1.2+ supports the GL_BGR color format
 	        // check the GL_VERSION to use the TARGA BGR order if possible
 	        // e.g.: 1.5.2 NVIDIA 66.29
-	        int colorFormat = (gl_config.version_string.charAt(2) > '1') ? GL12.GL_BGR : GL11.GL_RGB;
-	        // read the BGR/RGB values into the image buffer
-	        gl.glReadPixels(0, 0, vid.width, vid.height, colorFormat,
-	                GL11.GL_UNSIGNED_BYTE, image);
-	        
-	        if (colorFormat == GL11.GL_RGB) {
+	        if (gl_config.getOpenGLVersion() >= 1.2f) {
+	            // read the BGR values into the image buffer
+	            gl.glReadPixels(0, 0, vid.width, vid.height, GL12.GL_BGR, GL.GL_UNSIGNED_BYTE, image);
+	        } else {
+	            // read the RGB values into the image buffer
+	            gl.glReadPixels(0, 0, vid.width, vid.height, GL11.GL_RGB, GL.GL_UNSIGNED_BYTE, image);
 		        // flip RGB to BGR
 		        byte tmp;
 		        for (i = TGA_HEADER_SIZE; i < fileLength; i += 3) {
@@ -175,9 +178,8 @@ public abstract class Misc extends Mesh {
 	        }
 	        // close the file channel
 	        ch.close();
-	    } catch (Exception e) {
-	        // TODO Auto-generated catch block
-	        e.printStackTrace();
+	    } catch (IOException e) {
+	        VID.Printf(Defines.PRINT_ALL, e.getMessage() + '\n');
 	    }
 
 	    VID.Printf(Defines.PRINT_ALL, "Wrote " + file + '\n');