Voomra/lwjake2
0
Fork 0
Code Activity

Hello Lambda!

Browse Source
This commit is contained in:
DmitriyMX
2018-03-08 19:18:46 +03:00
parent 8d9401874f
commit 5865259e9b
17 changed files with 679 additions and 1220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,26 +104,24 @@ public final class CL {
*
* Stop recording a demo.
*/
static Runnable Stop_f = new Runnable() {
public void run() {
try {
static Runnable Stop_f = () -> {
try {
int len;
int len;
if (!Globals.cls.demorecording) {
log.info("Not recording a demo.");
return;
}
// finish up
len = -1;
Globals.cls.demofile.writeInt(EndianHandler.swapInt(len));
Globals.cls.demofile.close();
Globals.cls.demofile = null;
Globals.cls.demorecording = false;
log.info("Stopped demo.");
} catch (IOException e) {
if (!Globals.cls.demorecording) {
log.info("Not recording a demo.");
return;
}
// finish up
len = -1;
Globals.cls.demofile.writeInt(EndianHandler.swapInt(len));
Globals.cls.demofile.close();
Globals.cls.demofile = null;
Globals.cls.demorecording = false;
log.info("Stopped demo.");
} catch (IOException e) {
}
};
@@ -135,191 +133,181 @@ public final class CL {
* record <demoname>
* Begins recording a demo from the current position.
*/
static Runnable Record_f = new Runnable() {
public void run() {
try {
String name;
byte buf_data[] = new byte[Defines.MAX_MSGLEN];
sizebuf_t buf = new sizebuf_t();
int i;
entity_state_t ent;
static Runnable Record_f = () -> {
try {
String name;
byte buf_data[] = new byte[Defines.MAX_MSGLEN];
sizebuf_t buf = new sizebuf_t();
int i;
entity_state_t ent;
if (Cmd.Argc() != 2) {
log.info("record <demoname>");
return;
}
if (Cmd.Argc() != 2) {
log.info("record <demoname>");
return;
}
if (Globals.cls.demorecording) {
log.info("Already recording.");
return;
}
if (Globals.cls.demorecording) {
log.info("Already recording.");
return;
}
if (Globals.cls.state != Defines.ca_active) {
log.info("You must be in a level to record.");
return;
}
if (Globals.cls.state != Defines.ca_active) {
log.info("You must be in a level to record.");
return;
}
//
// open the demo file
//
name = fileSystem.getGamedir() + "/demos/" + Cmd.Argv(1) + ".dm2";
//
// open the demo file
//
name = fileSystem.getGamedir() + "/demos/" + Cmd.Argv(1) + ".dm2";
log.info("recording to {}", name);
fileSystem.createPath(name);
Globals.cls.demofile = new RandomAccessFile(name, "rw");
if (Globals.cls.demofile == null) {
log.error("ERROR: couldn't open.");
return;
}
Globals.cls.demorecording = true;
log.info("recording to {}", name);
fileSystem.createPath(name);
Globals.cls.demofile = new RandomAccessFile(name, "rw");
if (Globals.cls.demofile == null) {
log.error("ERROR: couldn't open.");
return;
}
Globals.cls.demorecording = true;
// don't start saving messages until a non-delta compressed
// message is received
Globals.cls.demowaiting = true;
// don't start saving messages until a non-delta compressed
// message is received
Globals.cls.demowaiting = true;
//
// write out messages to hold the startup information
//
SZ.Init(buf, buf_data, Defines.MAX_MSGLEN);
//
// write out messages to hold the startup information
//
SZ.Init(buf, buf_data, Defines.MAX_MSGLEN);
// send the serverdata
MSG.WriteByte(buf, Defines.svc_serverdata);
MSG.WriteInt(buf, Defines.PROTOCOL_VERSION);
MSG.WriteInt(buf, 0x10000 + Globals.cl.servercount);
MSG.WriteByte(buf, 1); // demos are always attract loops
MSG.WriteString(buf, Globals.cl.gamedir);
MSG.WriteShort(buf, Globals.cl.playernum);
// send the serverdata
MSG.WriteByte(buf, Defines.svc_serverdata);
MSG.WriteInt(buf, Defines.PROTOCOL_VERSION);
MSG.WriteInt(buf, 0x10000 + Globals.cl.servercount);
MSG.WriteByte(buf, 1); // demos are always attract loops
MSG.WriteString(buf, Globals.cl.gamedir);
MSG.WriteShort(buf, Globals.cl.playernum);
MSG.WriteString(buf, Globals.cl.configstrings[Defines.CS_NAME]);
MSG.WriteString(buf, Globals.cl.configstrings[Defines.CS_NAME]);
// configstrings
for (i = 0; i < Defines.MAX_CONFIGSTRINGS; i++) {
if (Globals.cl.configstrings[i].length() > 0) {
if (buf.cursize + Globals.cl.configstrings[i].length()
+ 32 > buf.maxsize) {
// write it out
Globals.cls.demofile.writeInt(EndianHandler.swapInt(buf.cursize));
Globals.cls.demofile
.write(buf.data, 0, buf.cursize);
buf.cursize = 0;
}
MSG.WriteByte(buf, Defines.svc_configstring);
MSG.WriteShort(buf, i);
MSG.WriteString(buf, Globals.cl.configstrings[i]);
}
}
// baselines
nullstate.clear();
for (i = 0; i < Defines.MAX_EDICTS; i++) {
ent = Globals.cl_entities[i].baseline;
if (ent.modelindex == 0)
continue;
if (buf.cursize + 64 > buf.maxsize) { // write it out
// configstrings
for (i = 0; i < Defines.MAX_CONFIGSTRINGS; i++) {
if (Globals.cl.configstrings[i].length() > 0) {
if (buf.cursize + Globals.cl.configstrings[i].length()
+ 32 > buf.maxsize) {
// write it out
Globals.cls.demofile.writeInt(EndianHandler.swapInt(buf.cursize));
Globals.cls.demofile.write(buf.data, 0, buf.cursize);
Globals.cls.demofile
.write(buf.data, 0, buf.cursize);
buf.cursize = 0;
}
MSG.WriteByte(buf, Defines.svc_spawnbaseline);
MSG.WriteDeltaEntity(nullstate,
Globals.cl_entities[i].baseline, buf, true, true);
MSG.WriteByte(buf, Defines.svc_configstring);
MSG.WriteShort(buf, i);
MSG.WriteString(buf, Globals.cl.configstrings[i]);
}
MSG.WriteByte(buf, Defines.svc_stufftext);
MSG.WriteString(buf, "precache\n");
// write it to the demo file
Globals.cls.demofile.writeInt(EndianHandler.swapInt(buf.cursize));
Globals.cls.demofile.write(buf.data, 0, buf.cursize);
// the rest of the demo file will be individual frames
} catch (IOException e) {
}
// baselines
nullstate.clear();
for (i = 0; i < Defines.MAX_EDICTS; i++) {
ent = Globals.cl_entities[i].baseline;
if (ent.modelindex == 0)
continue;
if (buf.cursize + 64 > buf.maxsize) { // write it out
Globals.cls.demofile.writeInt(EndianHandler.swapInt(buf.cursize));
Globals.cls.demofile.write(buf.data, 0, buf.cursize);
buf.cursize = 0;
}
MSG.WriteByte(buf, Defines.svc_spawnbaseline);
MSG.WriteDeltaEntity(nullstate,
Globals.cl_entities[i].baseline, buf, true, true);
}
MSG.WriteByte(buf, Defines.svc_stufftext);
MSG.WriteString(buf, "precache\n");
// write it to the demo file
Globals.cls.demofile.writeInt(EndianHandler.swapInt(buf.cursize));
Globals.cls.demofile.write(buf.data, 0, buf.cursize);
// the rest of the demo file will be individual frames
} catch (IOException e) {
}
};
/**
* ForwardToServer_f
*/
static Runnable ForwardToServer_f = new Runnable() {
public void run() {
if (Globals.cls.state != Defines.ca_connected
&& Globals.cls.state != Defines.ca_active) {
log.warn("Can't \"{}\", not connected", Cmd.Argv(0));
return;
}
static Runnable ForwardToServer_f = () -> {
if (Globals.cls.state != Defines.ca_connected
&& Globals.cls.state != Defines.ca_active) {
log.warn("Can't \"{}\", not connected", Cmd.Argv(0));
return;
}
// don't forward the first argument
if (Cmd.Argc() > 1) {
MSG.WriteByte(Globals.cls.netchan.message,
Defines.clc_stringcmd);
SZ.Print(Globals.cls.netchan.message, Cmd.Args());
}
// don't forward the first argument
if (Cmd.Argc() > 1) {
MSG.WriteByte(Globals.cls.netchan.message,
Defines.clc_stringcmd);
SZ.Print(Globals.cls.netchan.message, Cmd.Args());
}
};
/**
* Pause_f
*/
static Runnable Pause_f = new Runnable() {
public void run() {
// never pause in multiplayer
static Runnable Pause_f = () -> {
// never pause in multiplayer
if (Cvar.VariableValue("maxclients") > 1
|| Globals.server_state == 0) {
Cvar.SetValue("paused", 0);
return;
}
Cvar.SetValue("paused", Globals.cl_paused.value);
if (Cvar.VariableValue("maxclients") > 1
|| Globals.server_state == 0) {
Cvar.SetValue("paused", 0);
return;
}
Cvar.SetValue("paused", Globals.cl_paused.value);
};
/**
* Quit_f
*/
static Runnable Quit_f = new Runnable() {
public void run() {
Disconnect();
Com.Quit();
}
static Runnable Quit_f = () -> {
Disconnect();
Com.Quit();
};
/**
* Connect_f
*/
static Runnable Connect_f = new Runnable() {
public void run() {
String server;
static Runnable Connect_f = () -> {
String server;
if (Cmd.Argc() != 2) {
log.info("usage: connect <server>");
return;
}
if (Globals.server_state != 0) {
// if running a local server, kill it and reissue
SV_MAIN.SV_Shutdown("Server quit\n", false);
} else {
Disconnect();
}
server = Cmd.Argv(1);
NET.Config(true); // allow remote
Disconnect();
Globals.cls.state = Defines.ca_connecting;
//strncpy (cls.servername, server, sizeof(cls.servername)-1);
Globals.cls.servername = server;
Globals.cls.connect_time = -99999;
// CL_CheckForResend() will fire immediately
if (Cmd.Argc() != 2) {
log.info("usage: connect <server>");
return;
}
if (Globals.server_state != 0) {
// if running a local server, kill it and reissue
SV_MAIN.SV_Shutdown("Server quit\n", false);
} else {
Disconnect();
}
server = Cmd.Argv(1);
NET.Config(true); // allow remote
Disconnect();
Globals.cls.state = Defines.ca_connecting;
//strncpy (cls.servername, server, sizeof(cls.servername)-1);
Globals.cls.servername = server;
Globals.cls.connect_time = -99999;
// CL_CheckForResend() will fire immediately
};
/**
@@ -327,77 +315,69 @@ public final class CL {
*
* Send the rest of the command line over as an unconnected command.
*/
static Runnable Rcon_f = new Runnable() {
public void run() {
static Runnable Rcon_f = () -> {
if (Globals.rcon_client_password.string.length() == 0) {
log.warn("You must set 'rcon_password' before\nissuing an rcon command.");
if (Globals.rcon_client_password.string.length() == 0) {
log.warn("You must set 'rcon_password' before\nissuing an rcon command.");
return;
}
StringBuffer message = new StringBuffer(1024);
// connection less packet
message.append('\u00ff');
message.append('\u00ff');
message.append('\u00ff');
message.append('\u00ff');
// allow remote
NET.Config(true);
message.append("rcon ");
message.append(Globals.rcon_client_password.string);
message.append(" ");
for (int i = 1; i < Cmd.Argc(); i++) {
message.append(Cmd.Argv(i));
message.append(" ");
}
netadr_t to = new netadr_t();
if (Globals.cls.state >= Defines.ca_connected)
to = Globals.cls.netchan.remote_address;
else {
if (Globals.rcon_address.string.length() == 0) {
log.warn("You must either be connected,\nor set the 'rcon_address' cvar\nto issue rcon commands");
return;
}
StringBuffer message = new StringBuffer(1024);
// connection less packet
message.append('\u00ff');
message.append('\u00ff');
message.append('\u00ff');
message.append('\u00ff');
// allow remote
NET.Config(true);
message.append("rcon ");
message.append(Globals.rcon_client_password.string);
message.append(" ");
for (int i = 1; i < Cmd.Argc(); i++) {
message.append(Cmd.Argv(i));
message.append(" ");
}
netadr_t to = new netadr_t();
if (Globals.cls.state >= Defines.ca_connected)
to = Globals.cls.netchan.remote_address;
else {
if (Globals.rcon_address.string.length() == 0) {
log.warn("You must either be connected,\nor set the 'rcon_address' cvar\nto issue rcon commands");
return;
}
NET.StringToAdr(Globals.rcon_address.string, to);
if (to.port == 0) to.port = Defines.PORT_SERVER;
}
message.append('\0');
String b = message.toString();
NET.SendPacket(Defines.NS_CLIENT, b.length(), Lib.stringToBytes(b), to);
NET.StringToAdr(Globals.rcon_address.string, to);
if (to.port == 0) to.port = Defines.PORT_SERVER;
}
message.append('\0');
String b = message.toString();
NET.SendPacket(Defines.NS_CLIENT, b.length(), Lib.stringToBytes(b), to);
};
static Runnable Disconnect_f = new Runnable() {
public void run() {
Com.Error(Defines.ERR_DROP, "Disconnected from server");
}
};
static Runnable Disconnect_f = () -> Com.Error(Defines.ERR_DROP, "Disconnected from server");
/**
* Changing_f
*
* Just sent as a hint to the client that they should drop to full console.
*/
static Runnable Changing_f = new Runnable() {
public void run() {
//ZOID
//if we are downloading, we don't change!
// This so we don't suddenly stop downloading a map
static Runnable Changing_f = () -> {
//ZOID
//if we are downloading, we don't change!
// This so we don't suddenly stop downloading a map
if (Globals.cls.download != null)
return;
if (Globals.cls.download != null)
return;
SCR.BeginLoadingPlaque();
Globals.cls.state = Defines.ca_connected; // not active anymore, but
// not disconnected
log.info("Changing map...");
}
SCR.BeginLoadingPlaque();
Globals.cls.state = Defines.ca_connected; // not active anymore, but
// not disconnected
log.info("Changing map...");
};
/**
@@ -405,93 +385,89 @@ public final class CL {
*
* The server is changing levels.
*/
static Runnable Reconnect_f = new Runnable() {
public void run() {
//ZOID
//if we are downloading, we don't change! This so we don't suddenly
// stop downloading a map
if (Globals.cls.download != null)
return;
static Runnable Reconnect_f = () -> {
//ZOID
//if we are downloading, we don't change! This so we don't suddenly
// stop downloading a map
if (Globals.cls.download != null)
return;
S.StopAllSounds();
if (Globals.cls.state == Defines.ca_connected) {
log.info("reconnecting...");
Globals.cls.state = Defines.ca_connected;
MSG.WriteChar(Globals.cls.netchan.message,
Defines.clc_stringcmd);
MSG.WriteString(Globals.cls.netchan.message, "new");
return;
}
S.StopAllSounds();
if (Globals.cls.state == Defines.ca_connected) {
log.info("reconnecting...");
Globals.cls.state = Defines.ca_connected;
MSG.WriteChar(Globals.cls.netchan.message,
Defines.clc_stringcmd);
MSG.WriteString(Globals.cls.netchan.message, "new");
return;
}
if (Globals.cls.servername != null) {
if (Globals.cls.state >= Defines.ca_connected) {
Disconnect();
Globals.cls.connect_time = Globals.cls.realtime - 1500;
} else
Globals.cls.connect_time = -99999; // fire immediately
if (Globals.cls.servername != null) {
if (Globals.cls.state >= Defines.ca_connected) {
Disconnect();
Globals.cls.connect_time = Globals.cls.realtime - 1500;
} else
Globals.cls.connect_time = -99999; // fire immediately
Globals.cls.state = Defines.ca_connecting;
log.info("reconnecting...");
}
Globals.cls.state = Defines.ca_connecting;
log.info("reconnecting...");
}
};
/**
* PingServers_f
*/
static Runnable PingServers_f = new Runnable() {
public void run() {
int i;
netadr_t adr = new netadr_t();
//char name[32];
String name;
String adrstring;
cvar_t noudp;
cvar_t noipx;
static Runnable PingServers_f = () -> {
int i;
netadr_t adr = new netadr_t();
//char name[32];
String name;
String adrstring;
cvar_t noudp;
cvar_t noipx;
NET.Config(true); // allow remote
NET.Config(true); // allow remote
// send a broadcast packet
log.info("pinging broadcast...");
// send a broadcast packet
log.info("pinging broadcast...");
noudp = Cvar.Get("noudp", "0", Defines.CVAR_NOSET);
if (noudp.value == 0.0f) {
adr.type = Defines.NA_BROADCAST;
adr.port = Defines.PORT_SERVER;
//adr.port = BigShort(PORT_SERVER);
Netchan.OutOfBandPrint(Defines.NS_CLIENT, adr, "info "
+ Defines.PROTOCOL_VERSION);
noudp = Cvar.Get("noudp", "0", Defines.CVAR_NOSET);
if (noudp.value == 0.0f) {
adr.type = Defines.NA_BROADCAST;
adr.port = Defines.PORT_SERVER;
//adr.port = BigShort(PORT_SERVER);
Netchan.OutOfBandPrint(Defines.NS_CLIENT, adr, "info "
+ Defines.PROTOCOL_VERSION);
}
// we use no IPX
noipx = Cvar.Get("noipx", "1", Defines.CVAR_NOSET);
if (noipx.value == 0.0f) {
adr.type = Defines.NA_BROADCAST_IPX;
//adr.port = BigShort(PORT_SERVER);
adr.port = Defines.PORT_SERVER;
Netchan.OutOfBandPrint(Defines.NS_CLIENT, adr, "info "
+ Defines.PROTOCOL_VERSION);
}
// send a packet to each address book entry
for (i = 0; i < 16; i++) {
//Com_sprintf (name, sizeof(name), "adr%i", i);
name = "adr" + i;
adrstring = Cvar.VariableString(name);
if (adrstring == null || adrstring.length() == 0)
continue;
log.info("pinging {} ...", adrstring);
if (!NET.StringToAdr(adrstring, adr)) {
log.warn("Bad address: {}", adrstring);
continue;
}
// we use no IPX
noipx = Cvar.Get("noipx", "1", Defines.CVAR_NOSET);
if (noipx.value == 0.0f) {
adr.type = Defines.NA_BROADCAST_IPX;
if (adr.port == 0)
//adr.port = BigShort(PORT_SERVER);
adr.port = Defines.PORT_SERVER;
Netchan.OutOfBandPrint(Defines.NS_CLIENT, adr, "info "
+ Defines.PROTOCOL_VERSION);
}
// send a packet to each address book entry
for (i = 0; i < 16; i++) {
//Com_sprintf (name, sizeof(name), "adr%i", i);
name = "adr" + i;
adrstring = Cvar.VariableString(name);
if (adrstring == null || adrstring.length() == 0)
continue;
log.info("pinging {} ...", adrstring);
if (!NET.StringToAdr(adrstring, adr)) {
log.warn("Bad address: {}", adrstring);
continue;
}
if (adr.port == 0)
//adr.port = BigShort(PORT_SERVER);
adr.port = Defines.PORT_SERVER;
Netchan.OutOfBandPrint(Defines.NS_CLIENT, adr, "info "
+ Defines.PROTOCOL_VERSION);
}
Netchan.OutOfBandPrint(Defines.NS_CLIENT, adr, "info "
+ Defines.PROTOCOL_VERSION);
}
};
@@ -500,29 +476,25 @@ public final class CL {
*
* Load or download any custom player skins and models.
*/
static Runnable Skins_f = new Runnable() {
public void run() {
int i;
static Runnable Skins_f = () -> {
int i;
for (i = 0; i < Defines.MAX_CLIENTS; i++) {
if (Globals.cl.configstrings[Defines.CS_PLAYERSKINS + i] == null)
continue;
log.info("client {}: {}", i, Globals.cl.configstrings[Defines.CS_PLAYERSKINS + i]);
SCR.UpdateScreen();
Sys.SendKeyEvents(); // pump message loop
CL_parse.ParseClientinfo(i);
}
for (i = 0; i < Defines.MAX_CLIENTS; i++) {
if (Globals.cl.configstrings[Defines.CS_PLAYERSKINS + i] == null)
continue;
log.info("client {}: {}", i, Globals.cl.configstrings[Defines.CS_PLAYERSKINS + i]);
SCR.UpdateScreen();
Sys.SendKeyEvents(); // pump message loop
CL_parse.ParseClientinfo(i);
}
};
/**
* Userinfo_f
*/
static Runnable Userinfo_f = new Runnable() {
public void run() {
log.info("User info settings:");
Info.Print(Cvar.Userinfo());
}
static Runnable Userinfo_f = () -> {
log.info("User info settings:");
Info.Print(Cvar.Userinfo());
};
/**
@@ -531,12 +503,10 @@ public final class CL {
* Restart the sound subsystem so it can pick up new parameters and flush
* all sounds.
*/
static Runnable Snd_Restart_f = new Runnable() {
public void run() {
S.Shutdown();
S.Init();
CL_parse.RegisterSounds();
}
static Runnable Snd_Restart_f = () -> {
S.Shutdown();
S.Init();
CL_parse.RegisterSounds();
};
// ENV_CNT is map load, ENV_CNT+1 is first env map
@@ -551,28 +521,26 @@ public final class CL {
* The server will send this command right before allowing the client into
* the server.
*/
static Runnable Precache_f = new Runnable() {
public void run() {
// Yet another hack to let old demos work the old precache sequence.
if (Cmd.Argc() < 2) {
static Runnable Precache_f = () -> {
// Yet another hack to let old demos work the old precache sequence.
if (Cmd.Argc() < 2) {
int iw[] = { 0 }; // for detecting cheater maps
int iw[] = { 0 }; // for detecting cheater maps
CM.CM_LoadMap(Globals.cl.configstrings[Defines.CS_MODELS + 1],
true, iw);
CM.CM_LoadMap(Globals.cl.configstrings[Defines.CS_MODELS + 1],
true, iw);
CL_parse.RegisterSounds();
CL_view.PrepRefresh();
return;
}
CL.precache_check = Defines.CS_MODELS;
CL.precache_spawncount = Lib.atoi(Cmd.Argv(1));
CL.precache_model = null;
CL.precache_model_skin = 0;
RequestNextDownload();
CL_parse.RegisterSounds();
CL_view.PrepRefresh();
return;
}
CL.precache_check = Defines.CS_MODELS;
CL.precache_spawncount = Lib.atoi(Cmd.Argv(1));
CL.precache_model = null;
CL.precache_model_skin = 0;
RequestNextDownload();
};
private static int extratime;

193
src/lwjake2/client/CL_input.java
View File

@@ -486,167 +486,38 @@ public class CL_input {
* ============ CL_InitInput ============
*/
static void InitInput() {
Cmd.AddCommand("centerview", new Runnable() {
public void run() {
IN.CenterView();
}
});
Cmd.AddCommand("+moveup", new Runnable() {
public void run() {
IN_UpDown();
}
});
Cmd.AddCommand("-moveup", new Runnable() {
public void run() {
IN_UpUp();
}
});
Cmd.AddCommand("+movedown", new Runnable() {
public void run() {
IN_DownDown();
}
});
Cmd.AddCommand("-movedown", new Runnable() {
public void run() {
IN_DownUp();
}
});
Cmd.AddCommand("+left", new Runnable() {
public void run() {
IN_LeftDown();
}
});
Cmd.AddCommand("-left", new Runnable() {
public void run() {
IN_LeftUp();
}
});
Cmd.AddCommand("+right", new Runnable() {
public void run() {
IN_RightDown();
}
});
Cmd.AddCommand("-right", new Runnable() {
public void run() {
IN_RightUp();
}
});
Cmd.AddCommand("+forward", new Runnable() {
public void run() {
IN_ForwardDown();
}
});
Cmd.AddCommand("-forward", new Runnable() {
public void run() {
IN_ForwardUp();
}
});
Cmd.AddCommand("+back", new Runnable() {
public void run() {
IN_BackDown();
}
});
Cmd.AddCommand("-back", new Runnable() {
public void run() {
IN_BackUp();
}
});
Cmd.AddCommand("+lookup", new Runnable() {
public void run() {
IN_LookupDown();
}
});
Cmd.AddCommand("-lookup", new Runnable() {
public void run() {
IN_LookupUp();
}
});
Cmd.AddCommand("+lookdown", new Runnable() {
public void run() {
IN_LookdownDown();
}
});
Cmd.AddCommand("-lookdown", new Runnable() {
public void run() {
IN_LookdownUp();
}
});
Cmd.AddCommand("+strafe", new Runnable() {
public void run() {
IN_StrafeDown();
}
});
Cmd.AddCommand("-strafe", new Runnable() {
public void run() {
IN_StrafeUp();
}
});
Cmd.AddCommand("+moveleft", new Runnable() {
public void run() {
IN_MoveleftDown();
}
});
Cmd.AddCommand("-moveleft", new Runnable() {
public void run() {
IN_MoveleftUp();
}
});
Cmd.AddCommand("+moveright", new Runnable() {
public void run() {
IN_MoverightDown();
}
});
Cmd.AddCommand("-moveright", new Runnable() {
public void run() {
IN_MoverightUp();
}
});
Cmd.AddCommand("+speed", new Runnable() {
public void run() {
IN_SpeedDown();
}
});
Cmd.AddCommand("-speed", new Runnable() {
public void run() {
IN_SpeedUp();
}
});
Cmd.AddCommand("+attack", new Runnable() {
public void run() {
IN_AttackDown();
}
});
Cmd.AddCommand("-attack", new Runnable() {
public void run() {
IN_AttackUp();
}
});
Cmd.AddCommand("+use", new Runnable() {
public void run() {
IN_UseDown();
}
});
Cmd.AddCommand("-use", new Runnable() {
public void run() {
IN_UseUp();
}
});
Cmd.AddCommand("impulse", new Runnable() {
public void run() {
IN_Impulse();
}
});
Cmd.AddCommand("+klook", new Runnable() {
public void run() {
IN_KLookDown();
}
});
Cmd.AddCommand("-klook", new Runnable() {
public void run() {
IN_KLookUp();
}
});
Cmd.AddCommand("centerview", IN::CenterView);
Cmd.AddCommand("+moveup", CL_input::IN_UpDown);
Cmd.AddCommand("-moveup", CL_input::IN_UpUp);
Cmd.AddCommand("+movedown", CL_input::IN_DownDown);
Cmd.AddCommand("-movedown", CL_input::IN_DownUp);
Cmd.AddCommand("+left", CL_input::IN_LeftDown);
Cmd.AddCommand("-left", CL_input::IN_LeftUp);
Cmd.AddCommand("+right", CL_input::IN_RightDown);
Cmd.AddCommand("-right", CL_input::IN_RightUp);
Cmd.AddCommand("+forward", CL_input::IN_ForwardDown);
Cmd.AddCommand("-forward", CL_input::IN_ForwardUp);
Cmd.AddCommand("+back", CL_input::IN_BackDown);
Cmd.AddCommand("-back", CL_input::IN_BackUp);
Cmd.AddCommand("+lookup", CL_input::IN_LookupDown);
Cmd.AddCommand("-lookup", CL_input::IN_LookupUp);
Cmd.AddCommand("+lookdown", CL_input::IN_LookdownDown);
Cmd.AddCommand("-lookdown", CL_input::IN_LookdownUp);
Cmd.AddCommand("+strafe", CL_input::IN_StrafeDown);
Cmd.AddCommand("-strafe", CL_input::IN_StrafeUp);
Cmd.AddCommand("+moveleft", CL_input::IN_MoveleftDown);
Cmd.AddCommand("-moveleft", CL_input::IN_MoveleftUp);
Cmd.AddCommand("+moveright", CL_input::IN_MoverightDown);
Cmd.AddCommand("-moveright", CL_input::IN_MoverightUp);
Cmd.AddCommand("+speed", CL_input::IN_SpeedDown);
Cmd.AddCommand("-speed", CL_input::IN_SpeedUp);
Cmd.AddCommand("+attack", CL_input::IN_AttackDown);
Cmd.AddCommand("-attack", CL_input::IN_AttackUp);
Cmd.AddCommand("+use", CL_input::IN_UseDown);
Cmd.AddCommand("-use", CL_input::IN_UseUp);
Cmd.AddCommand("impulse", CL_input::IN_Impulse);
Cmd.AddCommand("+klook", CL_input::IN_KLookDown);
Cmd.AddCommand("-klook", CL_input::IN_KLookUp);
cl_nodelta = Cvar.Get("cl_nodelta", "0", 0);
}

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

@@ -134,44 +134,42 @@ public class CL_parse {
*
* Request a download from the server ===============
*/
public static Runnable Download_f = new Runnable() {
public void run() {
String filename;
public static Runnable Download_f = () -> {
String filename;
if (Cmd.Argc() != 2) {
Com.Printf("Usage: download <filename>\n");
return;
}
filename = Cmd.Argv(1);
if (filename.indexOf("..") != -1) {
Com.Printf("Refusing to download a path with ..\n");
return;
}
if (fileSystem.loadFile(filename) != null) { // it exists, no need to
// download
Com.Printf("File already exists.\n");
return;
}
Globals.cls.downloadname = filename;
Com.Printf("Downloading " + Globals.cls.downloadname + "\n");
// download to a temp name, and only rename
// to the real name when done, so if interrupted
// a runt file wont be left
Globals.cls.downloadtempname = Com
.StripExtension(Globals.cls.downloadname);
Globals.cls.downloadtempname += ".tmp";
MSG.WriteByte(Globals.cls.netchan.message, Defines.clc_stringcmd);
MSG.WriteString(Globals.cls.netchan.message, "download "
+ Globals.cls.downloadname);
Globals.cls.downloadnumber++;
if (Cmd.Argc() != 2) {
Com.Printf("Usage: download <filename>\n");
return;
}
filename = Cmd.Argv(1);
if (filename.indexOf("..") != -1) {
Com.Printf("Refusing to download a path with ..\n");
return;
}
if (fileSystem.loadFile(filename) != null) { // it exists, no need to
// download
Com.Printf("File already exists.\n");
return;
}
Globals.cls.downloadname = filename;
Com.Printf("Downloading " + Globals.cls.downloadname + "\n");
// download to a temp name, and only rename
// to the real name when done, so if interrupted
// a runt file wont be left
Globals.cls.downloadtempname = Com
.StripExtension(Globals.cls.downloadname);
Globals.cls.downloadtempname += ".tmp";
MSG.WriteByte(Globals.cls.netchan.message, Defines.clc_stringcmd);
MSG.WriteString(Globals.cls.netchan.message, "download "
+ Globals.cls.downloadname);
Globals.cls.downloadnumber++;
};
/*

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

@@ -40,107 +40,99 @@ import java.util.Arrays;
@Slf4j
public final class Console extends Globals {
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
public static Runnable ToggleConsole_f = new Runnable() {
public void run() {
SCR.EndLoadingPlaque(); // get rid of loading plaque
public static Runnable ToggleConsole_f = () -> {
SCR.EndLoadingPlaque(); // get rid of loading plaque
if (Globals.cl.attractloop) {
Cbuf.AddText("killserver\n");
return;
}
if (Globals.cl.attractloop) {
Cbuf.AddText("killserver\n");
return;
}
if (Globals.cls.state == Defines.ca_disconnected) {
// start the demo loop again
Cbuf.AddText("d1\n");
return;
}
if (Globals.cls.state == Defines.ca_disconnected) {
// start the demo loop again
Cbuf.AddText("d1\n");
return;
}
Key.ClearTyping();
Console.ClearNotify();
Key.ClearTyping();
Console.ClearNotify();
if (Globals.cls.key_dest == Defines.key_console) {
Menu.ForceMenuOff();
Cvar.Set("paused", "0");
} else {
Menu.ForceMenuOff();
Globals.cls.key_dest = Defines.key_console;
if (Globals.cls.key_dest == Defines.key_console) {
Menu.ForceMenuOff();
Cvar.Set("paused", "0");
} else {
Menu.ForceMenuOff();
Globals.cls.key_dest = Defines.key_console;
if (Cvar.VariableValue("maxclients") == 1
&& Globals.server_state != 0)
Cvar.Set("paused", "1");
}
if (Cvar.VariableValue("maxclients") == 1
&& Globals.server_state != 0)
Cvar.Set("paused", "1");
}
};
public static Runnable Clear_f = new Runnable() {
public void run() {
Arrays.fill(Globals.con.text, (byte) ' ');
public static Runnable Clear_f = () -> Arrays.fill(Globals.con.text, (byte) ' ');
public static Runnable Dump_f = () -> {
int l, x;
int line;
RandomAccessFile f;
byte[] buffer = new byte[1024];
String name;
if (Cmd.Argc() != 2) {
log.info("usage: condump <filename>");
return;
}
};
public static Runnable Dump_f = new Runnable() {
public void run() {
//Com_sprintf (name, sizeof(name), "%s/%s.txt", FS_Gamedir(),
// Cmd_Argv(1));
name = fileSystem.getGamedir() + "/" + Cmd.Argv(1) + ".txt";
int l, x;
int line;
RandomAccessFile f;
byte[] buffer = new byte[1024];
String name;
log.info("Dumped console text to {}", name);
fileSystem.createPath(name);
f = Lib.fopen(name, "rw");
if (f == null) {
log.error("ERROR: couldn't open.");
return;
}
if (Cmd.Argc() != 2) {
log.info("usage: condump <filename>");
// skip empty lines
for (l = con.current - con.totallines + 1; l <= con.current; l++) {
line = (l % con.totallines) * con.linewidth;
for (x = 0; x < con.linewidth; x++)
if (con.text[line + x] != ' ')
break;
if (x != con.linewidth)
break;
}
return;
}
//Com_sprintf (name, sizeof(name), "%s/%s.txt", FS_Gamedir(),
// Cmd_Argv(1));
name = fileSystem.getGamedir() + "/" + Cmd.Argv(1) + ".txt";
log.info("Dumped console text to {}", name);
fileSystem.createPath(name);
f = Lib.fopen(name, "rw");
if (f == null) {
log.error("ERROR: couldn't open.");
return;
}
// skip empty lines
for (l = con.current - con.totallines + 1; l <= con.current; l++) {
line = (l % con.totallines) * con.linewidth;
for (x = 0; x < con.linewidth; x++)
if (con.text[line + x] != ' ')
break;
if (x != con.linewidth)
// write the remaining lines
buffer[con.linewidth] = 0;
for (; l <= con.current; l++) {
line = (l % con.totallines) * con.linewidth;
//strncpy (buffer, line, con.linewidth);
System.arraycopy(con.text, line, buffer, 0, con.linewidth);
for (x = con.linewidth - 1; x >= 0; x--) {
if (buffer[x] == ' ')
buffer[x] = 0;
else
break;
}
for (x = 0; buffer[x] != 0; x++)
buffer[x] &= 0x7f;
// write the remaining lines
buffer[con.linewidth] = 0;
for (; l <= con.current; l++) {
line = (l % con.totallines) * con.linewidth;
//strncpy (buffer, line, con.linewidth);
System.arraycopy(con.text, line, buffer, 0, con.linewidth);
for (x = con.linewidth - 1; x >= 0; x--) {
if (buffer[x] == ' ')
buffer[x] = 0;
else
break;
}
for (x = 0; buffer[x] != 0; x++)
buffer[x] &= 0x7f;
buffer[x] = '\n';
// fprintf (f, "%s\n", buffer);
try {
f.write(buffer, 0, x + 1);
} catch (IOException e) {
}
buffer[x] = '\n';
// fprintf (f, "%s\n", buffer);
try {
f.write(buffer, 0, x + 1);
} catch (IOException e) {
}
Lib.fclose(f);
}
Lib.fclose(f);
};
/**
@@ -245,40 +237,34 @@ public final class Console extends Globals {
/*
* ================ Con_ToggleChat_f ================
*/
static Runnable ToggleChat_f = new Runnable() {
public void run() {
Key.ClearTyping();
static Runnable ToggleChat_f = () -> {
Key.ClearTyping();
if (cls.key_dest == key_console) {
if (cls.state == ca_active) {
Menu.ForceMenuOff();
cls.key_dest = key_game;
}
} else
cls.key_dest = key_console;
if (cls.key_dest == key_console) {
if (cls.state == ca_active) {
Menu.ForceMenuOff();
cls.key_dest = key_game;
}
} else
cls.key_dest = key_console;
ClearNotify();
}
ClearNotify();
};
/*
* ================ Con_MessageMode_f ================
*/
static Runnable MessageMode_f = new Runnable() {
public void run() {
chat_team = false;
cls.key_dest = key_message;
}
static Runnable MessageMode_f = () -> {
chat_team = false;
cls.key_dest = key_message;
};
/*
* ================ Con_MessageMode2_f ================
*/
static Runnable MessageMode2_f = new Runnable() {
public void run() {
chat_team = true;
cls.key_dest = key_message;
}
static Runnable MessageMode2_f = () -> {
chat_team = true;
cls.key_dest = key_message;
};
/*

24
src/lwjake2/client/Key.java
View File

@@ -715,11 +715,7 @@ public class Key extends Globals {
return;
}
public static Runnable Bind_f = new Runnable() {
public void run() {
Key_Bind_f();
}
};
public static Runnable Bind_f = Key::Key_Bind_f;
static void Key_Bind_f() {
int c = Cmd.Argc();
@@ -763,11 +759,7 @@ public class Key extends Globals {
Globals.keybindings[keynum] = binding;
}
static Runnable Unbind_f = new Runnable() {
public void run() {
Key_Unbind_f();
}
};
static Runnable Unbind_f = Key::Key_Unbind_f;
static void Key_Unbind_f() {
@@ -785,22 +777,14 @@ public class Key extends Globals {
Key.SetBinding(b, null);
}
static Runnable Unbindall_f = new Runnable() {
public void run() {
Key_Unbindall_f();
}
};
static Runnable Unbindall_f = Key::Key_Unbindall_f;
static void Key_Unbindall_f() {
for (int i = 0; i < 256; i++)
Key.SetBinding(i, null);
}
static Runnable Bindlist_f = new Runnable() {
public void run() {
Key_Bindlist_f();
}
};
static Runnable Bindlist_f = Key::Key_Bindlist_f;
static void Key_Bindlist_f() {
for (int i = 0; i < 256; i++)

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

@@ -439,11 +439,7 @@ public final class Menu extends Key {
*/
static final int MAIN_ITEMS = 5;
static Runnable Main_Draw = new Runnable() {
public void run() {
Main_Draw();
}
};
static Runnable Main_Draw = Menu::Main_Draw;
static void Main_Draw() {
int i;
@@ -544,18 +540,10 @@ public final class Menu extends Key {
return null;
}
static Runnable Menu_Main = new Runnable() {
public void run() {
Menu_Main_f();
}
};
static Runnable Menu_Main = Menu::Menu_Main_f;
static void Menu_Main_f() {
PushMenu(new Runnable() {
public void run() {
Main_Draw();
}
}, new keyfunc_t() {
PushMenu(Menu::Main_Draw, new keyfunc_t() {
public String execute(int key) {
return Main_Key(key);
}
@@ -646,19 +634,11 @@ public final class Menu extends Key {
return Default_MenuKey(s_multiplayer_menu, key);
}
static Runnable Menu_Multiplayer = new Runnable() {
public void run() {
Menu_Multiplayer_f();
}
};
static Runnable Menu_Multiplayer = Menu::Menu_Multiplayer_f;
static void Menu_Multiplayer_f() {
Multiplayer_MenuInit();
PushMenu(new Runnable() {
public void run() {
Multiplayer_MenuDraw();
}
}, new keyfunc_t() {
PushMenu(Menu::Multiplayer_MenuDraw, new keyfunc_t() {
public String execute(int key) {
return Multiplayer_MenuKey(key);
}
@@ -1158,11 +1138,7 @@ public final class Menu extends Key {
Menu_Center(s_keys_menu);
}
static Runnable Keys_MenuDraw = new Runnable() {
public void run() {
Keys_MenuDraw_f();
}
};
static Runnable Keys_MenuDraw = Menu::Keys_MenuDraw_f;
static void Keys_MenuDraw_f() {
Menu_AdjustCursor(s_keys_menu, 1);
@@ -1211,19 +1187,11 @@ public final class Menu extends Key {
}
}
static Runnable Menu_Keys = new Runnable() {
public void run() {
Menu_Keys_f();
}
};
static Runnable Menu_Keys = Menu::Menu_Keys_f;
static void Menu_Keys_f() {
Keys_MenuInit();
PushMenu(new Runnable() {
public void run() {
Keys_MenuDraw_f();
}
}, new keyfunc_t() {
PushMenu(Menu::Keys_MenuDraw_f, new keyfunc_t() {
public String execute(int key) {
return Keys_MenuKey_f(key);
}
@@ -1654,19 +1622,11 @@ public final class Menu extends Key {
return Default_MenuKey(s_options_menu, key);
}
static Runnable Menu_Options = new Runnable() {
public void run() {
Menu_Options_f();
}
};
static Runnable Menu_Options = Menu::Menu_Options_f;
static void Menu_Options_f() {
Options_MenuInit();
PushMenu(new Runnable() {
public void run() {
Options_MenuDraw();
}
}, new keyfunc_t() {
PushMenu(Menu::Options_MenuDraw, new keyfunc_t() {
public String execute(int key) {
return Options_MenuKey(key);
}
@@ -1681,19 +1641,11 @@ public final class Menu extends Key {
* =======================================================================
*/
static Runnable Menu_Video = new Runnable() {
public void run() {
Menu_Video_f();
}
};
static Runnable Menu_Video = Menu::Menu_Video_f;
static void Menu_Video_f() {
VID.MenuInit();
PushMenu(new Runnable() {
public void run() {
VID.MenuDraw();
}
}, new keyfunc_t() {
PushMenu(VID::MenuDraw, new keyfunc_t() {
public String execute(int key) {
return VID.MenuKey(key);
}
@@ -1898,11 +1850,7 @@ public final class Menu extends Key {
}
static Runnable Menu_Credits = new Runnable() {
public void run() {
Menu_Credits_f();
}
};
static Runnable Menu_Credits = Menu::Menu_Credits_f;
static void Menu_Credits_f() {
int n;
@@ -1934,11 +1882,7 @@ public final class Menu extends Key {
}
credits_start_time = cls.realtime;
PushMenu(new Runnable() {
public void run() {
Credits_MenuDraw();
}
}, new keyfunc_t() {
PushMenu(Menu::Credits_MenuDraw, new keyfunc_t() {
public String execute(int key) {
return Credits_Key(key);
}
@@ -2109,19 +2053,11 @@ public final class Menu extends Key {
return Default_MenuKey(s_game_menu, key);
}
static Runnable Menu_Game = new Runnable() {
public void run() {
Menu_Game_f();
}
};
static Runnable Menu_Game = Menu::Menu_Game_f;
static void Menu_Game_f() {
Game_MenuInit();
PushMenu(new Runnable() {
public void run() {
Game_MenuDraw();
}
}, new keyfunc_t() {
PushMenu(Menu::Game_MenuDraw, new keyfunc_t() {
public String execute(int key) {
return Game_MenuKey(key);
}
@@ -2239,19 +2175,11 @@ public final class Menu extends Key {
return Default_MenuKey(s_loadgame_menu, key);
}
static Runnable Menu_LoadGame = new Runnable() {
public void run() {
Menu_LoadGame_f();
}
};
static Runnable Menu_LoadGame = Menu::Menu_LoadGame_f;
static void Menu_LoadGame_f() {
LoadGame_MenuInit();
PushMenu(new Runnable() {
public void run() {
LoadGame_MenuDraw();
}
}, new keyfunc_t() {
PushMenu(Menu::LoadGame_MenuDraw, new keyfunc_t() {
public String execute(int key) {
return LoadGame_MenuKey(key);
}
@@ -2325,22 +2253,14 @@ public final class Menu extends Key {
return Default_MenuKey(s_savegame_menu, key);
}
static Runnable Menu_SaveGame = new Runnable() {
public void run() {
Menu_SaveGame_f();
}
};
static Runnable Menu_SaveGame = Menu::Menu_SaveGame_f;
static void Menu_SaveGame_f() {
if (0 == Globals.server_state)
return; // not playing a game
SaveGame_MenuInit();
PushMenu(new Runnable() {
public void run() {
SaveGame_MenuDraw();
}
}, new keyfunc_t() {
PushMenu(Menu::SaveGame_MenuDraw, new keyfunc_t() {
public String execute(int key) {
return SaveGame_MenuKey(key);
}
@@ -2521,19 +2441,11 @@ public final class Menu extends Key {
return Default_MenuKey(s_joinserver_menu, key);
}
static Runnable Menu_JoinServer = new Runnable() {
public void run() {
Menu_JoinServer_f();
}
};
static Runnable Menu_JoinServer = Menu::Menu_JoinServer_f;
static void Menu_JoinServer_f() {
JoinServer_MenuInit();
PushMenu(new Runnable() {
public void run() {
JoinServer_MenuDraw();
}
}, new keyfunc_t() {
PushMenu(Menu::JoinServer_MenuDraw, new keyfunc_t() {
public String execute(int key) {
return JoinServer_MenuKey(key);
}
@@ -2906,17 +2818,9 @@ public final class Menu extends Key {
return Default_MenuKey(s_startserver_menu, key);
}
static Runnable Menu_StartServer = new Runnable() {
public void run() {
Menu_StartServer_f();
}
};
static Runnable Menu_StartServer = Menu::Menu_StartServer_f;
static Runnable startServer_MenuDraw = new Runnable() {
public void run() {
StartServer_MenuDraw();
}
};
static Runnable startServer_MenuDraw = Menu::StartServer_MenuDraw;
static keyfunc_t startServer_MenuKey = new keyfunc_t() {
public String execute(int key) {
return StartServer_MenuKey(key);
@@ -3380,19 +3284,11 @@ public final class Menu extends Key {
return Default_MenuKey(s_dmoptions_menu, key);
}
static Runnable Menu_DMOptions = new Runnable() {
public void run() {
Menu_DMOptions_f();
}
};
static Runnable Menu_DMOptions = Menu::Menu_DMOptions_f;
static void Menu_DMOptions_f() {
DMOptions_MenuInit();
PushMenu(new Runnable() {
public void run() {
DMOptions_MenuDraw();
}
}, new keyfunc_t() {
PushMenu(Menu::DMOptions_MenuDraw, new keyfunc_t() {
public String execute(int key) {
return DMOptions_MenuKey(key);
}
@@ -3545,19 +3441,11 @@ public final class Menu extends Key {
return Default_MenuKey(s_downloadoptions_menu, key);
}
static Runnable Menu_DownloadOptions = new Runnable() {
public void run() {
Menu_DownloadOptions_f();
}
};
static Runnable Menu_DownloadOptions = Menu::Menu_DownloadOptions_f;
static void Menu_DownloadOptions_f() {
DownloadOptions_MenuInit();
PushMenu(new Runnable() {
public void run() {
DownloadOptions_MenuDraw();
}
}, new keyfunc_t() {
PushMenu(Menu::DownloadOptions_MenuDraw, new keyfunc_t() {
public String execute(int key) {
return DownloadOptions_MenuKey(key);
}
@@ -3620,30 +3508,18 @@ public final class Menu extends Key {
return Default_MenuKey(s_addressbook_menu, key);
}
static Runnable AddressBook_MenuDraw = new Runnable() {
public void run() {
AddressBook_MenuDraw_f();
}
};
static Runnable AddressBook_MenuDraw = Menu::AddressBook_MenuDraw_f;
static void AddressBook_MenuDraw_f() {
Banner("m_banner_addressbook");
Menu_Draw(s_addressbook_menu);
}
static Runnable Menu_AddressBook = new Runnable() {
public void run() {
Menu_AddressBook_f();
}
};
static Runnable Menu_AddressBook = Menu::Menu_AddressBook_f;
static void Menu_AddressBook_f() {
AddressBook_MenuInit();
PushMenu(new Runnable() {
public void run() {
AddressBook_MenuDraw_f();
}
}, new keyfunc_t() {
PushMenu(Menu::AddressBook_MenuDraw_f, new keyfunc_t() {
public String execute(int key) {
return AddressBook_MenuKey_f(key);
}
@@ -4181,11 +4057,7 @@ public final class Menu extends Key {
return Default_MenuKey(s_player_config_menu, key);
}
static Runnable Menu_PlayerConfig = new Runnable() {
public void run() {
Menu_PlayerConfig_f();
}
};
static Runnable Menu_PlayerConfig = Menu::Menu_PlayerConfig_f;
static void Menu_PlayerConfig_f() {
if (!PlayerConfig_MenuInit()) {
@@ -4194,11 +4066,7 @@ public final class Menu extends Key {
return;
}
Menu_SetStatusBar(s_multiplayer_menu, null);
PushMenu(new Runnable() {
public void run() {
PlayerConfig_MenuDraw();
}
}, new keyfunc_t() {
PushMenu(Menu::PlayerConfig_MenuDraw, new keyfunc_t() {
public String execute(int key) {
return PlayerConfig_MenuKey(key);
}
@@ -4244,18 +4112,10 @@ public final class Menu extends Key {
re.DrawPic((viddef.width - w) / 2, (viddef.height - h) / 2, "quit");
}
static Runnable Menu_Quit = new Runnable() {
public void run() {
Menu_Quit_f();
}
};
static Runnable Menu_Quit = Menu::Menu_Quit_f;
static void Menu_Quit_f() {
PushMenu(new Runnable() {
public void run() {
Quit_Draw();
}
}, new keyfunc_t() {
PushMenu(Menu::Quit_Draw, new keyfunc_t() {
public String execute(int key) {
return Quit_Key(key);
}

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

@@ -432,31 +432,11 @@ public final class SCR extends Globals {
//
// register our commands
//
Cmd.AddCommand("timerefresh", new Runnable() {
public void run() {
TimeRefresh_f();
}
});
Cmd.AddCommand("loading", new Runnable() {
public void run() {
Loading_f();
}
});
Cmd.AddCommand("sizeup", new Runnable() {
public void run() {
SizeUp_f();
}
});
Cmd.AddCommand("sizedown", new Runnable() {
public void run() {
SizeDown_f();
}
});
Cmd.AddCommand("sky", new Runnable() {
public void run() {
Sky_f();
}
});
Cmd.AddCommand("timerefresh", SCR::TimeRefresh_f);
Cmd.AddCommand("loading", SCR::Loading_f);
Cmd.AddCommand("sizeup", SCR::SizeUp_f);
Cmd.AddCommand("sizedown", SCR::SizeDown_f);
Cmd.AddCommand("sky", SCR::Sky_f);
scr_initialized = true;
}
@@ -1295,11 +1275,7 @@ public final class SCR extends Globals {
crosshair_pic);
}
private static Runnable updateScreenCallback = new Runnable() {
public void run() {
UpdateScreen2();
}
};
private static Runnable updateScreenCallback = SCR::UpdateScreen2;
// wird anstelle von der richtigen UpdateScreen benoetigt
public static void UpdateScreen() {

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

@@ -234,31 +234,25 @@ public final class V extends Globals {
}
}
static Runnable Gun_Next_f = new Runnable() {
public void run() {
gun_frame++;
Com.Printf("frame " + gun_frame + "\n");
}
static Runnable Gun_Next_f = () -> {
gun_frame++;
Com.Printf("frame " + gun_frame + "\n");
};
static Runnable Gun_Prev_f = new Runnable() {
public void run() {
gun_frame--;
if (gun_frame < 0)
gun_frame = 0;
Com.Printf("frame " + gun_frame + "\n");
}
static Runnable Gun_Prev_f = () -> {
gun_frame--;
if (gun_frame < 0)
gun_frame = 0;
Com.Printf("frame " + gun_frame + "\n");
};
static Runnable Gun_Model_f = new Runnable() {
public void run() {
if (Cmd.Argc() != 2) {
gun_model = null;
return;
}
String name = "models/" + Cmd.Argv(1) + "/tris.md2";
gun_model = re.RegisterModel(name);
static Runnable Gun_Model_f = () -> {
if (Cmd.Argc() != 2) {
gun_model = null;
return;
}
String name = "models/" + Cmd.Argv(1) + "/tris.md2";
gun_model = re.RegisterModel(name);
};
/*
@@ -377,16 +371,12 @@ public final class V extends Globals {
/*
* ============= V_Viewpos_f =============
*/
static Runnable Viewpos_f = new Runnable() {
public void run() {
log.info("({} {} {}) : {}",
(int) cl.refdef.vieworg[0],
(int) cl.refdef.vieworg[1],
(int) cl.refdef.vieworg[2],
(int) cl.refdef.viewangles[YAW]
);
}
};
static Runnable Viewpos_f = () -> log.info("({} {} {}) : {}",
(int) cl.refdef.vieworg[0],
(int) cl.refdef.vieworg[1],
(int) cl.refdef.vieworg[2],
(int) cl.refdef.viewangles[YAW]
);
public static void Init() {
Cmd.AddCommand("gun_next", Gun_Next_f);

6
src/lwjake2/client/VID.java
View File

@@ -317,11 +317,7 @@ public class VID extends Globals {
vid_modes[11].height = (int)vid_height.value;
/* Add some console commands that we want to handle */
Cmd.AddCommand ("vid_restart", new Runnable() {
public void run() {
Restart_f();
}
});
Cmd.AddCommand ("vid_restart", VID::Restart_f);
/* Disable the 3Dfx splash screen */
// putenv("FX_GLIDE_NO_SPLASH=0");

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

@@ -36,100 +36,88 @@ import java.util.Vector;
@Slf4j
public final class Cmd {
private static final FileSystem fileSystem = BaseQ2FileSystem.getInstance();
static Runnable List_f = new Runnable() {
public void run() {
cmd_function_t cmd = Cmd.cmd_functions;
int i = 0;
static Runnable List_f = () -> {
cmd_function_t cmd = Cmd.cmd_functions;
int i = 0;
while (cmd != null) {
log.info(cmd.name);
i++;
cmd = cmd.next;
}
log.info("{} commands", i);
while (cmd != null) {
log.info(cmd.name);
i++;
cmd = cmd.next;
}
log.info("{} commands", i);
};
static Runnable Exec_f = new Runnable() {
public void run() {
if (Cmd.Argc() != 2) {
log.info("exec <filename> : execute a script file");
return;
}
byte[] f = null;
f = fileSystem.loadFile(Cmd.Argv(1));
if (f == null) {
log.info("couldn't exec {}", Cmd.Argv(1));
return;
}
log.info("execing {}", Cmd.Argv(1));
Cbuf.InsertText(new String(f));
static Runnable Exec_f = () -> {
if (Cmd.Argc() != 2) {
log.info("exec <filename> : execute a script file");
return;
}
byte[] f = null;
f = fileSystem.loadFile(Cmd.Argv(1));
if (f == null) {
log.info("couldn't exec {}", Cmd.Argv(1));
return;
}
log.info("execing {}", Cmd.Argv(1));
Cbuf.InsertText(new String(f));
};
static Runnable Echo_f = new Runnable() {
public void run() {
StringBuilder sb = new StringBuilder(Cmd.Argc());
for (int i = 1; i < Cmd.Argc(); i++) {
sb.append(Cmd.Argv(i)).append(' ');
}
log.info(sb.toString());
static Runnable Echo_f = () -> {
StringBuilder sb = new StringBuilder(Cmd.Argc());
for (int i = 1; i < Cmd.Argc(); i++) {
sb.append(Cmd.Argv(i)).append(' ');
}
log.info(sb.toString());
};
static Runnable Alias_f = new Runnable() {
public void run() {
cmdalias_t a = null;
if (Cmd.Argc() == 1) {
log.info("Current alias commands:");
for (a = Globals.cmd_alias; a != null; a = a.next) {
log.info("{} : {}", a.name, a.value);
}
return;
}
String s = Cmd.Argv(1);
if (s.length() > Defines.MAX_ALIAS_NAME) {
log.warn("Alias name is too long");
return;
}
// if the alias already exists, reuse it
static Runnable Alias_f = () -> {
cmdalias_t a = null;
if (Cmd.Argc() == 1) {
log.info("Current alias commands:");
for (a = Globals.cmd_alias; a != null; a = a.next) {
if (s.equalsIgnoreCase(a.name)) {
a.value = null;
break;
}
log.info("{} : {}", a.name, a.value);
}
if (a == null) {
a = new cmdalias_t();
a.next = Globals.cmd_alias;
Globals.cmd_alias = a;
}
a.name = s;
// copy the rest of the command line
String cmd = "";
int c = Cmd.Argc();
for (int i = 2; i < c; i++) {
cmd = cmd + Cmd.Argv(i);
if (i != (c - 1))
cmd = cmd + " ";
}
cmd = cmd + "\n";
a.value = cmd;
return;
}
String s = Cmd.Argv(1);
if (s.length() > Defines.MAX_ALIAS_NAME) {
log.warn("Alias name is too long");
return;
}
// if the alias already exists, reuse it
for (a = Globals.cmd_alias; a != null; a = a.next) {
if (s.equalsIgnoreCase(a.name)) {
a.value = null;
break;
}
}
if (a == null) {
a = new cmdalias_t();
a.next = Globals.cmd_alias;
Globals.cmd_alias = a;
}
a.name = s;
// copy the rest of the command line
String cmd = "";
int c = Cmd.Argc();
for (int i = 2; i < c; i++) {
cmd = cmd + Cmd.Argv(i);
if (i != (c - 1))
cmd = cmd + " ";
}
cmd = cmd + "\n";
a.value = cmd;
};
public static Runnable Wait_f = new Runnable() {
public void run() {
Globals.cmd_wait = true;
}
};
public static Runnable Wait_f = () -> Globals.cmd_wait = true;
public static cmd_function_t cmd_functions = null;
@@ -157,18 +145,15 @@ public final class Cmd {
private static char temporary[] = new char[Defines.MAX_STRING_CHARS];
public static Comparator<Integer> PlayerSort = new Comparator<Integer>() {
public int compare(Integer o1, Integer o2) {
int anum1 = GameBase.game.clients[o1].ps.stats[Defines.STAT_FRAGS];
int bnum1 = GameBase.game.clients[o2].ps.stats[Defines.STAT_FRAGS];
if (anum1 < bnum1)
return -1;
if (anum1 > bnum1)
return 1;
return 0;
}
public static Comparator<Integer> PlayerSort = (o1, o2) -> {
int anum1 = GameBase.game.clients[o1].ps.stats[Defines.STAT_FRAGS];
int bnum1 = GameBase.game.clients[o2].ps.stats[Defines.STAT_FRAGS];
if (anum1 < bnum1)
return -1;
if (anum1 > bnum1)
return 1;
return 0;
};
/**

8
src/lwjake2/qcommon/Com.java
View File

@@ -238,13 +238,7 @@ public final class Com {
return new String(com_token, 0, len);
}
public static Runnable Error_f= new Runnable()
{
public void run() throws IllegalStateException
{
Error(Defines.ERR_FATAL, Cmd.Argv(1));
}
};
public static Runnable Error_f= () -> Error(Defines.ERR_FATAL, Cmd.Argv(1));
public static void Error(int code, String fmt) throws IllegalStateException
{

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

@@ -229,66 +229,61 @@ public class Cvar extends Globals {
* Set command, sets variables.
*/
static Runnable Set_f = new Runnable() {
public void run() {
int c;
int flags;
static Runnable Set_f = () -> {
int c;
int flags;
c = Cmd.Argc();
if (c != 3 && c != 4) {
Com.Printf("usage: set <variable> <value> [u / s]\n");
c = Cmd.Argc();
if (c != 3 && c != 4) {
Com.Printf("usage: set <variable> <value> [u / s]\n");
return;
}
if (c == 4) {
if (Cmd.Argv(3).equals("u"))
flags = CVAR_USERINFO;
else if (Cmd.Argv(3).equals("s"))
flags = CVAR_SERVERINFO;
else {
Com.Printf("flags can only be 'u' or 's'\n");
return;
}
if (c == 4) {
if (Cmd.Argv(3).equals("u"))
flags = CVAR_USERINFO;
else if (Cmd.Argv(3).equals("s"))
flags = CVAR_SERVERINFO;
else {
Com.Printf("flags can only be 'u' or 's'\n");
return;
}
Cvar.FullSet(Cmd.Argv(1), Cmd.Argv(2), flags);
} else
Cvar.Set(Cmd.Argv(1), Cmd.Argv(2));
}
Cvar.FullSet(Cmd.Argv(1), Cmd.Argv(2), flags);
} else
Cvar.Set(Cmd.Argv(1), Cmd.Argv(2));
};
/**
* List command, lists all available commands.
*/
static Runnable List_f = new Runnable() {
public void run() {
cvar_t var;
int i;
static Runnable List_f = () -> {
cvar_t var;
int i;
i = 0;
for (var = Globals.cvar_vars; var != null; var = var.next, i++) {
if ((var.flags & CVAR_ARCHIVE) != 0)
Com.Printf("*");
else
Com.Printf(" ");
if ((var.flags & CVAR_USERINFO) != 0)
Com.Printf("U");
else
Com.Printf(" ");
if ((var.flags & CVAR_SERVERINFO) != 0)
Com.Printf("S");
else
Com.Printf(" ");
if ((var.flags & CVAR_NOSET) != 0)
Com.Printf("-");
else if ((var.flags & CVAR_LATCH) != 0)
Com.Printf("L");
else
Com.Printf(" ");
Com.Printf(" " + var.name + " \"" + var.string + "\"\n");
}
Com.Printf(i + " cvars\n");
i = 0;
for (var = Globals.cvar_vars; var != null; var = var.next, i++) {
if ((var.flags & CVAR_ARCHIVE) != 0)
Com.Printf("*");
else
Com.Printf(" ");
if ((var.flags & CVAR_USERINFO) != 0)
Com.Printf("U");
else
Com.Printf(" ");
if ((var.flags & CVAR_SERVERINFO) != 0)
Com.Printf("S");
else
Com.Printf(" ");
if ((var.flags & CVAR_NOSET) != 0)
Com.Printf("-");
else if ((var.flags & CVAR_LATCH) != 0)
Com.Printf("L");
else
Com.Printf(" ");
Com.Printf(" " + var.name + " \"" + var.string + "\"\n");
}
Com.Printf(i + " cvars\n");
};

24
src/lwjake2/render/lwjgl/Main.java
View File

@@ -995,27 +995,11 @@ public abstract class Main extends Base {
vid_gamma = Cvar.Get("vid_gamma", "1.0", Globals.CVAR_ARCHIVE);
vid_ref = Cvar.Get("vid_ref", "lwjgl", Globals.CVAR_ARCHIVE);
Cmd.AddCommand("imagelist", new Runnable() {
public void run() {
GL_ImageList_f();
}
});
Cmd.AddCommand("imagelist", this::GL_ImageList_f);
Cmd.AddCommand("screenshot", new Runnable() {
public void run() {
GL_ScreenShot_f();
}
});
Cmd.AddCommand("modellist", new Runnable() {
public void run() {
Mod_Modellist_f();
}
});
Cmd.AddCommand("gl_strings", new Runnable() {
public void run() {
GL_Strings_f();
}
});
Cmd.AddCommand("screenshot", this::GL_ScreenShot_f);
Cmd.AddCommand("modellist", this::Mod_Modellist_f);
Cmd.AddCommand("gl_strings", this::GL_Strings_f);
}
/**

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

@@ -1027,92 +1027,28 @@ public class SV_CCMDS {
==================
*/
public static void SV_InitOperatorCommands() {
Cmd.AddCommand("heartbeat", new Runnable() {
public void run() {
SV_Heartbeat_f();
}
});
Cmd.AddCommand("kick", new Runnable() {
public void run() {
SV_Kick_f();
}
});
Cmd.AddCommand("status", new Runnable() {
public void run() {
SV_Status_f();
}
});
Cmd.AddCommand("serverinfo", new Runnable() {
public void run() {
SV_Serverinfo_f();
}
});
Cmd.AddCommand("dumpuser", new Runnable() {
public void run() {
SV_DumpUser_f();
}
});
Cmd.AddCommand("heartbeat", SV_CCMDS::SV_Heartbeat_f);
Cmd.AddCommand("kick", SV_CCMDS::SV_Kick_f);
Cmd.AddCommand("status", SV_CCMDS::SV_Status_f);
Cmd.AddCommand("serverinfo", SV_CCMDS::SV_Serverinfo_f);
Cmd.AddCommand("dumpuser", SV_CCMDS::SV_DumpUser_f);
Cmd.AddCommand("map", new Runnable() {
public void run() {
SV_Map_f();
}
});
Cmd.AddCommand("demomap", new Runnable() {
public void run() {
SV_DemoMap_f();
}
});
Cmd.AddCommand("gamemap", new Runnable() {
public void run() {
SV_GameMap_f();
}
});
Cmd.AddCommand("setmaster", new Runnable() {
public void run() {
SV_SetMaster_f();
}
});
Cmd.AddCommand("map", SV_CCMDS::SV_Map_f);
Cmd.AddCommand("demomap", SV_CCMDS::SV_DemoMap_f);
Cmd.AddCommand("gamemap", SV_CCMDS::SV_GameMap_f);
Cmd.AddCommand("setmaster", SV_CCMDS::SV_SetMaster_f);
if (Globals.dedicated.value != 0)
Cmd.AddCommand("say", new Runnable() {
public void run() {
SV_ConSay_f();
}
});
Cmd.AddCommand("say", SV_CCMDS::SV_ConSay_f);
Cmd.AddCommand("serverrecord", new Runnable() {
public void run() {
SV_ServerRecord_f();
}
});
Cmd.AddCommand("serverstop", new Runnable() {
public void run() {
SV_ServerStop_f();
}
});
Cmd.AddCommand("serverrecord", SV_CCMDS::SV_ServerRecord_f);
Cmd.AddCommand("serverstop", SV_CCMDS::SV_ServerStop_f);
Cmd.AddCommand("save", new Runnable() {
public void run() {
SV_Savegame_f();
}
});
Cmd.AddCommand("load", new Runnable() {
public void run() {
SV_Loadgame_f();
}
});
Cmd.AddCommand("save", SV_CCMDS::SV_Savegame_f);
Cmd.AddCommand("load", SV_CCMDS::SV_Loadgame_f);
Cmd.AddCommand("killserver", new Runnable() {
public void run() {
SV_KillServer_f();
}
});
Cmd.AddCommand("killserver", SV_CCMDS::SV_KillServer_f);
Cmd.AddCommand("sv", new Runnable() {
public void run() {
SV_ServerCommand_f();
}
});
Cmd.AddCommand("sv", SV_CCMDS::SV_ServerCommand_f);
}
}

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

@@ -48,54 +48,22 @@ public class SV_USER {
Runnable r;
}
static ucmd_t u1 = new ucmd_t("new", new Runnable() {
public void run() {
SV_USER.SV_New_f();
}
});
static ucmd_t u1 = new ucmd_t("new", SV_USER::SV_New_f);
static ucmd_t ucmds[] = {
// auto issued
new ucmd_t("new", new Runnable() {
public void run() {
SV_USER.SV_New_f();
}
}), new ucmd_t("configstrings", new Runnable() {
public void run() {
SV_USER.SV_Configstrings_f();
}
}), new ucmd_t("baselines", new Runnable() {
public void run() {
SV_USER.SV_Baselines_f();
}
}), new ucmd_t("begin", new Runnable() {
public void run() {
SV_USER.SV_Begin_f();
}
}), new ucmd_t("nextserver", new Runnable() {
public void run() {
SV_USER.SV_Nextserver_f();
}
}), new ucmd_t("disconnect", new Runnable() {
public void run() {
SV_USER.SV_Disconnect_f();
}
}),
// auto issued
new ucmd_t("new", SV_USER::SV_New_f),
new ucmd_t("configstrings", SV_USER::SV_Configstrings_f),
new ucmd_t("baselines", SV_USER::SV_Baselines_f),
new ucmd_t("begin", SV_USER::SV_Begin_f),
new ucmd_t("nextserver", SV_USER::SV_Nextserver_f),
new ucmd_t("disconnect", SV_USER::SV_Disconnect_f),
// issued by hand at client consoles
new ucmd_t("info", new Runnable() {
public void run() {
SV_USER.SV_ShowServerinfo_f();
}
}), new ucmd_t("download", new Runnable() {
public void run() {
SV_USER.SV_BeginDownload_f();
}
}), new ucmd_t("nextdl", new Runnable() {
public void run() {
SV_USER.SV_NextDownload_f();
}
}) };
new ucmd_t("info", SV_USER::SV_ShowServerinfo_f),
new ucmd_t("download", SV_USER::SV_BeginDownload_f),
new ucmd_t("nextdl", SV_USER::SV_NextDownload_f)
};
public static final int MAX_STRINGCMDS = 8;

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

@@ -97,26 +97,10 @@ public final class LWJGLSoundImpl implements Sound {
int count = Channel.init(buffers);
log.info("... using {} channels", count);
AL10.alDistanceModel(AL10.AL_INVERSE_DISTANCE_CLAMPED);
Cmd.AddCommand("play", new Runnable() {
public void run() {
Play();
}
});
Cmd.AddCommand("stopsound", new Runnable() {
public void run() {
StopAllSounds();
}
});
Cmd.AddCommand("soundlist", new Runnable() {
public void run() {
SoundList();
}
});
Cmd.AddCommand("soundinfo", new Runnable() {
public void run() {
SoundInfo_f();
}
});
Cmd.AddCommand("play", this::Play);
Cmd.AddCommand("stopsound", this::StopAllSounds);
Cmd.AddCommand("soundlist", this::SoundList);
Cmd.AddCommand("soundinfo", this::SoundInfo_f);
num_sfx = 0;

24
src/lwjake2/sys/IN.java
View File

@@ -105,28 +105,12 @@ public final class IN extends Globals {
Globals.m_forward = Cvar.Get("m_forward", "1", 0);
Globals.m_side = Cvar.Get("m_side", "0.8", 0);
Cmd.AddCommand("+mlook", new Runnable() {
public void run() {
MLookDown();
}
});
Cmd.AddCommand("-mlook", new Runnable() {
public void run() {
MLookUp();
}
});
Cmd.AddCommand("+mlook", IN::MLookDown);
Cmd.AddCommand("-mlook", IN::MLookUp);
Cmd.AddCommand("force_centerview", new Runnable() {
public void run() {
Force_CenterView_f();
}
});
Cmd.AddCommand("force_centerview", IN::Force_CenterView_f);
Cmd.AddCommand("togglemouse", new Runnable() {
public void run() {
toggleMouse();
}
});
Cmd.AddCommand("togglemouse", IN::toggleMouse);
IN.mouse_avail = true;
}