refimport_t deleted

2 files changed, 7 insertions, 151 deletions

diff --git a/src/jake2/client/VID.java b/src/jake2/client/VID.java
index 6ef8f1c..59c9252 100644
--- a/src/jake2/client/VID.java
+++ b/src/jake2/client/VID.java
@@ -2,7 +2,7 @@
  * VID.java
  * Copyright (C) 2003
  *
- * $Id: VID.java,v 1.7 2004-07-15 16:16:24 hzi Exp $
+ * $Id: VID.java,v 1.8 2004-07-16 10:11:36 cawe Exp $
  */
 /*
 Copyright (C) 1997-2001 Id Software, Inc.
@@ -31,7 +31,7 @@ import jake2.game.Cmd;
 import jake2.game.cvar_t;
 import jake2.qcommon.*;
 import jake2.render.Renderer;
-import jake2.sound.*;
+import jake2.sound.S;
 import jake2.sys.IN;
 import jake2.sys.KBD;
 import jake2.util.Vargs;
@@ -78,6 +78,10 @@ public class VID extends Globals {
 	==========================================================================
 	*/
 
+	public static void Printf(int print_level, String fmt) {
+		Printf(print_level, fmt, null);	
+	}
+
 	public static void Printf(int print_level, String fmt, Vargs vargs) {
 		// static qboolean inupdate;
 		if (print_level == Defines.PRINT_ALL)
@@ -188,85 +192,7 @@ public class VID extends Globals {
 		}
 
 		Com.Printf( "LoadLibrary(\"" + name +"\")\n" );
-		refimport_t ri = new refimport_t() {
-			public void Sys_Error(int err_level, String str) {
-				Com.Error(err_level, str, null);
-			}
-
-			public void Sys_Error(int err_level, String str, Vargs vargs) {
-				Com.Error(err_level, str, vargs);
-			}
-
-			public void Cmd_AddCommand(String name, xcommand_t cmd) {
-				Cmd.AddCommand(name, cmd);
-			}
-
-			public void Cmd_RemoveCommand(String name) {
-				Cmd.RemoveCommand(name);
-			}
-
-			public int Cmd_Argc() {
-				return Cmd.Argc();
-			}
-
-			public String Cmd_Argv(int i) {
-				return Cmd.Argv(i);
-			}
-
-			public void Cmd_ExecuteText(int exec_when, String text) {
-				Cbuf.ExecuteText(exec_when, text);
-			}
-
-			public void Con_Printf(int print_level, String str) {
-				VID.Printf(print_level, str, null);
-			}
-
-			public void Con_Printf(int print_level, String str, Vargs vargs) {
-				VID.Printf(print_level, str, vargs);
-			}
-
-			public byte[] FS_LoadFile(String name) {
-				return FS.LoadFile(name);
-			}
-
-			public int FS_FileLength(String name) {
-				return FS.FileLength(name);
-			}
-
-			public void FS_FreeFile(byte[] buf) {
-				FS.FreeFile(buf);
-			}
-
-			public String FS_Gamedir() {
-				return FS.Gamedir();
-			}
-
-			public cvar_t Cvar_Get(String name, String value, int flags) {
-				return Cvar.Get(name, value, flags);
-			}
-
-			public cvar_t Cvar_Set(String name, String value) {
-				return Cvar.Set(name, value);
-			}
-
-			public void Cvar_SetValue(String name, float value) {
-				Cvar.SetValue(name, value);
-			}
-
-			public boolean Vid_GetModeInfo(Dimension dim, int mode) {
-				return VID.GetModeInfo(dim, mode);
-			}
-
-			public void Vid_MenuInit() {
-				VID.MenuInit();
-			}
-
-			public void Vid_NewWindow(int width, int height) {
-				VID.NewWindow(width, height);
-			}
-		};
-
-		Globals.re = Renderer.getDriver( name, ri );
+		Globals.re = Renderer.getDriver(name);
 		
 		if (Globals.re == null)
 		{
diff --git a/src/jake2/client/refimport_t.java b/src/jake2/client/refimport_t.java
deleted file mode 100644
index 849b143..0000000
--- a/src/jake2/client/refimport_t.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-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.
-
-*/
-
-// Created on 20.11.2003 by RST.
-// $Id: refimport_t.java,v 1.2 2004-07-08 20:24:29 hzi Exp $
-
-
-package jake2.client;
-
-import java.awt.Dimension;
-
-import jake2.game.*;
-import jake2.qcommon.xcommand_t;
-import jake2.util.Vargs;
-
-public interface refimport_t {
-	// ref.h 
-	// these are the functions imported by the refresh module
-	//
-	void Sys_Error(int err_level, String str);
-	void Sys_Error(int err_level, String str, Vargs vargs);
-
-	void Cmd_AddCommand(String name, xcommand_t cmd);
-	void Cmd_RemoveCommand(String name);
-	int Cmd_Argc();
-	String Cmd_Argv(int i);
-	void Cmd_ExecuteText(int exec_when, String text);
-
-	void Con_Printf(int print_level, String str, Vargs vargs);
-
-	void Con_Printf(int print_level, String str);
-
-	// files will be memory mapped read only
-	// the returned buffer may be part of a larger pak file,
-	// or a discrete file from anywhere in the quake search path
-	// a -1 return means the file does not exist
-	// NULL can be passed for buf to just determine existance
-	byte[] FS_LoadFile(String name);
-	int FS_FileLength(String name);
-	
-	void FS_FreeFile(byte[] buf);
-	// gamedir will be the current directory that generated
-	// files should be stored to, ie: "f:\quake\id1"
-	String FS_Gamedir();
-
-	cvar_t Cvar_Get(String name, String value, int flags);
-	cvar_t Cvar_Set(String name, String value);
-	void Cvar_SetValue(String name, float value);
-
-	boolean Vid_GetModeInfo(Dimension dim /* int *w,  *h */, int mode);
-	void Vid_MenuInit();
-	void Vid_NewWindow(int width, int height);
-}
\ No newline at end of file