Voomra/lwjake2
0
Fork 0
Code Activity

Merge branch 'dev-baseq2' into dev

Browse Source 
# Conflicts:
#	src/lwjake2/client/Console.java
#	src/lwjake2/client/V.java
This commit is contained in:
DmitriyMX
2018-03-07 02:49:41 +03:00
parent e9c4005263 da2268653e
commit 8d9401874f
26 changed files with 348 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -6,6 +6,7 @@ apply plugin: 'java'
apply plugin: 'application' apply plugin: 'application'
apply plugin: 'idea' apply plugin: 'idea'
apply plugin: 'eclipse' apply plugin: 'eclipse'
apply plugin: 'findbugs'
repositories { repositories {
mavenCentral() mavenCentral()
@@ -34,6 +35,7 @@ dependencies {
compileOnly 'org.projectlombok:lombok:1.16.20' compileOnly 'org.projectlombok:lombok:1.16.20'
apt "org.projectlombok:lombok:1.16.20" apt "org.projectlombok:lombok:1.16.20"
compileOnly 'com.google.code.findbugs:annotations:3.0.1'
} }
sourceSets { sourceSets {

19
src/lwjake2/client/CL.java
View File

@@ -30,7 +30,8 @@ import lwjake2.qcommon.CM;
import lwjake2.qcommon.Cbuf; import lwjake2.qcommon.Cbuf;
import lwjake2.qcommon.Com; import lwjake2.qcommon.Com;
import lwjake2.qcommon.Cvar; import lwjake2.qcommon.Cvar;
import lwjake2.qcommon.FS; import lwjake2.qcommon.FileSystem;
import lwjake2.qcommon.BaseQ2FileSystem;
import lwjake2.qcommon.MSG; import lwjake2.qcommon.MSG;
import lwjake2.qcommon.Netchan; import lwjake2.qcommon.Netchan;
import lwjake2.qcommon.SZ; import lwjake2.qcommon.SZ;
@@ -56,6 +57,8 @@ import java.nio.ByteOrder;
*/ */
@Slf4j @Slf4j
public final class CL { public final class CL {
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
static int precache_check; // for autodownload of precache items static int precache_check; // for autodownload of precache items
static int precache_spawncount; static int precache_spawncount;
@@ -159,10 +162,10 @@ public final class CL {
// //
// open the demo file // open the demo file
// //
name = FS.Gamedir() + "/demos/" + Cmd.Argv(1) + ".dm2"; name = fileSystem.getGamedir() + "/demos/" + Cmd.Argv(1) + ".dm2";
log.info("recording to {}", name); log.info("recording to {}", name);
FS.CreatePath(name); fileSystem.createPath(name);
Globals.cls.demofile = new RandomAccessFile(name, "rw"); Globals.cls.demofile = new RandomAccessFile(name, "rw");
if (Globals.cls.demofile == null) { if (Globals.cls.demofile == null) {
log.error("ERROR: couldn't open."); log.error("ERROR: couldn't open.");
@@ -973,8 +976,7 @@ public final class CL {
// checking for skins in the model // checking for skins in the model
if (CL.precache_model == null) { if (CL.precache_model == null) {
CL.precache_model = FS CL.precache_model = fileSystem.loadFile(Globals.cl.configstrings[CL.precache_check]);
.LoadFile(Globals.cl.configstrings[CL.precache_check]);
if (CL.precache_model == null) { if (CL.precache_model == null) {
CL.precache_model_skin = 0; CL.precache_model_skin = 0;
CL.precache_check++; CL.precache_check++;
@@ -986,8 +988,6 @@ public final class CL {
int header = bb.getInt(); int header = bb.getInt();
if (header != qfiles.IDALIASHEADER) { if (header != qfiles.IDALIASHEADER) {
// not an alias model
FS.FreeFile(CL.precache_model);
CL.precache_model = null; CL.precache_model = null;
CL.precache_model_skin = 0; CL.precache_model_skin = 0;
CL.precache_check++; CL.precache_check++;
@@ -1025,7 +1025,6 @@ public final class CL {
CL.precache_model_skin++; CL.precache_model_skin++;
} }
if (CL.precache_model != null) { if (CL.precache_model != null) {
FS.FreeFile(CL.precache_model);
CL.precache_model = null; CL.precache_model = null;
} }
CL.precache_model_skin = 0; CL.precache_model_skin = 0;
@@ -1408,7 +1407,7 @@ public final class CL {
// if (Globals.cls.state == Defines.ca_uninitialized) // if (Globals.cls.state == Defines.ca_uninitialized)
// return; // return;
path = FS.Gamedir() + "/config.cfg"; path = fileSystem.getGamedir() + "/config.cfg";
f = Lib.fopen(path, "rw"); f = Lib.fopen(path, "rw");
if (f == null) { if (f == null) {
log.warn("Couldn't write config.cfg."); log.warn("Couldn't write config.cfg.");
@@ -1609,7 +1608,7 @@ public final class CL {
InitLocal(); InitLocal();
IN.Init(); IN.Init();
FS.ExecAutoexec(); fileSystem.execAutoexec();
Cbuf.Execute(); Cbuf.Execute();
} }

8
src/lwjake2/client/CL_ents.java
View File

@@ -24,7 +24,8 @@ import lwjake2.game.entity_state_t;
import lwjake2.game.player_state_t; import lwjake2.game.player_state_t;
import lwjake2.game.pmove_t; import lwjake2.game.pmove_t;
import lwjake2.qcommon.Com; import lwjake2.qcommon.Com;
import lwjake2.qcommon.FS; import lwjake2.qcommon.FileSystem;
import lwjake2.qcommon.BaseQ2FileSystem;
import lwjake2.qcommon.MSG; import lwjake2.qcommon.MSG;
import lwjake2.util.Math3D; import lwjake2.util.Math3D;
@@ -40,6 +41,7 @@ import lwjake2.util.Math3D;
* ========================================================================= * =========================================================================
*/ */
public class CL_ents { public class CL_ents {
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
static int bitcounts[] = new int[32]; /// just for protocol profiling static int bitcounts[] = new int[32]; /// just for protocol profiling
@@ -815,7 +817,7 @@ public class CL_ents {
* *
*/ */
if ((renderfx & Defines.RF_SHELL_HALF_DAM) != 0) { if ((renderfx & Defines.RF_SHELL_HALF_DAM) != 0) {
if (FS.Developer_searchpath(2) == 2) { if (fileSystem.developer_searchpath(2) == 2) {
// ditch the half damage shell if any of red, blue, or // ditch the half damage shell if any of red, blue, or
// double are on // double are on
if ((renderfx & (Defines.RF_SHELL_RED | Defines.RF_SHELL_BLUE | Defines.RF_SHELL_DOUBLE)) != 0) if ((renderfx & (Defines.RF_SHELL_RED | Defines.RF_SHELL_BLUE | Defines.RF_SHELL_DOUBLE)) != 0)
@@ -824,7 +826,7 @@ public class CL_ents {
} }
if ((renderfx & Defines.RF_SHELL_DOUBLE) != 0) { if ((renderfx & Defines.RF_SHELL_DOUBLE) != 0) {
if (FS.Developer_searchpath(2) == 2) { if (fileSystem.developer_searchpath(2) == 2) {
// lose the yellow shell if we have a red, blue, or // lose the yellow shell if we have a red, blue, or
// green shell // green shell
if ((renderfx & (Defines.RF_SHELL_RED | Defines.RF_SHELL_BLUE | Defines.RF_SHELL_GREEN)) != 0) if ((renderfx & (Defines.RF_SHELL_RED | Defines.RF_SHELL_BLUE | Defines.RF_SHELL_GREEN)) != 0)

19
src/lwjake2/client/CL_parse.java
View File

@@ -27,7 +27,8 @@ import lwjake2.qcommon.CM;
import lwjake2.qcommon.Cbuf; import lwjake2.qcommon.Cbuf;
import lwjake2.qcommon.Com; import lwjake2.qcommon.Com;
import lwjake2.qcommon.Cvar; import lwjake2.qcommon.Cvar;
import lwjake2.qcommon.FS; import lwjake2.qcommon.FileSystem;
import lwjake2.qcommon.BaseQ2FileSystem;
import lwjake2.qcommon.MSG; import lwjake2.qcommon.MSG;
import lwjake2.qcommon.SZ; import lwjake2.qcommon.SZ;
import lwjake2.render.model_t; import lwjake2.render.model_t;
@@ -43,6 +44,8 @@ import java.io.RandomAccessFile;
*/ */
@Slf4j @Slf4j
public class CL_parse { public class CL_parse {
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
//// cl_parse.c -- parse a message received from the server //// cl_parse.c -- parse a message received from the server
public static String svc_strings[] = { "svc_bad", "svc_muzzleflash", public static String svc_strings[] = { "svc_bad", "svc_muzzleflash",
@@ -56,7 +59,7 @@ public class CL_parse {
// ============================================================================= // =============================================================================
public static String DownloadFileName(String fn) { public static String DownloadFileName(String fn) {
return FS.Gamedir() + "/" + fn; return fileSystem.getGamedir() + "/" + fn;
} }
/* /*
@@ -74,7 +77,7 @@ public class CL_parse {
return true; return true;
} }
if (FS.FileLength(filename) > 0) { // it exists, no need to download if (fileSystem.fileLength(filename) > 0) { // it exists, no need to download
return true; return true;
} }
@@ -147,7 +150,7 @@ public class CL_parse {
return; return;
} }
if (FS.LoadFile(filename) != null) { // it exists, no need to if (fileSystem.loadFile(filename) != null) { // it exists, no need to
// download // download
Com.Printf("File already exists.\n"); Com.Printf("File already exists.\n");
return; return;
@@ -221,7 +224,7 @@ public class CL_parse {
if (Globals.cls.download == null) { if (Globals.cls.download == null) {
String name = DownloadFileName(Globals.cls.downloadtempname).toLowerCase(); String name = DownloadFileName(Globals.cls.downloadtempname).toLowerCase();
FS.CreatePath(name); fileSystem.createPath(name);
Globals.cls.download = Lib.fopen(name, "rw"); Globals.cls.download = Lib.fopen(name, "rw");
if (Globals.cls.download == null) { if (Globals.cls.download == null) {
@@ -320,10 +323,10 @@ public class CL_parse {
// set gamedir // set gamedir
if (str.length() > 0 if (str.length() > 0
&& (FS.fs_gamedirvar.string == null && (fileSystem.getGamedirVar().string == null
|| FS.fs_gamedirvar.string.length() == 0 || FS.fs_gamedirvar.string || fileSystem.getGamedirVar().string.length() == 0 || fileSystem.getGamedirVar().string
.equals(str)) .equals(str))
|| (str.length() == 0 && (FS.fs_gamedirvar.string != null || FS.fs_gamedirvar.string || (str.length() == 0 && (fileSystem.getGamedirVar().string != null || fileSystem.getGamedirVar().string
.length() == 0))) .length() == 0)))
Cvar.Set("game", str); Cvar.Set("game", str);

8
src/lwjake2/client/Console.java
View File

@@ -25,7 +25,8 @@ import lwjake2.game.Cmd;
import lwjake2.qcommon.Cbuf; import lwjake2.qcommon.Cbuf;
import lwjake2.qcommon.Com; import lwjake2.qcommon.Com;
import lwjake2.qcommon.Cvar; import lwjake2.qcommon.Cvar;
import lwjake2.qcommon.FS; import lwjake2.qcommon.FileSystem;
import lwjake2.qcommon.BaseQ2FileSystem;
import lwjake2.util.Lib; import lwjake2.util.Lib;
import lwjake2.util.Vargs; import lwjake2.util.Vargs;
@@ -38,6 +39,7 @@ import java.util.Arrays;
*/ */
@Slf4j @Slf4j
public final class Console extends Globals { public final class Console extends Globals {
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
public static Runnable ToggleConsole_f = new Runnable() { public static Runnable ToggleConsole_f = new Runnable() {
public void run() { public void run() {
SCR.EndLoadingPlaque(); // get rid of loading plaque SCR.EndLoadingPlaque(); // get rid of loading plaque
@@ -93,10 +95,10 @@ public final class Console extends Globals {
//Com_sprintf (name, sizeof(name), "%s/%s.txt", FS_Gamedir(), //Com_sprintf (name, sizeof(name), "%s/%s.txt", FS_Gamedir(),
// Cmd_Argv(1)); // Cmd_Argv(1));
name = FS.Gamedir() + "/" + Cmd.Argv(1) + ".txt"; name = fileSystem.getGamedir() + "/" + Cmd.Argv(1) + ".txt";
log.info("Dumped console text to {}", name); log.info("Dumped console text to {}", name);
FS.CreatePath(name); fileSystem.createPath(name);
f = Lib.fopen(name, "rw"); f = Lib.fopen(name, "rw");
if (f == null) { if (f == null) {
log.error("ERROR: couldn't open."); log.error("ERROR: couldn't open.");

42
src/lwjake2/client/Menu.java
View File

@@ -24,7 +24,8 @@ import lwjake2.game.cvar_t;
import lwjake2.qcommon.Cbuf; import lwjake2.qcommon.Cbuf;
import lwjake2.qcommon.Com; import lwjake2.qcommon.Com;
import lwjake2.qcommon.Cvar; import lwjake2.qcommon.Cvar;
import lwjake2.qcommon.FS; import lwjake2.qcommon.FileSystem;
import lwjake2.qcommon.BaseQ2FileSystem;
import lwjake2.qcommon.netadr_t; import lwjake2.qcommon.netadr_t;
import lwjake2.sound.S; import lwjake2.sound.S;
import lwjake2.sys.NET; import lwjake2.sys.NET;
@@ -33,6 +34,8 @@ import lwjake2.sys.Timer;
import lwjake2.util.Lib; import lwjake2.util.Lib;
import lwjake2.util.Math3D; import lwjake2.util.Math3D;
import lwjake2.util.QuakeFile; import lwjake2.util.QuakeFile;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.awt.Dimension; import java.awt.Dimension;
import java.io.RandomAccessFile; import java.io.RandomAccessFile;
@@ -50,6 +53,8 @@ abstract class keyfunc_t {
} }
public final class Menu extends Key { public final class Menu extends Key {
private static final Logger logger = LoggerFactory.getLogger(Menu.class);
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
static int m_main_cursor; static int m_main_cursor;
@@ -1885,9 +1890,6 @@ public final class Menu extends Key {
public static String Credits_Key(int key) { public static String Credits_Key(int key) {
switch (key) { switch (key) {
case K_ESCAPE: case K_ESCAPE:
if (creditsBuffer != null)
//FS.FreeFile(creditsBuffer);
;
PopMenu(); PopMenu();
break; break;
} }
@@ -1906,7 +1908,7 @@ public final class Menu extends Key {
int n; int n;
int isdeveloper = 0; int isdeveloper = 0;
byte b[] = FS.LoadFile("credits"); byte b[] = fileSystem.loadFile("credits");
if (b != null) { if (b != null) {
creditsBuffer = new String(b); creditsBuffer = new String(b);
@@ -1919,7 +1921,7 @@ public final class Menu extends Key {
creditsIndex[n] = null; creditsIndex[n] = null;
credits = creditsIndex; credits = creditsIndex;
} else { } else {
isdeveloper = FS.Developer_searchpath(1); isdeveloper = fileSystem.developer_searchpath(1);
if (isdeveloper == 1) // xatrix if (isdeveloper == 1) // xatrix
credits = xatcredits; credits = xatcredits;
@@ -2167,7 +2169,7 @@ public final class Menu extends Key {
for (i = 0; i < MAX_SAVEGAMES; i++) { for (i = 0; i < MAX_SAVEGAMES; i++) {
m_savestrings[i] = "<EMPTY>"; m_savestrings[i] = "<EMPTY>";
name = FS.Gamedir() + "/save/save" + i + "/server.ssv"; name = fileSystem.getGamedir() + "/save/save" + i + "/server.ssv";
try { try {
f = new QuakeFile(name, "r"); f = new QuakeFile(name, "r");
@@ -2589,7 +2591,7 @@ public final class Menu extends Key {
// ===== // =====
// PGM // PGM
// ROGUE GAMES // ROGUE GAMES
else if (FS.Developer_searchpath(2) == 2) { else if (fileSystem.developer_searchpath(2) == 2) {
if (s_rules_box.curvalue == 2) // tag if (s_rules_box.curvalue == 2) // tag
{ {
s_maxclients_field.statusbar = null; s_maxclients_field.statusbar = null;
@@ -2635,7 +2637,7 @@ public final class Menu extends Key {
// Cvar.SetValue ("coop", s_rules_box.curvalue ); // Cvar.SetValue ("coop", s_rules_box.curvalue );
// PGM // PGM
if ((s_rules_box.curvalue < 2) || (FS.Developer_searchpath(2) != 2)) { if ((s_rules_box.curvalue < 2) || (fileSystem.developer_searchpath(2) != 2)) {
Cvar.SetValue("deathmatch", 1 - (int) (s_rules_box.curvalue)); Cvar.SetValue("deathmatch", 1 - (int) (s_rules_box.curvalue));
Cvar.SetValue("coop", s_rules_box.curvalue); Cvar.SetValue("coop", s_rules_box.curvalue);
Cvar.SetValue("gamerules", 0); Cvar.SetValue("gamerules", 0);
@@ -2699,15 +2701,15 @@ public final class Menu extends Key {
/* /*
* * load the list of map names * * load the list of map names
*/ */
mapsname = FS.Gamedir() + "/maps.lst"; mapsname = fileSystem.getGamedir() + "/maps.lst";
// Check user dir first (default ~/.lwjake2) // Check user dir first (default ~/.lwjake2)
if ((fp = Lib.fopen(mapsname, "r")) == null) { if ((fp = Lib.fopen(mapsname, "r")) == null) {
// Check base dir first (baseq2 folder) // Check base dir first (baseq2 folder)
mapsname = FS.BaseGamedir() + "/maps.lst"; mapsname = fileSystem.getBaseGamedir() + "/maps.lst";
if ((fp = Lib.fopen(mapsname, "r")) == null) { if ((fp = Lib.fopen(mapsname, "r")) == null) {
// Open the pak's maplist // Open the pak's maplist
buffer = FS.LoadFile("maps.lst"); buffer = fileSystem.loadFile("maps.lst");
if (buffer == null) if (buffer == null)
Com.Error(ERR_DROP, "couldn't find maps.lst\n"); Com.Error(ERR_DROP, "couldn't find maps.lst\n");
} else { } else {
@@ -2755,7 +2757,7 @@ public final class Menu extends Key {
fp = null; fp = null;
} else { } else {
FS.FreeFile(buffer); buffer = null;
} }
/* /*
@@ -2776,7 +2778,7 @@ public final class Menu extends Key {
s_rules_box.name = "rules"; s_rules_box.name = "rules";
// PGM - rogue games only available with rogue DLL. // PGM - rogue games only available with rogue DLL.
if (FS.Developer_searchpath(2) == 2) if (fileSystem.developer_searchpath(2) == 2)
s_rules_box.itemnames = dm_coop_names_rogue; s_rules_box.itemnames = dm_coop_names_rogue;
else else
s_rules_box.itemnames = dm_coop_names; s_rules_box.itemnames = dm_coop_names;
@@ -3059,7 +3061,7 @@ public final class Menu extends Key {
// ======= // =======
// ROGUE // ROGUE
else if (FS.Developer_searchpath(2) == 2) { else if (fileSystem.developer_searchpath(2) == 2) {
if (f == s_no_mines_box) { if (f == s_no_mines_box) {
bit = DF_NO_MINES; bit = DF_NO_MINES;
} else if (f == s_no_nukes_box) { } else if (f == s_no_nukes_box) {
@@ -3283,7 +3285,7 @@ public final class Menu extends Key {
// ============ // ============
// ROGUE // ROGUE
if (FS.Developer_searchpath(2) == 2) { if (fileSystem.developer_searchpath(2) == 2) {
s_no_mines_box.type = MTYPE_SPINCONTROL; s_no_mines_box.type = MTYPE_SPINCONTROL;
s_no_mines_box.x = 0; s_no_mines_box.x = 0;
s_no_mines_box.y = y += 10; s_no_mines_box.y = y += 10;
@@ -3354,7 +3356,7 @@ public final class Menu extends Key {
// ======= // =======
// ROGUE // ROGUE
if (FS.Developer_searchpath(2) == 2) { if (fileSystem.developer_searchpath(2) == 2) {
Menu_AddItem(s_dmoptions_menu, s_no_mines_box); Menu_AddItem(s_dmoptions_menu, s_no_mines_box);
Menu_AddItem(s_dmoptions_menu, s_no_nukes_box); Menu_AddItem(s_dmoptions_menu, s_no_nukes_box);
Menu_AddItem(s_dmoptions_menu, s_stack_double_box); Menu_AddItem(s_dmoptions_menu, s_stack_double_box);
@@ -3764,10 +3766,10 @@ public final class Menu extends Key {
* * get a list of directories * * get a list of directories
*/ */
do { do {
path = FS.NextPath(path); path = fileSystem.nextPath(path);
findname = path + "/players/*.*"; findname = path + "/players/*.*";
if ((dirnames = FS.ListFiles(findname, 0, SFF_SUBDIR)) != null) { if ((dirnames = fileSystem.listFiles(findname, 0, SFF_SUBDIR)) != null) {
ndirs = dirnames.length; ndirs = dirnames.length;
break; break;
} }
@@ -3807,7 +3809,7 @@ public final class Menu extends Key {
// verify the existence of at least one pcx skin // verify the existence of at least one pcx skin
scratch = dirnames[i] + "/*.pcx"; scratch = dirnames[i] + "/*.pcx";
pcxnames = FS.ListFiles(scratch, 0, 0); pcxnames = fileSystem.listFiles(scratch, 0, 0);
npcxfiles = pcxnames.length; npcxfiles = pcxnames.length;
// count valid skins, which consist of a skin with a matching "_i" // count valid skins, which consist of a skin with a matching "_i"

12
src/lwjake2/client/SCR.java
View File

@@ -23,12 +23,7 @@ import lwjake2.Defines;
import lwjake2.Globals; import lwjake2.Globals;
import lwjake2.game.Cmd; import lwjake2.game.Cmd;
import lwjake2.game.cvar_t; import lwjake2.game.cvar_t;
import lwjake2.qcommon.Com; import lwjake2.qcommon.*;
import lwjake2.qcommon.Cvar;
import lwjake2.qcommon.FS;
import lwjake2.qcommon.MSG;
import lwjake2.qcommon.SZ;
import lwjake2.qcommon.qfiles;
import lwjake2.sound.S; import lwjake2.sound.S;
import lwjake2.sys.Timer; import lwjake2.sys.Timer;
import lwjake2.util.Lib; import lwjake2.util.Lib;
@@ -44,6 +39,7 @@ import java.util.Arrays;
*/ */
@Slf4j @Slf4j
public final class SCR extends Globals { public final class SCR extends Globals {
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
// cl_scrn.c -- master for refresh, status bar, console, chat, notify, etc // cl_scrn.c -- master for refresh, status bar, console, chat, notify, etc
static String[][] sb_nums = { static String[][] sb_nums = {
@@ -1392,7 +1388,7 @@ public final class SCR extends Globals {
qfiles.pcx_t pcx; qfiles.pcx_t pcx;
// load the file // load the file
ByteBuffer raw = FS.LoadMappedFile(filename); ByteBuffer raw = fileSystem.loadMappedFile(filename);
if (raw == null) { if (raw == null) {
VID.Printf(Defines.PRINT_DEVELOPER, "Bad pcx file " + filename VID.Printf(Defines.PRINT_DEVELOPER, "Bad pcx file " + filename
@@ -1831,7 +1827,7 @@ public final class SCR extends Globals {
} }
String name = "video/" + arg; String name = "video/" + arg;
cl.cinematic_file = FS.LoadMappedFile(name); cl.cinematic_file = fileSystem.loadMappedFile(name);
if (cl.cinematic_file == null) { if (cl.cinematic_file == null) {
//Com.Error(ERR_DROP, "Cinematic " + name + " not found.\n"); //Com.Error(ERR_DROP, "Cinematic " + name + " not found.\n");
FinishCinematic(); FinishCinematic();

1
src/lwjake2/client/V.java
View File

@@ -384,6 +384,7 @@ public final class V extends Globals {
(int) cl.refdef.vieworg[1], (int) cl.refdef.vieworg[1],
(int) cl.refdef.vieworg[2], (int) cl.refdef.vieworg[2],
(int) cl.refdef.viewangles[YAW] (int) cl.refdef.viewangles[YAW]
);
} }
}; };

17
src/lwjake2/game/Cmd.java
View File

@@ -22,13 +22,7 @@ import lombok.extern.slf4j.Slf4j;
import lwjake2.Defines; import lwjake2.Defines;
import lwjake2.Globals; import lwjake2.Globals;
import lwjake2.game.monsters.M_Player; import lwjake2.game.monsters.M_Player;
import lwjake2.qcommon.Cbuf; import lwjake2.qcommon.*;
import lwjake2.qcommon.Com;
import lwjake2.qcommon.Cvar;
import lwjake2.qcommon.FS;
import lwjake2.qcommon.MSG;
import lwjake2.qcommon.SZ;
import lwjake2.qcommon.cmd_function_t;
import lwjake2.server.SV_GAME; import lwjake2.server.SV_GAME;
import lwjake2.util.Lib; import lwjake2.util.Lib;
@@ -41,6 +35,7 @@ import java.util.Vector;
*/ */
@Slf4j @Slf4j
public final class Cmd { public final class Cmd {
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
static Runnable List_f = new Runnable() { static Runnable List_f = new Runnable() {
public void run() { public void run() {
cmd_function_t cmd = Cmd.cmd_functions; cmd_function_t cmd = Cmd.cmd_functions;
@@ -63,7 +58,7 @@ public final class Cmd {
} }
byte[] f = null; byte[] f = null;
f = FS.LoadFile(Cmd.Argv(1)); f = fileSystem.loadFile(Cmd.Argv(1));
if (f == null) { if (f == null) {
log.info("couldn't exec {}", Cmd.Argv(1)); log.info("couldn't exec {}", Cmd.Argv(1));
return; return;
@@ -71,8 +66,6 @@ public final class Cmd {
log.info("execing {}", Cmd.Argv(1)); log.info("execing {}", Cmd.Argv(1));
Cbuf.InsertText(new String(f)); Cbuf.InsertText(new String(f));
FS.FreeFile(f);
} }
}; };
@@ -386,7 +379,7 @@ public final class Cmd {
/** /**
* Cmd_ExecuteString * Cmd_ExecuteString
* *
* A complete command line has been parsed, so try to run it * A complete command line has been parsed, so try to execute it
* FIXME: lookupnoadd the token to speed search? * FIXME: lookupnoadd the token to speed search?
*/ */
public static void ExecuteString(String text) { public static void ExecuteString(String text) {
@@ -396,7 +389,7 @@ public final class Cmd {
TokenizeString(text.toCharArray(), true); TokenizeString(text.toCharArray(), true);
// run the command line // execute the command line
if (Argc() == 0) if (Argc() == 0)
return; // no tokens return; // no tokens

366
src/lwjake2/qcommon/FS.java → src/lwjake2/qcommon/BaseQ2FileSystem.java
View File

@@ -28,7 +28,6 @@ import lwjake2.sys.Sys;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.io.RandomAccessFile; import java.io.RandomAccessFile;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
@@ -38,80 +37,81 @@ import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
/** import static lwjake2.Defines.*;
* FS
* /*
* ==================================================
*
* QUAKE FILESYSTEM
*
* @author cwei * @author cwei
* @author DmitriyMX <dimon550@gmail.com>
* @modify 2018-03-06
*
* ==================================================
*/ */
@Slf4j @Slf4j
public final class FS extends Globals { public class BaseQ2FileSystem implements FileSystem {
/* private static final BaseQ2FileSystem instance = new BaseQ2FileSystem();
* ================================================== private static final int IDPAKHEADER = (('K' << 24) + ('C' << 16) + ('A' << 8) + 'P');
* private static final int MAX_FILES_IN_PACK = 4096;
* QUAKE FILESYSTEM // read in blocks of 64k
* private static final int MAX_READ = 0x10000;
* ==================================================
*/
public static class packfile_t { public static BaseQ2FileSystem getInstance() {
return instance;
}
private BaseQ2FileSystem() {}
private static class packfile_t {
static final int SIZE = 64; static final int SIZE = 64;
static final int NAME_SIZE = 56; static final int NAME_SIZE = 56;
String name; // char name[56] String name; // char name[56]
int filepos, filelen; int filepos, filelen;
public String toString() { public String toString() {
return name + " [ length: " + filelen + " pos: " + filepos + " ]"; return name + " [ length: " + filelen + " pos: " + filepos + " ]";
} }
} }
public static class pack_t { private static class pack_t {
String filename; String filename;
RandomAccessFile handle; RandomAccessFile handle;
ByteBuffer backbuffer; ByteBuffer backbuffer;
int numfiles; int numfiles;
Hashtable<String, packfile_t> files; // with packfile_t entries Hashtable<String, packfile_t> files; // with packfile_t entries
} }
public static String fs_gamedir; private String fs_gamedir;
private static String fs_userdir; private String fs_userdir;
public static cvar_t fs_basedir; private cvar_t fs_basedir;
public static cvar_t fs_cddir; private cvar_t fs_cddir;
public static cvar_t fs_gamedirvar; private cvar_t fs_gamedirvar;
public static class filelink_t { private static class filelink_t {
String from; String from;
int fromlength; int fromlength;
String to; String to;
} }
// with filelink_t entries // with filelink_t entries
public static List<filelink_t> fs_links = new LinkedList<filelink_t>(); private List<filelink_t> fs_links = new LinkedList<>();
public static class searchpath_t { private static class searchpath_t {
String filename; String filename;
pack_t pack; // only one of filename or pack will be used pack_t pack; // only one of filename or pack will be used
searchpath_t next; searchpath_t next;
} }
public static searchpath_t fs_searchpaths; private searchpath_t fs_searchpaths;
// without gamedirs // without gamedirs
public static searchpath_t fs_base_searchpaths; private searchpath_t fs_base_searchpaths;
/* /*
* All of Quake's data access is through a hierchal file system, but the * All of Quake's data access is through a hierchal file system, but the
@@ -135,10 +135,11 @@ public final class FS extends Globals {
/* /*
* CreatePath * CreatePath
* *
* Creates any directories needed to store the given filename. * Creates any directories needed to store the given filename.
*/ */
public static void CreatePath(String path) { @Override
public void createPath(String path) {
int index = path.lastIndexOf('/'); int index = path.lastIndexOf('/');
// -1 if not found and 0 means write to root // -1 if not found and 0 means write to root
if (index > 0) { if (index > 0) {
@@ -149,32 +150,16 @@ public final class FS extends Globals {
} }
} }
/* @Override
* FCloseFile public int fileLength(String filename) {
*
* For some reason, other dll's can't just call fclose() on files returned
* by FS_FOpenFile...
*/
public static void FCloseFile(RandomAccessFile file) throws IOException {
file.close();
}
public static void FCloseFile(InputStream stream) throws IOException {
stream.close();
}
public static int FileLength(String filename) {
searchpath_t search; searchpath_t search;
String netpath; String netpath;
pack_t pak; pack_t pak;
filelink_t link;
file_from_pak = 0; file_from_pak = 0;
// check for links first // check for links first
for (Iterator<filelink_t> it = fs_links.iterator(); it.hasNext();) { for (filelink_t link : fs_links) {
link = it.next();
if (filename.regionMatches(0, link.from, 0, link.fromlength)) { if (filename.regionMatches(0, link.from, 0, link.fromlength)) {
netpath = link.to + filename.substring(link.fromlength); netpath = link.to + filename.substring(link.fromlength);
File file = new File(netpath); File file = new File(netpath);
@@ -226,28 +211,25 @@ public final class FS extends Globals {
return -1; return -1;
} }
public static int file_from_pak = 0; private int file_from_pak = 0;
/* /*
* FOpenFile * FOpenFile
* *
* Finds the file in the search path. returns a RadomAccesFile. Used for * Finds the file in the search path. returns a RadomAccesFile. Used for
* streaming data out of either a pak file or a seperate file. * streaming data out of either a pak file or a seperate file.
*/ */
public static RandomAccessFile FOpenFile(String filename) @Override
throws IOException { public RandomAccessFile FOpenFile(String filename) throws IOException {
searchpath_t search; searchpath_t search;
String netpath; String netpath;
pack_t pak; pack_t pak;
filelink_t link; File file;
File file = null;
file_from_pak = 0; file_from_pak = 0;
// check for links first // check for links first
for (Iterator<filelink_t> it = fs_links.iterator(); it.hasNext();) { for (filelink_t link : fs_links) {
link = it.next();
// if (!strncmp (filename, link->from, link->fromlength)) // if (!strncmp (filename, link->from, link->fromlength))
if (filename.regionMatches(0, link.from, 0, link.fromlength)) { if (filename.regionMatches(0, link.from, 0, link.fromlength)) {
netpath = link.to + filename.substring(link.fromlength); netpath = link.to + filename.substring(link.fromlength);
@@ -308,19 +290,16 @@ public final class FS extends Globals {
return null; return null;
} }
// read in blocks of 64k
public static final int MAX_READ = 0x10000;
/** /**
* Read * Read
* *
* Properly handles partial reads * Properly handles partial reads
*/ */
public static void Read(byte[] buffer, int len, RandomAccessFile f) { @Override
public void read(byte[] buffer, int len, RandomAccessFile file) {
int block, remaining; int block, remaining;
int offset = 0; int offset = 0;
int read = 0; int read;
// read in chunks for progress bar // read in chunks for progress bar
remaining = len; remaining = len;
@@ -328,15 +307,18 @@ public final class FS extends Globals {
while (remaining != 0) { while (remaining != 0) {
block = Math.min(remaining, MAX_READ); block = Math.min(remaining, MAX_READ);
try { try {
read = f.read(buffer, offset, block); read = file.read(buffer, offset, block);
} catch (IOException e) { } catch (IOException e) {
Com.Error(Defines.ERR_FATAL, e.toString()); log.error(e.toString());
throw new RuntimeException("Look log file");
} }
if (read == 0) { if (read == 0) {
Com.Error(Defines.ERR_FATAL, "FS_Read: 0 bytes read"); log.error("FS_Read: 0 bytes read");
throw new RuntimeException("Look log file");
} else if (read == -1) { } else if (read == -1) {
Com.Error(Defines.ERR_FATAL, "FS_Read: -1 bytes read"); log.error("FS_Read: -1 bytes read");
throw new RuntimeException("Look log file");
} }
// //
// do some progress bar thing here... // do some progress bar thing here...
@@ -348,15 +330,16 @@ public final class FS extends Globals {
/* /*
* LoadFile * LoadFile
* *
* Filename are reletive to the quake search path a null buffer will just * Filename are reletive to the quake search path a null buffer will just
* return the file content as byte[] * return the file content as byte[]
*/ */
public static byte[] LoadFile(String path) { @Override
public byte[] loadFile(String path) {
RandomAccessFile file; RandomAccessFile file;
byte[] buf = null; byte[] buf = null;
int len = 0; int len;
// TODO hack for bad strings (fuck \0) // TODO hack for bad strings (fuck \0)
int index = path.indexOf('\0'); int index = path.indexOf('\0');
@@ -364,7 +347,7 @@ public final class FS extends Globals {
path = path.substring(0, index); path = path.substring(0, index);
// look for it in the filesystem or pack files // look for it in the filesystem or pack files
len = FileLength(path); len = fileLength(path);
if (len < 1) if (len < 1)
return null; return null;
@@ -373,6 +356,7 @@ public final class FS extends Globals {
file = FOpenFile(path); file = FOpenFile(path);
//Read(buf = new byte[len], len, h); //Read(buf = new byte[len], len, h);
buf = new byte[len]; buf = new byte[len];
assert file != null;
file.readFully(buf); file.readFully(buf);
file.close(); file.close();
} catch (IOException e) { } catch (IOException e) {
@@ -383,29 +367,27 @@ public final class FS extends Globals {
/* /*
* LoadMappedFile * LoadMappedFile
* *
* Filename are reletive to the quake search path a null buffer will just * Filename are reletive to the quake search path a null buffer will just
* return the file content as ByteBuffer (memory mapped) * return the file content as ByteBuffer (memory mapped)
*/ */
public static ByteBuffer LoadMappedFile(String filename) { @Override
public ByteBuffer loadMappedFile(String filename) {
searchpath_t search; searchpath_t search;
String netpath; String netpath;
pack_t pak; pack_t pak;
filelink_t link; File file;
File file = null;
int fileLength = 0; int fileLength;
FileChannel channel = null; FileChannel channel = null;
FileInputStream input = null; FileInputStream input = null;
ByteBuffer buffer = null; ByteBuffer buffer;
file_from_pak = 0; file_from_pak = 0;
try { try {
// check for links first // check for links first
for (Iterator<filelink_t> it = fs_links.iterator(); it.hasNext();) { for (filelink_t link : fs_links) {
link = it.next();
if (filename.regionMatches(0, link.from, 0, link.fromlength)) { if (filename.regionMatches(0, link.from, 0, link.fromlength)) {
netpath = link.to + filename.substring(link.fromlength); netpath = link.to + filename.substring(link.fromlength);
file = new File(netpath); file = new File(netpath);
@@ -477,66 +459,52 @@ public final class FS extends Globals {
return buffer; return buffer;
} }
} }
} catch (Exception e) { } catch (Exception ignored) {
} }
try { try {
if (input != null) if (input != null)
input.close(); input.close();
else if (channel != null && channel.isOpen()) else if (channel != null && channel.isOpen())
channel.close(); channel.close();
} catch (IOException ioe) { } catch (IOException ignored) {
} }
return null; return null;
} }
/* private static class dpackheader_t {
* FreeFile
*/
public static void FreeFile(byte[] buffer) {
buffer = null;
}
static final int IDPAKHEADER = (('K' << 24) + ('C' << 16) + ('A' << 8) + 'P');
static class dpackheader_t {
int ident; // IDPAKHEADER int ident; // IDPAKHEADER
int dirofs; int dirofs;
int dirlen; int dirlen;
} }
static final int MAX_FILES_IN_PACK = 4096;
// buffer for C-Strings char[56] // buffer for C-Strings char[56]
static byte[] tmpText = new byte[packfile_t.NAME_SIZE]; private byte[] tmpText = new byte[packfile_t.NAME_SIZE];
/* /*
* LoadPackFile * LoadPackFile
* *
* Takes an explicit (not game tree related) path to a pak file. * Takes an explicit (not game tree related) path to a pak file.
* *
* Loads the header and directory, adding the files at the beginning of the * Loads the header and directory, adding the files at the beginning of the
* list so they override previous pack files. * list so they override previous pack files.
*/ */
static pack_t LoadPackFile(String packfile) { private pack_t loadPackFile(String packfile) {
dpackheader_t header; dpackheader_t header;
Hashtable<String, packfile_t> newfiles; Hashtable<String, packfile_t> newfiles;
RandomAccessFile file; RandomAccessFile file;
int numpackfiles = 0; int numpackfiles;
pack_t pack = null; pack_t pack;
// unsigned checksum; // unsigned checksum;
// //
try { try {
file = new RandomAccessFile(packfile, "r"); file = new RandomAccessFile(packfile, "r");
FileChannel fc = file.getChannel(); FileChannel fc = file.getChannel();
ByteBuffer packhandle = fc.map(FileChannel.MapMode.READ_ONLY, 0, file.length()); ByteBuffer packhandle = fc.map(FileChannel.MapMode.READ_ONLY, 0, file.length());
packhandle.order(ByteOrder.LITTLE_ENDIAN); packhandle.order(ByteOrder.LITTLE_ENDIAN);
fc.close(); fc.close();
if (packhandle == null || packhandle.limit() < 1) if (packhandle.limit() < 1)
return null; return null;
// //
header = new dpackheader_t(); header = new dpackheader_t();
@@ -553,12 +521,12 @@ public final class FS extends Globals {
Com.Error(Defines.ERR_FATAL, packfile + " has " + numpackfiles Com.Error(Defines.ERR_FATAL, packfile + " has " + numpackfiles
+ " files"); + " files");
newfiles = new Hashtable<String, packfile_t>(numpackfiles); newfiles = new Hashtable<>(numpackfiles);
packhandle.position(header.dirofs); packhandle.position(header.dirofs);
// parse the directory // parse the directory
packfile_t entry = null; packfile_t entry;
for (int i = 0; i < numpackfiles; i++) { for (int i = 0; i < numpackfiles; i++) {
packhandle.get(tmpText); packhandle.get(tmpText);
@@ -577,7 +545,7 @@ public final class FS extends Globals {
} }
pack = new pack_t(); pack = new pack_t();
pack.filename = new String(packfile); pack.filename = packfile;
pack.handle = file; pack.handle = file;
pack.numfiles = numpackfiles; pack.numfiles = numpackfiles;
pack.files = newfiles; pack.files = newfiles;
@@ -589,23 +557,23 @@ public final class FS extends Globals {
/* /*
* AddGameDirectory * AddGameDirectory
* *
* Sets fs_gamedir, adds the directory to the head of the path, then loads * Sets fs_gamedir, adds the directory to the head of the path, then loads
* and adds pak1.pak pak2.pak ... * and adds pak1.pak pak2.pak ...
*/ */
static void AddGameDirectory(String dir) { private void addGameDirectory(String dir) {
int i; int i;
searchpath_t search; searchpath_t search;
pack_t pak; pack_t pak;
String pakfile; String pakfile;
fs_gamedir = new String(dir); fs_gamedir = dir;
// //
// add the directory to the search path // add the directory to the search path
// ensure fs_userdir is first in searchpath // ensure fs_userdir is first in searchpath
search = new searchpath_t(); search = new searchpath_t();
search.filename = new String(dir); search.filename = dir;
if (fs_searchpaths != null) { if (fs_searchpaths != null) {
search.next = fs_searchpaths.next; search.next = fs_searchpaths.next;
fs_searchpaths.next = search; fs_searchpaths.next = search;
@@ -621,7 +589,7 @@ public final class FS extends Globals {
if (!(new File(pakfile).canRead())) if (!(new File(pakfile).canRead()))
continue; continue;
pak = LoadPackFile(pakfile); pak = loadPackFile(pakfile);
if (pak == null) if (pak == null)
continue; continue;
@@ -639,7 +607,8 @@ public final class FS extends Globals {
* Called to find where to write a file (demos, savegames, etc) * Called to find where to write a file (demos, savegames, etc)
* this is modified to <user.home>/.lwjake2 * this is modified to <user.home>/.lwjake2
*/ */
public static String Gamedir() { @Override
public String getGamedir() {
return (fs_userdir != null) ? fs_userdir : Globals.BASEDIRNAME; return (fs_userdir != null) ? fs_userdir : Globals.BASEDIRNAME;
} }
@@ -648,14 +617,16 @@ public final class FS extends Globals {
* *
* Called to find where to write a downloaded file * Called to find where to write a downloaded file
*/ */
public static String BaseGamedir() { @Override
public String getBaseGamedir() {
return (fs_gamedir != null) ? fs_gamedir : Globals.BASEDIRNAME; return (fs_gamedir != null) ? fs_gamedir : Globals.BASEDIRNAME;
} }
/* /*
* ExecAutoexec * ExecAutoexec
*/ */
public static void ExecAutoexec() { @Override
public void execAutoexec() {
String dir = fs_userdir; String dir = fs_userdir;
String name; String name;
@@ -676,14 +647,14 @@ public final class FS extends Globals {
/* /*
* SetGamedir * SetGamedir
* *
* Sets the gamedir and path to a different directory. * Sets the gamedir and path to a different directory.
*/ */
public static void SetGamedir(String dir) { @Override
public void setGamedir(String dir) {
searchpath_t next; searchpath_t next;
if (dir.indexOf("..") != -1 || dir.indexOf("/") != -1 if (dir.contains("..") || dir.contains("/") || dir.contains("\\") || dir.contains(":")) {
|| dir.indexOf("\\") != -1 || dir.indexOf(":") != -1) {
log.warn("Gamedir should be a single filename, not a path"); log.warn("Gamedir should be a single filename, not a path");
return; return;
} }
@@ -704,7 +675,6 @@ public final class FS extends Globals {
fs_searchpaths.pack = null; fs_searchpaths.pack = null;
} }
next = fs_searchpaths.next; next = fs_searchpaths.next;
fs_searchpaths = null;
fs_searchpaths = next; fs_searchpaths = next;
} }
@@ -722,9 +692,9 @@ public final class FS extends Globals {
} else { } else {
Cvar.FullSet("gamedir", dir, CVAR_SERVERINFO | CVAR_NOSET); Cvar.FullSet("gamedir", dir, CVAR_SERVERINFO | CVAR_NOSET);
if (fs_cddir.string != null && fs_cddir.string.length() > 0) if (fs_cddir.string != null && fs_cddir.string.length() > 0)
AddGameDirectory(fs_cddir.string + '/' + dir); addGameDirectory(fs_cddir.string + '/' + dir);
AddGameDirectory(fs_basedir.string + '/' + dir); addGameDirectory(fs_basedir.string + '/' + dir);
} }
} }
@@ -733,8 +703,8 @@ public final class FS extends Globals {
* *
* Creates a filelink_t * Creates a filelink_t
*/ */
public static void Link_f() { private void link_f() {
filelink_t entry = null; filelink_t entry;
if (Cmd.Argc() != 3) { if (Cmd.Argc() != 3) {
log.info("USAGE: link <from> <to>"); log.info("USAGE: link <from> <to>");
@@ -751,7 +721,7 @@ public final class FS extends Globals {
it.remove(); it.remove();
return; return;
} }
entry.to = new String(Cmd.Argv(2)); entry.to = Cmd.Argv(2);
return; return;
} }
} }
@@ -759,9 +729,9 @@ public final class FS extends Globals {
// create a new link if the <to> is not empty // create a new link if the <to> is not empty
if (Cmd.Argv(2).length() > 0) { if (Cmd.Argv(2).length() > 0) {
entry = new filelink_t(); entry = new filelink_t();
entry.from = new String(Cmd.Argv(1)); entry.from = Cmd.Argv(1);
entry.fromlength = entry.from.length(); entry.fromlength = entry.from.length();
entry.to = new String(Cmd.Argv(2)); entry.to = Cmd.Argv(2);
fs_links.add(entry); fs_links.add(entry);
} }
} }
@@ -769,7 +739,8 @@ public final class FS extends Globals {
/* /*
* ListFiles * ListFiles
*/ */
public static String[] ListFiles(String findname, int musthave, int canthave) { @Override
public String[] listFiles(String findname, int musthave, int canthave) {
String[] list = new String[0]; String[] list = new String[0];
File[] files = Sys.FindAll(findname, musthave, canthave); File[] files = Sys.FindAll(findname, musthave, canthave);
@@ -787,9 +758,9 @@ public final class FS extends Globals {
/* /*
* Dir_f * Dir_f
*/ */
public static void Dir_f() { private void dir_f() {
String path = null; String path = null;
String findname = null; String findname;
String wildcard = "*.*"; String wildcard = "*.*";
String[] dirnames; String[] dirnames;
@@ -797,26 +768,21 @@ public final class FS extends Globals {
wildcard = Cmd.Argv(1); wildcard = Cmd.Argv(1);
} }
while ((path = NextPath(path)) != null) { while ((path = nextPath(path)) != null) {
String tmp = findname;
findname = path + '/' + wildcard; findname = path + '/' + wildcard;
if (tmp != null)
tmp.replaceAll("\\\\", "/");
log.info("Directory of {}", findname); log.info("Directory of {}", findname);
log.info("----"); log.info("----");
dirnames = ListFiles(findname, 0, 0); dirnames = listFiles(findname, 0, 0);
if (dirnames.length != 0) { if (dirnames.length != 0) {
int index = 0; int index;
for (int i = 0; i < dirnames.length; i++) { for (String dirname : dirnames) {
if ((index = dirnames[i].lastIndexOf('/')) > 0) { if ((index = dirname.lastIndexOf('/')) > 0) {
log.info(dirnames[i].substring(index + 1, dirnames[i].length())); log.info(dirname.substring(index + 1, dirname.length()));
} else { } else {
log.info(dirnames[i]); log.info(dirname);
} }
} }
} }
@@ -827,10 +793,8 @@ public final class FS extends Globals {
/* /*
* Path_f * Path_f
*/ */
public static void Path_f() { private void path_f() {
searchpath_t s; searchpath_t s;
filelink_t link;
log.info("Current search path:"); log.info("Current search path:");
for (s = fs_searchpaths; s != null; s = s.next) { for (s = fs_searchpaths; s != null; s = s.next) {
@@ -843,18 +807,18 @@ public final class FS extends Globals {
} }
log.info("Links:"); log.info("Links:");
for (Iterator<filelink_t> it = fs_links.iterator(); it.hasNext();) { for (filelink_t link : fs_links) {
link = it.next();
log.info("{} : {}", link.from, link.to); log.info("{} : {}", link.from, link.to);
} }
} }
/* /*
* NextPath * NextPath
* *
* Allows enumerating all of the directories in the search path * Allows enumerating all of the directories in the search path
*/ */
public static String NextPath(String prevpath) { @Override
public String nextPath(String prevpath) {
searchpath_t s; searchpath_t s;
String prev; String prev;
@@ -866,7 +830,7 @@ public final class FS extends Globals {
if (s.pack != null) if (s.pack != null)
continue; continue;
if (prevpath == prev) if (prevpath.equals(prev))
return s.filename; return s.filename;
prev = s.filename; prev = s.filename;
@@ -878,26 +842,15 @@ public final class FS extends Globals {
/* /*
* InitFilesystem * InitFilesystem
*/ */
public static void InitFilesystem() { @Override
Cmd.AddCommand("path", new Runnable() { public void init() {
public void run() { Cmd.AddCommand("path", this::path_f);
Path_f(); Cmd.AddCommand("link", this::link_f);
} Cmd.AddCommand("dir", this::dir_f);
});
Cmd.AddCommand("link", new Runnable() {
public void run() {
Link_f();
}
});
Cmd.AddCommand("dir", new Runnable() {
public void run() {
Dir_f();
}
});
fs_userdir = System.getProperty("user.home") + "/.lwjake2"; fs_userdir = System.getProperty("user.home") + "/.lwjake2";
FS.CreatePath(fs_userdir + "/"); createPath(fs_userdir + "/");
FS.AddGameDirectory(fs_userdir); addGameDirectory(fs_userdir);
// //
// basedir <path> // basedir <path>
@@ -916,7 +869,7 @@ public final class FS extends Globals {
// //
// start up with baseq2 by default // start up with baseq2 by default
// //
AddGameDirectory(fs_basedir.string + '/' + Globals.BASEDIRNAME); addGameDirectory(fs_basedir.string + '/' + Globals.BASEDIRNAME);
// any set gamedirs will be freed up to here // any set gamedirs will be freed up to here
markBaseSearchPaths(); markBaseSearchPaths();
@@ -928,21 +881,27 @@ public final class FS extends Globals {
/** /**
* set baseq2 directory * set baseq2 directory
*/ */
static void setCDDir() { @Override
public void setCDDir() {
fs_cddir = Cvar.Get("cddir", "", CVAR_ARCHIVE); fs_cddir = Cvar.Get("cddir", "", CVAR_ARCHIVE);
if (fs_cddir.string.length() > 0) if (fs_cddir != null && fs_cddir.string.length() > 0)
AddGameDirectory(fs_cddir.string + '/' + Globals.BASEDIRNAME); addGameDirectory(fs_cddir.string + '/' + Globals.BASEDIRNAME);
} }
/** Check for "+set game" override - Used to properly set gamedir */
static void checkOverride() {
fs_gamedirvar = Cvar.Get("game", "", CVAR_LATCH | CVAR_SERVERINFO);
if (fs_gamedirvar.string.length() > 0) /**
SetGamedir(fs_gamedirvar.string); * Check for "+set game" override - Used to properly set gamedir
*/
@Override
public void checkOverride() {
fs_gamedirvar = Cvar.Get("game", "", CVAR_LATCH | CVAR_SERVERINFO);
if (fs_gamedirvar != null && fs_gamedirvar.string.length() > 0) {
setGamedir(fs_gamedirvar.string);
}
} }
static void markBaseSearchPaths() { @Override
public void markBaseSearchPaths() {
// any set gamedirs will be freed up to here // any set gamedirs will be freed up to here
fs_base_searchpaths = fs_searchpaths; fs_base_searchpaths = fs_searchpaths;
} }
@@ -951,21 +910,30 @@ public final class FS extends Globals {
/* /*
* Developer_searchpath * Developer_searchpath
*/ */
public static int Developer_searchpath(int who) { @Override
public int developer_searchpath(int who) {
// PMM - warning removal // PMM - warning removal
// char *start; // char *start;
searchpath_t s; searchpath_t s;
for (s = fs_searchpaths; s != null; s = s.next) { for (s = fs_searchpaths; s != null; s = s.next) {
if (s.filename.indexOf("xatrix") != -1) if (s.filename.contains("xatrix"))
return 1; return 1;
if (s.filename.indexOf("rogue") != -1) if (s.filename.contains("rogue"))
return 2; return 2;
} }
return 0; return 0;
} }
@Override
public int getFileFromPak() {
return file_from_pak;
}
@Override
public cvar_t getGamedirVar() {
return fs_gamedirvar;
}
} }

7
src/lwjake2/qcommon/CM.java
View File

@@ -37,6 +37,7 @@ import java.nio.IntBuffer;
import java.util.Arrays; import java.util.Arrays;
public class CM { public class CM {
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
public static class cnode_t { public static class cnode_t {
cplane_t plane; // ptr cplane_t plane; // ptr
@@ -248,7 +249,7 @@ public class CM {
// //
// load the file // load the file
// //
buf = FS.LoadFile(name); buf = fileSystem.loadFile(name);
if (buf == null) if (buf == null)
Com.Error(Defines.ERR_DROP, "Couldn't load " + name); Com.Error(Defines.ERR_DROP, "Couldn't load " + name);
@@ -283,8 +284,6 @@ public class CM {
CMod_LoadAreaPortals(header.lumps[Defines.LUMP_AREAPORTALS]); CMod_LoadAreaPortals(header.lumps[Defines.LUMP_AREAPORTALS]);
CMod_LoadVisibility(header.lumps[Defines.LUMP_VISIBILITY]); CMod_LoadVisibility(header.lumps[Defines.LUMP_VISIBILITY]);
CMod_LoadEntityString(header.lumps[Defines.LUMP_ENTITIES]); CMod_LoadEntityString(header.lumps[Defines.LUMP_ENTITIES]);
FS.FreeFile(buf);
CM_InitBoxHull(); CM_InitBoxHull();
@@ -1787,7 +1786,7 @@ public class CM {
byte buf[] = new byte[len]; byte buf[] = new byte[len];
FS.Read(buf, len, f); fileSystem.read(buf, len, f);
ByteBuffer bb = ByteBuffer.wrap(buf); ByteBuffer bb = ByteBuffer.wrap(buf);
IntBuffer ib = bb.asIntBuffer(); IntBuffer ib = bb.asIntBuffer();

2
src/lwjake2/qcommon/Cbuf.java
View File

@@ -189,7 +189,7 @@ public final class Cbuf {
} }
// run the command line // execute the command line
int len = Lib.strlen(line); int len = Lib.strlen(line);
String cmd = new String(line, 0, len); String cmd = new String(line, 0, len);

9
src/lwjake2/qcommon/Cvar.java
View File

@@ -33,6 +33,7 @@ import java.util.Vector;
* Cvar implements console variables. The original code is located in cvar.c * Cvar implements console variables. The original code is located in cvar.c
*/ */
public class Cvar extends Globals { public class Cvar extends Globals {
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
/** /**
* @param var_name * @param var_name
@@ -194,8 +195,8 @@ public class Cvar extends Globals {
var.value = 0.0f; var.value = 0.0f;
} }
if (var.name.equals("game")) { if (var.name.equals("game")) {
FS.SetGamedir(var.string); fileSystem.setGamedir(var.string);
FS.ExecAutoexec(); fileSystem.execAutoexec();
} }
} }
return var; return var;
@@ -384,8 +385,8 @@ public class Cvar extends Globals {
var.value = 0.0f; var.value = 0.0f;
} }
if (var.name.equals("game")) { if (var.name.equals("game")) {
FS.SetGamedir(var.string); fileSystem.setGamedir(var.string);
FS.ExecAutoexec(); fileSystem.execAutoexec();
} }
} }
} }

37
src/lwjake2/qcommon/FileSystem.java Normal file
View File

@@ -0,0 +1,37 @@
/*
* DmitriyMX <dimon550@gmail.com>
* 2018-03-06
*/
package lwjake2.qcommon;
import lwjake2.game.cvar_t;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
public interface FileSystem {
void init();
byte[] loadFile(String path);
void read(byte[] buffer, int len, RandomAccessFile file);
void execAutoexec();
void createPath(String path);
int fileLength(String filename);
String nextPath(String prevpath);
String[] listFiles(String findname, int musthave, int canthave);
int developer_searchpath(int who);
cvar_t getGamedirVar();
void setGamedir(String dir);
String getGamedir();
String getBaseGamedir();
ByteBuffer loadMappedFile(String filename);
void setCDDir();
void markBaseSearchPaths();
void checkOverride();
RandomAccessFile FOpenFile(String filename) throws IOException;
int getFileFromPak();
}

9
src/lwjake2/qcommon/Qcommon.java
View File

@@ -39,6 +39,7 @@ import java.io.IOException;
*/ */
@Slf4j @Slf4j
public final class Qcommon extends Globals { public final class Qcommon extends Globals {
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
public static final String BUILDSTRING = "Java " + System.getProperty("java.version");; public static final String BUILDSTRING = "Java " + System.getProperty("java.version");;
public static final String CPUSTRING = System.getProperty("os.arch"); public static final String CPUSTRING = System.getProperty("os.arch");
@@ -69,13 +70,13 @@ public final class Qcommon extends Globals {
Cbuf.AddEarlyCommands(false); Cbuf.AddEarlyCommands(false);
Cbuf.Execute(); Cbuf.Execute();
FS.InitFilesystem(); fileSystem.init();
reconfigure(false); reconfigure(false);
FS.setCDDir(); // use cddir from config.cfg fileSystem.setCDDir(); // use cddir from config.cfg
FS.markBaseSearchPaths(); // mark the default search paths fileSystem.markBaseSearchPaths(); // mark the default search paths
FS.checkOverride(); fileSystem.checkOverride();
reconfigure(true); // reload default.cfg and config.cfg reconfigure(true); // reload default.cfg and config.cfg

2
src/lwjake2/render/DummyRenderer.java
View File

@@ -163,7 +163,7 @@ public class DummyRenderer implements refexport_t {
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see jake2.client.refexport_t#updateScreen(jake2.qcommon.Runnable) * @see jake2.client.refexport_t#updateScreen(java.lang.Runnable)
*/ */
public void updateScreen(Runnable callback) { public void updateScreen(Runnable callback) {
callback.run(); callback.run();

14
src/lwjake2/render/lwjgl/Image.java
View File

@@ -22,10 +22,7 @@ import lwjake2.Defines;
import lwjake2.client.VID; import lwjake2.client.VID;
import lwjake2.client.particle_t; import lwjake2.client.particle_t;
import lwjake2.game.cvar_t; import lwjake2.game.cvar_t;
import lwjake2.qcommon.Com; import lwjake2.qcommon.*;
import lwjake2.qcommon.Cvar;
import lwjake2.qcommon.FS;
import lwjake2.qcommon.qfiles;
import lwjake2.render.image_t; import lwjake2.render.image_t;
import lwjake2.util.Lib; import lwjake2.util.Lib;
import lwjake2.util.Vargs; import lwjake2.util.Vargs;
@@ -51,6 +48,7 @@ import org.lwjgl.opengl.GL11;
* @author cwei * @author cwei
*/ */
public abstract class Image extends Main { public abstract class Image extends Main {
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
image_t draw_chars; image_t draw_chars;
@@ -450,7 +448,7 @@ public abstract class Image extends Main {
// //
// load the file // load the file
// //
byte[] raw = FS.LoadFile(filename); byte[] raw = fileSystem.loadFile(filename);
if (raw == null) { if (raw == null) {
VID.Printf(Defines.PRINT_DEVELOPER, "Bad pcx file " + filename + '\n'); VID.Printf(Defines.PRINT_DEVELOPER, "Bad pcx file " + filename + '\n');
@@ -547,7 +545,7 @@ public abstract class Image extends Main {
// //
// load the file // load the file
// //
raw = FS.LoadFile(name); raw = fileSystem.loadFile(name);
if (raw == null) if (raw == null)
{ {
@@ -1446,7 +1444,7 @@ public abstract class Image extends Main {
image_t image = null; image_t image = null;
byte[] raw = FS.LoadFile(name); byte[] raw = fileSystem.loadFile(name);
if (raw == null) { if (raw == null) {
VID.Printf(Defines.PRINT_ALL, "GL_FindImage: can't load " + name + '\n'); VID.Printf(Defines.PRINT_ALL, "GL_FindImage: can't load " + name + '\n');
return r_notexture; return r_notexture;
@@ -1630,7 +1628,7 @@ public abstract class Image extends Main {
Draw_GetPalette(); Draw_GetPalette();
if (qglColorTableEXT) { if (qglColorTableEXT) {
gl_state.d_16to8table = FS.LoadFile("pics/16to8.dat"); gl_state.d_16to8table = fileSystem.loadFile("pics/16to8.dat");
if (gl_state.d_16to8table == null) if (gl_state.d_16to8table == null)
Com.Error(Defines.ERR_FATAL, "Couldn't load pics/16to8.pcx"); Com.Error(Defines.ERR_FATAL, "Couldn't load pics/16to8.pcx");
} }

8
src/lwjake2/render/lwjgl/Misc.java
View File

@@ -20,7 +20,7 @@ package lwjake2.render.lwjgl;
import lwjake2.Defines; import lwjake2.Defines;
import lwjake2.client.VID; import lwjake2.client.VID;
import lwjake2.qcommon.FS; import lwjake2.qcommon.BaseQ2FileSystem;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@@ -29,6 +29,7 @@ import java.nio.FloatBuffer;
import java.nio.MappedByteBuffer; import java.nio.MappedByteBuffer;
import java.nio.channels.FileChannel; import java.nio.channels.FileChannel;
import lwjake2.qcommon.FileSystem;
import org.lwjgl.BufferUtils; import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.ARBMultitexture; import org.lwjgl.opengl.ARBMultitexture;
import org.lwjgl.opengl.EXTPointParameters; import org.lwjgl.opengl.EXTPointParameters;
@@ -42,6 +43,7 @@ import org.lwjgl.opengl.GL12;
* @author cwei * @author cwei
*/ */
public abstract class Misc extends Mesh { public abstract class Misc extends Mesh {
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
/* /*
================== ==================
@@ -121,8 +123,8 @@ public abstract class Misc extends Mesh {
================== ==================
*/ */
void GL_ScreenShot_f() { void GL_ScreenShot_f() {
StringBuffer sb = new StringBuffer(FS.Gamedir() + "/scrshot/jake00.tga"); StringBuffer sb = new StringBuffer(fileSystem.getGamedir() + "/scrshot/jake00.tga");
FS.CreatePath(sb.toString()); fileSystem.createPath(sb.toString());
File file = new File(sb.toString()); File file = new File(sb.toString());
// find a valid file name // find a valid file name
int i = 0; int offset = sb.length() - 6; int i = 0; int offset = sb.length() - 6;

6
src/lwjake2/render/lwjgl/Model.java
View File

@@ -24,7 +24,8 @@ import lwjake2.game.cplane_t;
import lwjake2.game.cvar_t; import lwjake2.game.cvar_t;
import lwjake2.qcommon.Com; import lwjake2.qcommon.Com;
import lwjake2.qcommon.Cvar; import lwjake2.qcommon.Cvar;
import lwjake2.qcommon.FS; import lwjake2.qcommon.FileSystem;
import lwjake2.qcommon.BaseQ2FileSystem;
import lwjake2.qcommon.lump_t; import lwjake2.qcommon.lump_t;
import lwjake2.qcommon.qfiles; import lwjake2.qcommon.qfiles;
import lwjake2.qcommon.texinfo_t; import lwjake2.qcommon.texinfo_t;
@@ -54,6 +55,7 @@ import org.lwjgl.BufferUtils;
* @author cwei * @author cwei
*/ */
public abstract class Model extends Surf { public abstract class Model extends Surf {
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
// models.c -- model loading and caching // models.c -- model loading and caching
@@ -271,7 +273,7 @@ public abstract class Model extends Surf {
// //
// load the file // load the file
// //
fileBuffer = FS.LoadFile(name); fileBuffer = fileSystem.loadFile(name);
if (fileBuffer == null) if (fileBuffer == null)
{ {

54
src/lwjake2/server/SV_CCMDS.java
View File

@@ -30,7 +30,8 @@ import lwjake2.game.cvar_t;
import lwjake2.qcommon.CM; import lwjake2.qcommon.CM;
import lwjake2.qcommon.Com; import lwjake2.qcommon.Com;
import lwjake2.qcommon.Cvar; import lwjake2.qcommon.Cvar;
import lwjake2.qcommon.FS; import lwjake2.qcommon.FileSystem;
import lwjake2.qcommon.BaseQ2FileSystem;
import lwjake2.qcommon.MSG; import lwjake2.qcommon.MSG;
import lwjake2.qcommon.Netchan; import lwjake2.qcommon.Netchan;
import lwjake2.qcommon.SZ; import lwjake2.qcommon.SZ;
@@ -50,6 +51,7 @@ import java.util.Calendar;
@Slf4j @Slf4j
public class SV_CCMDS { public class SV_CCMDS {
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
/* /*
=============================================================================== ===============================================================================
@@ -176,13 +178,13 @@ public class SV_CCMDS {
Com.DPrintf("SV_WipeSaveGame(" + savename + ")\n"); Com.DPrintf("SV_WipeSaveGame(" + savename + ")\n");
name = FS.Gamedir() + "/save/" + savename + "/server.ssv"; name = fileSystem.getGamedir() + "/save/" + savename + "/server.ssv";
remove(name); remove(name);
name = FS.Gamedir() + "/save/" + savename + "/game.ssv"; name = fileSystem.getGamedir() + "/save/" + savename + "/game.ssv";
remove(name); remove(name);
name = FS.Gamedir() + "/save/" + savename + "/*.sav"; name = fileSystem.getGamedir() + "/save/" + savename + "/*.sav";
File f = Sys.FindFirst(name, 0, 0); File f = Sys.FindFirst(name, 0, 0);
while (f != null) { while (f != null) {
@@ -191,7 +193,7 @@ public class SV_CCMDS {
} }
Sys.FindClose(); Sys.FindClose();
name = FS.Gamedir() + "/save/" + savename + "/*.sv2"; name = fileSystem.getGamedir() + "/save/" + savename + "/*.sv2";
f = Sys.FindFirst(name, 0, 0); f = Sys.FindFirst(name, 0, 0);
@@ -281,23 +283,23 @@ public class SV_CCMDS {
SV_WipeSavegame(dst); SV_WipeSavegame(dst);
// copy the savegame over // copy the savegame over
name = FS.Gamedir() + "/save/" + src + "/server.ssv"; name = fileSystem.getGamedir() + "/save/" + src + "/server.ssv";
name2 = FS.Gamedir() + "/save/" + dst + "/server.ssv"; name2 = fileSystem.getGamedir() + "/save/" + dst + "/server.ssv";
FS.CreatePath(name2); fileSystem.createPath(name2);
CopyFile(name, name2); CopyFile(name, name2);
name = FS.Gamedir() + "/save/" + src + "/game.ssv"; name = fileSystem.getGamedir() + "/save/" + src + "/game.ssv";
name2 = FS.Gamedir() + "/save/" + dst + "/game.ssv"; name2 = fileSystem.getGamedir() + "/save/" + dst + "/game.ssv";
CopyFile(name, name2); CopyFile(name, name2);
String name1 = FS.Gamedir() + "/save/" + src + "/"; String name1 = fileSystem.getGamedir() + "/save/" + src + "/";
name = FS.Gamedir() + "/save/" + src + "/*.sav"; name = fileSystem.getGamedir() + "/save/" + src + "/*.sav";
found = Sys.FindFirst(name, 0, 0); found = Sys.FindFirst(name, 0, 0);
while (found != null) { while (found != null) {
name = name1 + found.getName(); name = name1 + found.getName();
name2 = FS.Gamedir() + "/save/" + dst + "/" + found.getName(); name2 = fileSystem.getGamedir() + "/save/" + dst + "/" + found.getName();
CopyFile(name, name2); CopyFile(name, name2);
@@ -324,7 +326,7 @@ public class SV_CCMDS {
Com.DPrintf("SV_WriteLevelFile()\n"); Com.DPrintf("SV_WriteLevelFile()\n");
name = FS.Gamedir() + "/save/current/" + SV_INIT.sv.name + ".sv2"; name = fileSystem.getGamedir() + "/save/current/" + SV_INIT.sv.name + ".sv2";
try { try {
f = new QuakeFile(name, "rw"); f = new QuakeFile(name, "rw");
@@ -340,7 +342,7 @@ public class SV_CCMDS {
e.printStackTrace(); e.printStackTrace();
} }
name = FS.Gamedir() + "/save/current/" + SV_INIT.sv.name + ".sav"; name = fileSystem.getGamedir() + "/save/current/" + SV_INIT.sv.name + ".sav";
GameSave.WriteLevel(name); GameSave.WriteLevel(name);
} }
/* /*
@@ -356,7 +358,7 @@ public class SV_CCMDS {
Com.DPrintf("SV_ReadLevelFile()\n"); Com.DPrintf("SV_ReadLevelFile()\n");
name = FS.Gamedir() + "/save/current/" + SV_INIT.sv.name + ".sv2"; name = fileSystem.getGamedir() + "/save/current/" + SV_INIT.sv.name + ".sv2";
try { try {
f = new QuakeFile(name, "r"); f = new QuakeFile(name, "r");
@@ -372,7 +374,7 @@ public class SV_CCMDS {
e1.printStackTrace(); e1.printStackTrace();
} }
name = FS.Gamedir() + "/save/current/" + SV_INIT.sv.name + ".sav"; name = fileSystem.getGamedir() + "/save/current/" + SV_INIT.sv.name + ".sav";
GameSave.ReadLevel(name); GameSave.ReadLevel(name);
} }
/* /*
@@ -389,7 +391,7 @@ public class SV_CCMDS {
Com.DPrintf("SV_WriteServerFile(" + (autosave ? "true" : "false") + ")\n"); Com.DPrintf("SV_WriteServerFile(" + (autosave ? "true" : "false") + ")\n");
filename = FS.Gamedir() + "/save/current/server.ssv"; filename = fileSystem.getGamedir() + "/save/current/server.ssv";
try { try {
f = new QuakeFile(filename, "rw"); f = new QuakeFile(filename, "rw");
@@ -442,7 +444,7 @@ public class SV_CCMDS {
} }
// write game state // write game state
filename = FS.Gamedir() + "/save/current/game.ssv"; filename = fileSystem.getGamedir() + "/save/current/game.ssv";
GameSave.WriteGame(filename, autosave); GameSave.WriteGame(filename, autosave);
} }
/* /*
@@ -460,7 +462,7 @@ public class SV_CCMDS {
Com.DPrintf("SV_ReadServerFile()\n"); Com.DPrintf("SV_ReadServerFile()\n");
filename = FS.Gamedir() + "/save/current/server.ssv"; filename = fileSystem.getGamedir() + "/save/current/server.ssv";
f = new QuakeFile(filename, "r"); f = new QuakeFile(filename, "r");
@@ -487,7 +489,7 @@ public class SV_CCMDS {
SV_INIT.svs.mapcmd = mapcmd; SV_INIT.svs.mapcmd = mapcmd;
// read game state // read game state
filename = FS.Gamedir() + "/save/current/game.ssv"; filename = fileSystem.getGamedir() + "/save/current/game.ssv";
GameSave.ReadGame(filename); GameSave.ReadGame(filename);
} }
catch (Exception e) { catch (Exception e) {
@@ -538,7 +540,7 @@ public class SV_CCMDS {
Com.DPrintf("SV_GameMap(" + Cmd.Argv(1) + ")\n"); Com.DPrintf("SV_GameMap(" + Cmd.Argv(1) + ")\n");
FS.CreatePath(FS.Gamedir() + "/save/current/"); fileSystem.createPath(fileSystem.getGamedir() + "/save/current/");
// check for clearing the current savegame // check for clearing the current savegame
map = Cmd.Argv(1); map = Cmd.Argv(1);
@@ -599,7 +601,7 @@ public class SV_CCMDS {
map = Cmd.Argv(1); map = Cmd.Argv(1);
if (map.indexOf(".") < 0) { if (map.indexOf(".") < 0) {
expanded = "maps/" + map + ".bsp"; expanded = "maps/" + map + ".bsp";
if (FS.LoadFile(expanded) == null) { if (fileSystem.loadFile(expanded) == null) {
Com.Printf("Can't find " + expanded + "\n"); Com.Printf("Can't find " + expanded + "\n");
return; return;
@@ -644,7 +646,7 @@ public class SV_CCMDS {
} }
// make sure the server.ssv file exists // make sure the server.ssv file exists
name = FS.Gamedir() + "/save/" + Cmd.Argv(1) + "/server.ssv"; name = fileSystem.getGamedir() + "/save/" + Cmd.Argv(1) + "/server.ssv";
try { try {
f = new RandomAccessFile(name, "r"); f = new RandomAccessFile(name, "r");
} }
@@ -913,10 +915,10 @@ public class SV_CCMDS {
// //
// open the demo file // open the demo file
// //
name = FS.Gamedir() + "/demos/" + Cmd.Argv(1) + ".dm2"; name = fileSystem.getGamedir() + "/demos/" + Cmd.Argv(1) + ".dm2";
Com.Printf("recording to " + name + ".\n"); Com.Printf("recording to " + name + ".\n");
FS.CreatePath(name); fileSystem.createPath(name);
try { try {
SV_INIT.svs.demofile = new RandomAccessFile(name, "rw"); SV_INIT.svs.demofile = new RandomAccessFile(name, "rw");
} }

6
src/lwjake2/server/SV_INIT.java
View File

@@ -32,7 +32,8 @@ import lwjake2.qcommon.CM;
import lwjake2.qcommon.Cbuf; import lwjake2.qcommon.Cbuf;
import lwjake2.qcommon.Com; import lwjake2.qcommon.Com;
import lwjake2.qcommon.Cvar; import lwjake2.qcommon.Cvar;
import lwjake2.qcommon.FS; import lwjake2.qcommon.FileSystem;
import lwjake2.qcommon.BaseQ2FileSystem;
import lwjake2.qcommon.MSG; import lwjake2.qcommon.MSG;
import lwjake2.qcommon.PMove; import lwjake2.qcommon.PMove;
import lwjake2.qcommon.SZ; import lwjake2.qcommon.SZ;
@@ -45,6 +46,7 @@ import java.io.RandomAccessFile;
@Slf4j @Slf4j
public class SV_INIT { public class SV_INIT {
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
/** /**
* SV_FindIndex. * SV_FindIndex.
*/ */
@@ -134,7 +136,7 @@ public class SV_INIT {
if (Cvar.VariableValue("deathmatch") != 0) if (Cvar.VariableValue("deathmatch") != 0)
return; return;
name = FS.Gamedir() + "/save/current/" + sv.name + ".sav"; name = fileSystem.getGamedir() + "/save/current/" + sv.name + ".sav";
try { try {
f = new RandomAccessFile(name, "r"); f = new RandomAccessFile(name, "r");
} }

2
src/lwjake2/server/SV_MAIN.java
View File

@@ -29,7 +29,6 @@ import lwjake2.game.cvar_t;
import lwjake2.game.edict_t; import lwjake2.game.edict_t;
import lwjake2.qcommon.Com; import lwjake2.qcommon.Com;
import lwjake2.qcommon.Cvar; import lwjake2.qcommon.Cvar;
import lwjake2.qcommon.FS;
import lwjake2.qcommon.MSG; import lwjake2.qcommon.MSG;
import lwjake2.qcommon.Netchan; import lwjake2.qcommon.Netchan;
import lwjake2.qcommon.SZ; import lwjake2.qcommon.SZ;
@@ -116,7 +115,6 @@ public class SV_MAIN {
} }
if (drop.download != null) { if (drop.download != null) {
FS.FreeFile(drop.download);
drop.download = null; drop.download = null;
} }

18
src/lwjake2/server/SV_USER.java
View File

@@ -27,17 +27,13 @@ import lwjake2.game.PlayerClient;
import lwjake2.game.edict_t; import lwjake2.game.edict_t;
import lwjake2.game.entity_state_t; import lwjake2.game.entity_state_t;
import lwjake2.game.usercmd_t; import lwjake2.game.usercmd_t;
import lwjake2.qcommon.Cbuf; import lwjake2.qcommon.*;
import lwjake2.qcommon.Com;
import lwjake2.qcommon.Cvar;
import lwjake2.qcommon.FS;
import lwjake2.qcommon.MSG;
import lwjake2.qcommon.SZ;
import lwjake2.util.Lib; import lwjake2.util.Lib;
import java.io.IOException; import java.io.IOException;
public class SV_USER { public class SV_USER {
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
static edict_t sv_player; static edict_t sv_player;
@@ -120,7 +116,7 @@ public class SV_USER {
name = "demos/" + SV_INIT.sv.name; name = "demos/" + SV_INIT.sv.name;
try { try {
SV_INIT.sv.demofile = FS.FOpenFile(name); SV_INIT.sv.demofile = fileSystem.FOpenFile(name);
} catch (IOException e) { } catch (IOException e) {
Com.Error(Defines.ERR_DROP, "Couldn't open " + name + "\n"); Com.Error(Defines.ERR_DROP, "Couldn't open " + name + "\n");
} }
@@ -365,7 +361,6 @@ public class SV_USER {
if (SV_MAIN.sv_client.downloadcount != SV_MAIN.sv_client.downloadsize) if (SV_MAIN.sv_client.downloadcount != SV_MAIN.sv_client.downloadsize)
return; return;
FS.FreeFile(SV_MAIN.sv_client.download);
SV_MAIN.sv_client.download = null; SV_MAIN.sv_client.download = null;
} }
@@ -409,9 +404,9 @@ public class SV_USER {
} }
if (SV_MAIN.sv_client.download != null) if (SV_MAIN.sv_client.download != null)
FS.FreeFile(SV_MAIN.sv_client.download); SV_MAIN.sv_client.download = null;
SV_MAIN.sv_client.download = FS.LoadFile(name); SV_MAIN.sv_client.download = fileSystem.loadFile(name);
// rst: this handles loading errors, no message yet visible // rst: this handles loading errors, no message yet visible
if (SV_MAIN.sv_client.download == null) if (SV_MAIN.sv_client.download == null)
@@ -429,11 +424,10 @@ public class SV_USER {
// came from a pak file, don't // came from a pak file, don't
// allow // allow
// download ZOID // download ZOID
|| (name.startsWith("maps/") && FS.file_from_pak != 0)) { || (name.startsWith("maps/") && fileSystem.getFileFromPak() != 0)) {
Com.DPrintf("Couldn't download " + name + " to " Com.DPrintf("Couldn't download " + name + " to "
+ SV_MAIN.sv_client.name + "\n"); + SV_MAIN.sv_client.name + "\n");
if (SV_MAIN.sv_client.download != null) { if (SV_MAIN.sv_client.download != null) {
FS.FreeFile(SV_MAIN.sv_client.download);
SV_MAIN.sv_client.download = null; SV_MAIN.sv_client.download = null;
} }

6
src/lwjake2/sound/WaveLoader.java
View File

@@ -20,14 +20,16 @@ package lwjake2.sound;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import lwjake2.Defines; import lwjake2.Defines;
import lwjake2.qcommon.BaseQ2FileSystem;
import lwjake2.qcommon.Com; import lwjake2.qcommon.Com;
import lwjake2.qcommon.FS; import lwjake2.qcommon.FileSystem;
/** /**
* SND_MEM * SND_MEM
*/ */
@Slf4j @Slf4j
public class WaveLoader { public class WaveLoader {
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
/** /**
* The ResampleSfx can squeeze and stretch samples to a default sample rate. * The ResampleSfx can squeeze and stretch samples to a default sample rate.
* Since Joal and lwjgl sound drivers support this, we don't need it and the samples * Since Joal and lwjgl sound drivers support this, we don't need it and the samples
@@ -66,7 +68,7 @@ public class WaveLoader {
else else
namebuffer = "sound/" + name; namebuffer = "sound/" + name;
byte[] data = FS.LoadFile(namebuffer); byte[] data = fileSystem.loadFile(namebuffer);
if (data == null) { if (data == null) {
Com.DPrintf("Couldn't load " + namebuffer + "\n"); Com.DPrintf("Couldn't load " + namebuffer + "\n");

9
src/lwjake2/sound/lwjgl/LWJGLSoundImpl.java
View File

@@ -25,9 +25,7 @@ import lwjake2.game.Cmd;
import lwjake2.game.GameBase; import lwjake2.game.GameBase;
import lwjake2.game.cvar_t; import lwjake2.game.cvar_t;
import lwjake2.game.entity_state_t; import lwjake2.game.entity_state_t;
import lwjake2.qcommon.Com; import lwjake2.qcommon.*;
import lwjake2.qcommon.Cvar;
import lwjake2.qcommon.FS;
import lwjake2.sound.S; import lwjake2.sound.S;
import lwjake2.sound.Sound; import lwjake2.sound.Sound;
import lwjake2.sound.WaveLoader; import lwjake2.sound.WaveLoader;
@@ -57,6 +55,7 @@ import org.lwjgl.openal.OpenALException;
*/ */
@Slf4j @Slf4j
public final class LWJGLSoundImpl implements Sound { public final class LWJGLSoundImpl implements Sound {
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
static { static {
S.register(new LWJGLSoundImpl()); S.register(new LWJGLSoundImpl());
}; };
@@ -379,14 +378,14 @@ public final class LWJGLSoundImpl implements Sound {
// fall back strategies // fall back strategies
// //
// not found , so see if it exists // not found , so see if it exists
if (FS.FileLength(sexedFilename.substring(1)) > 0) { if (fileSystem.fileLength(sexedFilename.substring(1)) > 0) {
// yes, register it // yes, register it
return RegisterSound(sexedFilename); return RegisterSound(sexedFilename);
} }
// try it with the female sound in the pak0.pak // try it with the female sound in the pak0.pak
if (model.equalsIgnoreCase("female")) { if (model.equalsIgnoreCase("female")) {
String femaleFilename = "player/female/" + base.substring(1); String femaleFilename = "player/female/" + base.substring(1);
if (FS.FileLength("sound/" + femaleFilename) > 0) if (fileSystem.fileLength("sound/" + femaleFilename) > 0)
return AliasName(sexedFilename, femaleFilename); return AliasName(sexedFilename, femaleFilename);
} }
// no chance, revert to the male sound in the pak0.pak // no chance, revert to the male sound in the pak0.pak

6
src/lwjake2/util/Lib.java
View File

@@ -20,8 +20,9 @@ package lwjake2.util;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import lwjake2.Globals; import lwjake2.Globals;
import lwjake2.qcommon.BaseQ2FileSystem;
import lwjake2.qcommon.Com; import lwjake2.qcommon.Com;
import lwjake2.qcommon.FS; import lwjake2.qcommon.FileSystem;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@@ -34,6 +35,7 @@ import java.nio.IntBuffer;
@Slf4j @Slf4j
public class Lib { public class Lib {
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
/** Converts a vector to a string. */ /** Converts a vector to a string. */
public static String vtos(float[] v) { public static String vtos(float[] v) {
return (int) v[0] + " " + (int) v[1] + " " + (int) v[2]; return (int) v[0] + " " + (int) v[1] + " " + (int) v[2];
@@ -240,7 +242,7 @@ public class Lib {
/** Like in libc */ /** Like in libc */
public static String freadString(RandomAccessFile f, int len) { public static String freadString(RandomAccessFile f, int len) {
byte buffer[] = new byte[len]; byte buffer[] = new byte[len];
FS.Read(buffer, len, f); fileSystem.read(buffer, len, f);
return Lib.CtoJava(buffer); return Lib.CtoJava(buffer);
} }