diff --git a/src/lwjake2/LWJake2.java b/src/lwjake2/LWJake2.java index ccfd471..7949e1d 100644 --- a/src/lwjake2/LWJake2.java +++ b/src/lwjake2/LWJake2.java @@ -18,6 +18,7 @@ package lwjake2; +import lombok.NonNull; import lwjake2.qcommon.Com; import lwjake2.qcommon.Cvar; import lwjake2.qcommon.Qcommon; @@ -34,7 +35,7 @@ public final class LWJake2 { * * @param args */ - public static void main(String[] args) { + public static void main(@NonNull String[] args) { boolean dedicated = false; diff --git a/src/lwjake2/client/CL_pred.java b/src/lwjake2/client/CL_pred.java index 1ce7e97..2619cb6 100644 --- a/src/lwjake2/client/CL_pred.java +++ b/src/lwjake2/client/CL_pred.java @@ -141,8 +141,7 @@ public class CL_pred { } else tr.set(trace); // rst: solved the Z U P P E L - P R O B L E // M - } else if (trace.startsolid) - tr.startsolid = true; + } } } diff --git a/src/lwjake2/client/CL_tent.java b/src/lwjake2/client/CL_tent.java index 96e788c..9dac910 100644 --- a/src/lwjake2/client/CL_tent.java +++ b/src/lwjake2/client/CL_tent.java @@ -664,12 +664,12 @@ public class CL_tent { } else { // Com_Printf ("No free sustains!\n"); // FIXME - read the stuff anyway - cnt = MSG.ReadByte(Globals.net_message); + MSG.ReadByte(Globals.net_message); MSG.ReadPos(Globals.net_message, pos); MSG.ReadDir(Globals.net_message, dir); - r = MSG.ReadByte(Globals.net_message); - magnitude = MSG.ReadShort(Globals.net_message); - magnitude = MSG.ReadLong(Globals.net_message); // really + MSG.ReadByte(Globals.net_message); + MSG.ReadShort(Globals.net_message); + MSG.ReadLong(Globals.net_message); // interval } } else // instant @@ -1027,7 +1027,7 @@ public class CL_tent { case Defines.TE_PARASITE_ATTACK: case Defines.TE_MEDIC_CABLE_ATTACK: - ent = ParseBeam(cl_mod_parasite_segment); + ParseBeam(cl_mod_parasite_segment); break; case Defines.TE_BOSSTPORT: // boss teleporting to station @@ -1038,7 +1038,7 @@ public class CL_tent { break; case Defines.TE_GRAPPLE_CABLE: - ent = ParseBeam2(cl_mod_grapple_cable); + ParseBeam2(cl_mod_grapple_cable); break; // RAFAEL diff --git a/src/lwjake2/client/Key.java b/src/lwjake2/client/Key.java index db4e744..98768c8 100644 --- a/src/lwjake2/client/Key.java +++ b/src/lwjake2/client/Key.java @@ -408,10 +408,7 @@ public class Key extends Globals { return; } - if (!down) - return; // other systems only care about key down events - -// if (shift_down) + // if (shift_down) // key = keyshift[key]; switch (Globals.cls.key_dest) { diff --git a/src/lwjake2/client/Menu.java b/src/lwjake2/client/Menu.java index 6111711..4588bc3 100644 --- a/src/lwjake2/client/Menu.java +++ b/src/lwjake2/client/Menu.java @@ -29,13 +29,11 @@ import lwjake2.sys.Timer; import lwjake2.util.Lib; import lwjake2.util.Math3D; import lwjake2.util.QuakeFile; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.awt.Dimension; import java.io.RandomAccessFile; import java.util.Arrays; -import java.util.Comparator; +import java.util.Objects; /** * Menu @@ -49,7 +47,6 @@ interface KeyCallback { } 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; @@ -238,7 +235,7 @@ public final class Menu extends Key { menucommon_s item; if (m != null) { - if ((item = ((menucommon_s) Menu_ItemAtCursor(m))) != null) { + if ((item = Menu_ItemAtCursor(m)) != null) { if (item.type == MTYPE_FIELD) { if (Field_Key((menufield_s) item, key)) return null; @@ -335,19 +332,6 @@ public final class Menu extends Key { } } - public static void PrintWhite(int cx, int cy, String str) { - for (int n = 0; n < str.length(); n++) { - DrawCharacter(cx, cy, str.charAt(n)); - //str++; - cx += 8; - } - } - - public static void DrawPic(int x, int y, String pic) { - re.DrawPic(x + ((viddef.width - 320) >> 1), y - + ((viddef.height - 240) >> 1), pic); - } - /* * ============= DrawCursor * @@ -431,8 +415,6 @@ public final class Menu extends Key { */ static final int MAIN_ITEMS = 5; - static Runnable Main_Draw = Menu::Main_Draw; - static void Main_Draw() { int i; int w, h; @@ -447,7 +429,6 @@ public final class Menu extends Key { for (i = 0; i < names.length; i++) { Globals.re.DrawGetPicSize(dim, names[i]); w = dim.width; - h = dim.height; if (w > widest) widest = w; @@ -466,7 +447,7 @@ public final class Menu extends Key { Globals.re.DrawPic(xoffset, ystart + m_main_cursor * 40 + 13, litname); DrawCursor(xoffset - 25, ystart + m_main_cursor * 40 + 11, - (int) ((Globals.cls.realtime / 100)) % NUM_CURSOR_FRAMES); + (Globals.cls.realtime / 100) % NUM_CURSOR_FRAMES); Globals.re.DrawGetPicSize(dim, "m_main_plaque"); w = dim.width; @@ -476,12 +457,6 @@ public final class Menu extends Key { Globals.re.DrawPic(xoffset - 30 - w, ystart + h + 5, "m_main_logo"); } - static keyfunc_t Main_Key = new keyfunc_t() { - public String execute(int key) { - return Main_Key(key); - } - }; - static String Main_Key(int key) { String sound = menu_move_sound; @@ -560,15 +535,15 @@ public final class Menu extends Key { Menu_Draw(s_multiplayer_menu); } - static void PlayerSetupFunc(Object unused) { + static void PlayerSetupFunc() { Menu_PlayerConfig_f(); } - static void JoinNetworkServerFunc(Object unused) { + static void JoinNetworkServerFunc() { Menu_JoinServer_f(); } - static void StartNetworkServerFunc(Object unused) { + static void StartNetworkServerFunc() { Menu_StartServer_f(); } @@ -581,21 +556,22 @@ public final class Menu extends Key { s_join_network_server_action.x = 0; s_join_network_server_action.y = 0; s_join_network_server_action.name = " join network server"; - s_join_network_server_action.callback = Menu::JoinNetworkServerFunc; + s_join_network_server_action.callback = object ->JoinNetworkServerFunc(); + s_start_network_server_action.type = MTYPE_ACTION; s_start_network_server_action.flags = QMF_LEFT_JUSTIFY; s_start_network_server_action.x = 0; s_start_network_server_action.y = 10; s_start_network_server_action.name = " start network server"; - s_start_network_server_action.callback = Menu::StartNetworkServerFunc; + s_start_network_server_action.callback = object ->StartNetworkServerFunc(); s_player_setup_action.type = MTYPE_ACTION; s_player_setup_action.flags = QMF_LEFT_JUSTIFY; s_player_setup_action.x = 0; s_player_setup_action.y = 20; s_player_setup_action.name = " player setup"; - s_player_setup_action.callback = Menu::PlayerSetupFunc; + s_player_setup_action.callback = object -> PlayerSetupFunc(); Menu_AddItem(s_multiplayer_menu, s_join_network_server_action); Menu_AddItem(s_multiplayer_menu, s_start_network_server_action); @@ -640,8 +616,6 @@ public final class Menu extends Key { "cmd help", "help computer" }, { null, null } }; - int keys_cursor; - static boolean bind_grab; static menuframework_s s_keys_menu = new menuframework_s(); @@ -731,8 +705,8 @@ public final class Menu extends Key { if (bind_grab) re.DrawChar(menu.x, menu.y + menu.cursor * 9, '='); else - re.DrawChar(menu.x, menu.y + menu.cursor * 9, 12 + ((int) (Timer - .Milliseconds() / 250) & 1)); + re.DrawChar(menu.x, menu.y + menu.cursor * 9, 12 + (Timer + .Milliseconds() / 250 & 1)); } static void DrawKeyBindingFunc(Object self) { @@ -978,7 +952,7 @@ public final class Menu extends Key { s_keys_help_computer_action.type = MTYPE_ACTION; s_keys_help_computer_action.flags = QMF_GRAYED; s_keys_help_computer_action.x = 0; - s_keys_help_computer_action.y = y += 9; + s_keys_help_computer_action.y = y + 9; s_keys_help_computer_action.ownerdraw = Menu::DrawKeyBindingFunc; s_keys_help_computer_action.localdata[0] = ++i; @@ -1014,21 +988,13 @@ public final class Menu extends Key { Menu_Center(s_keys_menu); } - static Runnable Keys_MenuDraw = Menu::Keys_MenuDraw_f; - static void Keys_MenuDraw_f() { Menu_AdjustCursor(s_keys_menu, 1); Menu_Draw(s_keys_menu); } - static keyfunc_t Keys_MenuKey = new keyfunc_t() { - public String execute(int key) { - return Keys_MenuKey_f(key); - } - }; - static String Keys_MenuKey_f(int key) { - menuaction_s item = (menuaction_s) Menu_ItemAtCursor(s_keys_menu); + menuaction_s item = (menuaction_s) Objects.requireNonNull(Menu_ItemAtCursor(s_keys_menu)); if (bind_grab) { if (key != K_ESCAPE && key != '`') { @@ -1112,38 +1078,34 @@ public final class Menu extends Key { //static menulist_s s_options_compatibility_list = new menulist_s(); static menuaction_s s_options_console_action = new menuaction_s(); - static void CrosshairFunc(Object unused) { + static void CrosshairFunc() { Cvar.SetValue("crosshair", s_options_crosshair_box.curvalue); } - static void JoystickFunc(Object unused) { + static void JoystickFunc() { Cvar.SetValue("in_joystick", s_options_joystick_box.curvalue); } - static void CustomizeControlsFunc(Object unused) { + static void CustomizeControlsFunc() { Menu_Keys_f(); } - static void AlwaysRunFunc(Object unused) { + static void AlwaysRunFunc() { Cvar.SetValue("cl_run", s_options_alwaysrun_box.curvalue); } - static void FreeLookFunc(Object unused) { + static void FreeLookFunc() { Cvar.SetValue("freelook", s_options_freelook_box.curvalue); } - static void MouseSpeedFunc(Object unused) { + static void MouseSpeedFunc() { Cvar.SetValue("sensitivity", s_options_sensitivity_slider.curvalue / 2.0F); } - static void NoAltTabFunc(Object unused) { - Cvar.SetValue("win_noalttab", s_options_noalttab_box.curvalue); - } - - static float ClampCvar(float min, float max, float value) { - if (value < min) - return min; + static float ClampCvar(float max, float value) { + if (value < 0f) + return 0f; if (value > max) return max; return value; @@ -1164,57 +1126,57 @@ public final class Menu extends Key { s_options_sensitivity_slider.curvalue = (sensitivity.value) * 2; - Cvar.SetValue("cl_run", ClampCvar(0, 1, cl_run.value)); + Cvar.SetValue("cl_run", ClampCvar(1, cl_run.value)); s_options_alwaysrun_box.curvalue = (int) cl_run.value; s_options_invertmouse_box.curvalue = m_pitch.value < 0 ? 1 : 0; - Cvar.SetValue("lookspring", ClampCvar(0, 1, lookspring.value)); + Cvar.SetValue("lookspring", ClampCvar(1, lookspring.value)); s_options_lookspring_box.curvalue = (int) lookspring.value; - Cvar.SetValue("lookstrafe", ClampCvar(0, 1, lookstrafe.value)); + Cvar.SetValue("lookstrafe", ClampCvar(1, lookstrafe.value)); s_options_lookstrafe_box.curvalue = (int) lookstrafe.value; - Cvar.SetValue("freelook", ClampCvar(0, 1, freelook.value)); + Cvar.SetValue("freelook", ClampCvar(1, freelook.value)); s_options_freelook_box.curvalue = (int) freelook.value; - Cvar.SetValue("crosshair", ClampCvar(0, 3, Globals.crosshair.value)); + Cvar.SetValue("crosshair", ClampCvar(3, Globals.crosshair.value)); s_options_crosshair_box.curvalue = (int) Globals.crosshair.value; - Cvar.SetValue("in_joystick", ClampCvar(0, 1, in_joystick.value)); + Cvar.SetValue("in_joystick", ClampCvar(1, in_joystick.value)); s_options_joystick_box.curvalue = (int) in_joystick.value; s_options_noalttab_box.curvalue = (int) win_noalttab.value; } - static void ControlsResetDefaultsFunc(Object unused) { + static void ControlsResetDefaultsFunc() { Cbuf.AddText("exec default.cfg\n"); Cbuf.Execute(); ControlsSetMenuItemValues(); } - static void InvertMouseFunc(Object unused) { + static void InvertMouseFunc() { Cvar.SetValue("m_pitch", -m_pitch.value); } - static void LookspringFunc(Object unused) { + static void LookspringFunc() { Cvar.SetValue("lookspring", 1 - lookspring.value); } - static void LookstrafeFunc(Object unused) { + static void LookstrafeFunc() { Cvar.SetValue("lookstrafe", 1 - lookstrafe.value); } - static void UpdateVolumeFunc(Object unused) { + static void UpdateVolumeFunc() { Cvar.SetValue("s_volume", s_options_sfxvolume_slider.curvalue / 10); } - static void UpdateCDVolumeFunc(Object unused) { + static void UpdateCDVolumeFunc() { Cvar.SetValue("cd_nocd", 1 - s_options_cdvolume_box.curvalue); } - static void ConsoleFunc(Object unused) { + static void ConsoleFunc() { /* * * the proper way to do this is probably to have ToggleConsole_f * accept a parameter @@ -1232,8 +1194,8 @@ public final class Menu extends Key { cls.key_dest = key_console; } - static void UpdateSoundQualityFunc(Object unused) { - boolean driverNotChanged = false; + static void UpdateSoundQualityFunc() { + boolean driverNotChanged; String current = s_drivers[s_options_quality_list.curvalue]; driverNotChanged = S.getDriverName().equals(current); // if (s_options_quality_list.curvalue != 0) { @@ -1252,10 +1214,9 @@ public final class Menu extends Key { if (driverNotChanged) { re.EndFrame(); - return; } else { Cvar.Set("s_impl", current); - + DrawTextBox(8, 120 - 48, 36, 3); Print(16 + 16, 120 - 48 + 8, "Restarting the sound system. This"); Print(16 + 16, 120 - 48 + 16, "could take up to a minute, so"); @@ -1270,16 +1231,13 @@ public final class Menu extends Key { static String cd_music_items[] = { "disabled", "enabled" }; - static String compatibility_items[] = { "max compatibility", - "max performance" }; - static String yesno_names[] = { "no", "yes" }; static String crosshair_names[] = { "none", "cross", "dot", "angle" }; static String[] s_labels; static String[] s_drivers; - + static void Options_MenuInit() { s_drivers = S.getDriverNames(); @@ -1291,7 +1249,7 @@ public final class Menu extends Key { s_labels[i] = s_drivers[i]; } } - + win_noalttab = Cvar.Get("win_noalttab", "0", CVAR_ARCHIVE); /* @@ -1305,7 +1263,7 @@ public final class Menu extends Key { s_options_sfxvolume_slider.x = 0; s_options_sfxvolume_slider.y = 0; s_options_sfxvolume_slider.name = "effects volume"; - s_options_sfxvolume_slider.callback = Menu::UpdateVolumeFunc; + s_options_sfxvolume_slider.callback = unused -> UpdateVolumeFunc(); s_options_sfxvolume_slider.minvalue = 0; s_options_sfxvolume_slider.maxvalue = 10; s_options_sfxvolume_slider.curvalue = Cvar.VariableValue("s_volume") * 10; @@ -1314,7 +1272,7 @@ public final class Menu extends Key { s_options_cdvolume_box.x = 0; s_options_cdvolume_box.y = 10; s_options_cdvolume_box.name = "CD music"; - s_options_cdvolume_box.callback = Menu::UpdateCDVolumeFunc; + s_options_cdvolume_box.callback = unused -> UpdateCDVolumeFunc(); s_options_cdvolume_box.itemnames = cd_music_items; s_options_cdvolume_box.curvalue = 1 - (int) Cvar .VariableValue("cd_nocd"); @@ -1322,16 +1280,16 @@ public final class Menu extends Key { s_options_quality_list.type = MTYPE_SPINCONTROL; s_options_quality_list.x = 0; s_options_quality_list.y = 20; - ; + s_options_quality_list.name = "sound"; - s_options_quality_list.callback = Menu::UpdateSoundQualityFunc; + s_options_quality_list.callback = unused -> UpdateSoundQualityFunc(); s_options_quality_list.itemnames = s_labels; s_options_sensitivity_slider.type = MTYPE_SLIDER; s_options_sensitivity_slider.x = 0; s_options_sensitivity_slider.y = 50; s_options_sensitivity_slider.name = "mouse speed"; - s_options_sensitivity_slider.callback = Menu::MouseSpeedFunc; + s_options_sensitivity_slider.callback = unused -> MouseSpeedFunc(); s_options_sensitivity_slider.minvalue = 2; s_options_sensitivity_slider.maxvalue = 22; @@ -1339,74 +1297,68 @@ public final class Menu extends Key { s_options_alwaysrun_box.x = 0; s_options_alwaysrun_box.y = 60; s_options_alwaysrun_box.name = "always run"; - s_options_alwaysrun_box.callback = Menu::AlwaysRunFunc; + s_options_alwaysrun_box.callback = unused -> AlwaysRunFunc(); s_options_alwaysrun_box.itemnames = yesno_names; s_options_invertmouse_box.type = MTYPE_SPINCONTROL; s_options_invertmouse_box.x = 0; s_options_invertmouse_box.y = 70; s_options_invertmouse_box.name = "invert mouse"; - s_options_invertmouse_box.callback = Menu::InvertMouseFunc; + s_options_invertmouse_box.callback = unused -> InvertMouseFunc(); s_options_invertmouse_box.itemnames = yesno_names; s_options_lookspring_box.type = MTYPE_SPINCONTROL; s_options_lookspring_box.x = 0; s_options_lookspring_box.y = 80; s_options_lookspring_box.name = "lookspring"; - s_options_lookspring_box.callback = Menu::LookspringFunc; + s_options_lookspring_box.callback = unused -> LookspringFunc(); s_options_lookspring_box.itemnames = yesno_names; s_options_lookstrafe_box.type = MTYPE_SPINCONTROL; s_options_lookstrafe_box.x = 0; s_options_lookstrafe_box.y = 90; s_options_lookstrafe_box.name = "lookstrafe"; - s_options_lookstrafe_box.callback = Menu::LookstrafeFunc; + s_options_lookstrafe_box.callback = unused -> LookstrafeFunc(); s_options_lookstrafe_box.itemnames = yesno_names; s_options_freelook_box.type = MTYPE_SPINCONTROL; s_options_freelook_box.x = 0; s_options_freelook_box.y = 100; s_options_freelook_box.name = "free look"; - s_options_freelook_box.callback = Menu::FreeLookFunc; + s_options_freelook_box.callback = unused -> FreeLookFunc(); s_options_freelook_box.itemnames = yesno_names; s_options_crosshair_box.type = MTYPE_SPINCONTROL; s_options_crosshair_box.x = 0; s_options_crosshair_box.y = 110; s_options_crosshair_box.name = "crosshair"; - s_options_crosshair_box.callback = Menu::CrosshairFunc; + s_options_crosshair_box.callback = unused -> CrosshairFunc(); s_options_crosshair_box.itemnames = crosshair_names; - /* - * s_options_noalttab_box.type = MTYPE_SPINCONTROL; - * s_options_noalttab_box.x = 0; s_options_noalttab_box.y = 110; - * s_options_noalttab_box.name = "disable alt-tab"; - * s_options_noalttab_box.callback = NoAltTabFunc; - * s_options_noalttab_box.itemnames = yesno_names; - */ + s_options_joystick_box.type = MTYPE_SPINCONTROL; s_options_joystick_box.x = 0; s_options_joystick_box.y = 120; s_options_joystick_box.name = "use joystick"; - s_options_joystick_box.callback = Menu::JoystickFunc; + s_options_joystick_box.callback = unused -> JoystickFunc(); s_options_joystick_box.itemnames = yesno_names; s_options_customize_options_action.type = MTYPE_ACTION; s_options_customize_options_action.x = 0; s_options_customize_options_action.y = 140; s_options_customize_options_action.name = "customize controls"; - s_options_customize_options_action.callback = Menu::CustomizeControlsFunc; + s_options_customize_options_action.callback = unused -> CustomizeControlsFunc(); s_options_defaults_action.type = MTYPE_ACTION; s_options_defaults_action.x = 0; s_options_defaults_action.y = 150; s_options_defaults_action.name = "reset defaults"; - s_options_defaults_action.callback = Menu::ControlsResetDefaultsFunc; + s_options_defaults_action.callback = unused -> ControlsResetDefaultsFunc(); s_options_console_action.type = MTYPE_ACTION; s_options_console_action.x = 0; s_options_console_action.y = 160; s_options_console_action.name = "go to console"; - s_options_console_action.callback = Menu::ConsoleFunc; + s_options_console_action.callback = unused -> ConsoleFunc(); ControlsSetMenuItemValues(); @@ -1614,8 +1566,8 @@ public final class Menu extends Key { */ for (i = 0, y = (int) (viddef.height - ((cls.realtime - credits_start_time) / 40.0F)); credits[i] != null && y < viddef.height; y += 10, i++) { - int j, stringoffset = 0; - boolean bold = false; + int j, stringoffset; + boolean bold; if (y <= -8) continue; @@ -1662,7 +1614,7 @@ public final class Menu extends Key { static void Menu_Credits_f() { int n; - int isdeveloper = 0; + int isdeveloper; byte b[] = fileSystem.loadFile("credits"); @@ -1732,36 +1684,33 @@ public final class Menu extends Key { cls.key_dest = key_game; } - static void EasyGameFunc(Object data) { + static void EasyGameFunc() { Cvar.ForceSet("skill", "0"); StartGame(); } - static void MediumGameFunc(Object data) { + static void MediumGameFunc() { Cvar.ForceSet("skill", "1"); StartGame(); } - static void HardGameFunc(Object data) { + static void HardGameFunc() { Cvar.ForceSet("skill", "2"); StartGame(); } - static void LoadGameFunc(Object unused) { + static void LoadGameFunc() { Menu_LoadGame_f(); } - static void SaveGameFunc(Object unused) { + static void SaveGameFunc() { Menu_SaveGame_f(); } - static void CreditsFunc(Object unused) { + static void CreditsFunc() { Menu_Credits_f(); } - static String difficulty_names[] = { "easy", "medium", - "fuckin shitty hard" }; - static void Game_MenuInit() { s_game_menu.x = (int) (viddef.width * 0.50); @@ -1772,21 +1721,21 @@ public final class Menu extends Key { s_easy_game_action.x = 0; s_easy_game_action.y = 0; s_easy_game_action.name = "easy"; - s_easy_game_action.callback = Menu::EasyGameFunc; + s_easy_game_action.callback = unused -> EasyGameFunc(); s_medium_game_action.type = MTYPE_ACTION; s_medium_game_action.flags = QMF_LEFT_JUSTIFY; s_medium_game_action.x = 0; s_medium_game_action.y = 10; s_medium_game_action.name = "medium"; - s_medium_game_action.callback = Menu::MediumGameFunc; + s_medium_game_action.callback = unused -> MediumGameFunc(); s_hard_game_action.type = MTYPE_ACTION; s_hard_game_action.flags = QMF_LEFT_JUSTIFY; s_hard_game_action.x = 0; s_hard_game_action.y = 20; s_hard_game_action.name = "hard"; - s_hard_game_action.callback = Menu::HardGameFunc; + s_hard_game_action.callback = unused -> HardGameFunc(); s_blankline.type = MTYPE_SEPARATOR; @@ -1795,21 +1744,21 @@ public final class Menu extends Key { s_load_game_action.x = 0; s_load_game_action.y = 40; s_load_game_action.name = "load game"; - s_load_game_action.callback = Menu::LoadGameFunc; + s_load_game_action.callback = unused -> LoadGameFunc(); s_save_game_action.type = MTYPE_ACTION; s_save_game_action.flags = QMF_LEFT_JUSTIFY; s_save_game_action.x = 0; s_save_game_action.y = 50; s_save_game_action.name = "save game"; - s_save_game_action.callback = Menu::SaveGameFunc; + s_save_game_action.callback = unused -> SaveGameFunc(); s_credits_action.type = MTYPE_ACTION; s_credits_action.flags = QMF_LEFT_JUSTIFY; s_credits_action.x = 0; s_credits_action.y = 60; s_credits_action.name = "credits"; - s_credits_action.callback = Menu::CreditsFunc; + s_credits_action.callback = unused -> CreditsFunc(); Menu_AddItem(s_game_menu, s_easy_game_action); Menu_AddItem(s_game_menu, s_medium_game_action); @@ -1894,7 +1843,6 @@ public final class Menu extends Key { m_savestrings[i] = ""; m_savevalid[i] = false; } - ; } } @@ -2101,13 +2049,10 @@ public final class Menu extends Key { ForceMenuOff(); } - static void AddressBookFunc(Object self) { + static void AddressBookFunc() { Menu_AddressBook_f(); } - static void NullCursorDraw(Object self) { - } - static void SearchLocalGames() { int i; @@ -2127,7 +2072,7 @@ public final class Menu extends Key { CL.PingServers_f.run(); } - static void SearchLocalGamesFunc(Object self) { + static void SearchLocalGamesFunc() { SearchLocalGames(); } @@ -2142,14 +2087,14 @@ public final class Menu extends Key { s_joinserver_address_book_action.flags = QMF_LEFT_JUSTIFY; s_joinserver_address_book_action.x = 0; s_joinserver_address_book_action.y = 0; - s_joinserver_address_book_action.callback = Menu::AddressBookFunc; + s_joinserver_address_book_action.callback = unused -> AddressBookFunc(); s_joinserver_search_action.type = MTYPE_ACTION; s_joinserver_search_action.name = "refresh server list"; s_joinserver_search_action.flags = QMF_LEFT_JUSTIFY; s_joinserver_search_action.x = 0; s_joinserver_search_action.y = 10; - s_joinserver_search_action.callback = Menu::SearchLocalGamesFunc; + s_joinserver_search_action.callback = unused -> SearchLocalGamesFunc(); s_joinserver_search_action.statusbar = "search for servers"; s_joinserver_server_title.type = MTYPE_SEPARATOR; @@ -2225,13 +2170,13 @@ public final class Menu extends Key { static menulist_s s_rules_box = new menulist_s(); - static void DMOptionsFunc(Object self) { + static void DMOptionsFunc() { if (s_rules_box.curvalue == 1) return; Menu_DMOptions_f(); } - static void RulesChangeFunc(Object self) { + static void RulesChangeFunc() { // DM if (s_rules_box.curvalue == 0) { s_maxclients_field.statusbar = null; @@ -2263,7 +2208,7 @@ public final class Menu extends Key { // ===== } - static void StartServerActionFunc(Object self) { + static void StartServerActionFunc() { //char startmap[1024]; String startmap; int timelimit; @@ -2285,16 +2230,16 @@ public final class Menu extends Key { timelimit = Lib.atoi(s_timelimit_field.buffer.toString()); fraglimit = Lib.atoi(s_fraglimit_field.buffer.toString()); - Cvar.SetValue("maxclients", ClampCvar(0, maxclients, maxclients)); - Cvar.SetValue("timelimit", ClampCvar(0, timelimit, timelimit)); - Cvar.SetValue("fraglimit", ClampCvar(0, fraglimit, fraglimit)); + Cvar.SetValue("maxclients", ClampCvar(maxclients, maxclients)); + Cvar.SetValue("timelimit", ClampCvar(timelimit, timelimit)); + Cvar.SetValue("fraglimit", ClampCvar(fraglimit, fraglimit)); Cvar.Set("hostname", s_hostname_field.buffer.toString()); // Cvar.SetValue ("deathmatch", !s_rules_box.curvalue ); // Cvar.SetValue ("coop", s_rules_box.curvalue ); // PGM if ((s_rules_box.curvalue < 2) || (fileSystem.developer_searchpath(2) != 2)) { - Cvar.SetValue("deathmatch", 1 - (int) (s_rules_box.curvalue)); + Cvar.SetValue("deathmatch", 1 - s_rules_box.curvalue); Cvar.SetValue("coop", s_rules_box.curvalue); Cvar.SetValue("gamerules", 0); } else { @@ -2387,7 +2332,7 @@ public final class Menu extends Key { } } - s = new String(buffer); + s = (buffer != null ? new String(buffer) : ""); String lines[] = s.split("\r\n"); nummaps = lines.length; @@ -2410,10 +2355,7 @@ public final class Menu extends Key { if (fp != null) { Lib.fclose(fp); - fp = null; - } else { - buffer = null; } /* @@ -2444,7 +2386,7 @@ public final class Menu extends Key { s_rules_box.curvalue = 1; else s_rules_box.curvalue = 0; - s_rules_box.callback = Menu::RulesChangeFunc; + s_rules_box.callback = unused -> RulesChangeFunc(); s_timelimit_field.type = MTYPE_FIELD; s_timelimit_field.name = "time limit"; @@ -2506,14 +2448,14 @@ public final class Menu extends Key { s_startserver_dmoptions_action.x = 24; s_startserver_dmoptions_action.y = 108; s_startserver_dmoptions_action.statusbar = null; - s_startserver_dmoptions_action.callback = Menu::DMOptionsFunc; + s_startserver_dmoptions_action.callback = unused -> DMOptionsFunc(); s_startserver_start_action.type = MTYPE_ACTION; s_startserver_start_action.name = " begin"; s_startserver_start_action.flags = QMF_LEFT_JUSTIFY; s_startserver_start_action.x = 24; s_startserver_start_action.y = 128; - s_startserver_start_action.callback = Menu::StartServerActionFunc; + s_startserver_start_action.callback = unused -> StartServerActionFunc(); Menu_AddItem(s_startserver_menu, s_startmap_list); Menu_AddItem(s_startserver_menu, s_rules_box); @@ -2527,7 +2469,7 @@ public final class Menu extends Key { Menu_Center(s_startserver_menu); // call this now to set proper inital state - RulesChangeFunc(null); + RulesChangeFunc(); } static void StartServer_MenuDraw() { @@ -2854,8 +2796,7 @@ public final class Menu extends Key { s_friendlyfire_box.name = "friendly fire"; s_friendlyfire_box.callback = Menu::DMFlagCallback; s_friendlyfire_box.itemnames = yes_no_names; - s_friendlyfire_box.curvalue = (dmflags & DF_NO_FRIENDLY_FIRE) == 0 ? 1 - : 0; + s_friendlyfire_box.curvalue = (dmflags & DF_NO_FRIENDLY_FIRE) == 0 ? 1 : 0; // ============ // ROGUE @@ -2886,7 +2827,7 @@ public final class Menu extends Key { s_no_spheres_box.type = MTYPE_SPINCONTROL; s_no_spheres_box.x = 0; - s_no_spheres_box.y = y += 10; + s_no_spheres_box.y = y + 10; s_no_spheres_box.name = "remove spheres"; s_no_spheres_box.callback = Menu::DMFlagCallback; s_no_spheres_box.itemnames = yes_no_names; @@ -3042,7 +2983,7 @@ public final class Menu extends Key { s_allow_download_sounds_box.type = MTYPE_SPINCONTROL; s_allow_download_sounds_box.x = 0; - s_allow_download_sounds_box.y = y += 10; + s_allow_download_sounds_box.y = y + 10; s_allow_download_sounds_box.name = "sounds"; s_allow_download_sounds_box.callback = Menu::DownloadCallback; s_allow_download_sounds_box.itemnames = yes_no_names; @@ -3100,13 +3041,13 @@ public final class Menu extends Key { s_addressbook_menu.nitems = 0; for (int i = 0; i < NUM_ADDRESSBOOK_ENTRIES; i++) { - cvar_t adr = Cvar.Get("adr" + i, "", CVAR_ARCHIVE); + cvar_t adr = Objects.requireNonNull(Cvar.Get("adr" + i, "", CVAR_ARCHIVE)); s_addressbook_fields[i].type = MTYPE_FIELD; s_addressbook_fields[i].name = null; s_addressbook_fields[i].callback = null; s_addressbook_fields[i].x = 0; - s_addressbook_fields[i].y = i * 18 + 0; + s_addressbook_fields[i].y = i * 18; s_addressbook_fields[i].localdata[0] = i; // put the cursor to the end of text for editing s_addressbook_fields[i].cursor = adr.string.length(); @@ -3119,12 +3060,6 @@ public final class Menu extends Key { } } - static keyfunc_t AddressBook_MenuKey = new keyfunc_t() { - public String execute(int key) { - return AddressBook_MenuKey_f(key); - } - }; - static String AddressBook_MenuKey_f(int key) { if (key == K_ESCAPE) { for (int index = 0; index < NUM_ADDRESSBOOK_ENTRIES; index++) { @@ -3134,8 +3069,6 @@ public final class Menu extends Key { return Default_MenuKey(s_addressbook_menu, key); } - static Runnable AddressBook_MenuDraw = Menu::AddressBook_MenuDraw_f; - static void AddressBook_MenuDraw_f() { Banner("m_banner_addressbook"); Menu_Draw(s_addressbook_menu); @@ -3187,7 +3120,7 @@ public final class Menu extends Key { //char directory[MAX_QPATH]; String directory; - }; + } static playermodelinfo_s s_pmi[] = new playermodelinfo_s[MAX_PLAYERMODELS]; @@ -3200,22 +3133,22 @@ public final class Menu extends Key { static String rate_names[] = { "28.8 Modem", "33.6 Modem", "Single ISDN", "Dual ISDN/Cable", "T1/LAN", "User defined" }; - static void DownloadOptionsFunc(Object self) { + static void DownloadOptionsFunc() { Menu_DownloadOptions_f(); } - static void HandednessCallback(Object unused) { + static void HandednessCallback() { Cvar.SetValue("hand", s_player_handedness_box.curvalue); } - static void RateCallback(Object unused) { + static void RateCallback() { if (s_player_rate_box.curvalue != rate_tbl.length - 1) //sizeof(rate_tbl) // / sizeof(* // rate_tbl) - 1) Cvar.SetValue("rate", rate_tbl[s_player_rate_box.curvalue]); } - static void ModelCallback(Object unused) { + static void ModelCallback() { s_player_skin_box.itemnames = s_pmi[s_player_model_box.curvalue].skindisplaynames; s_player_skin_box.curvalue = 0; } @@ -3242,13 +3175,13 @@ public final class Menu extends Key { return false; } - static boolean PlayerConfig_ScanDirectories() { + static void PlayerConfig_ScanDirectories() { //char findname[1024]; String findname; //char scratch[1024]; String scratch; - int ndirs = 0, npms = 0; + int ndirs = 0, npms; int a, b, c; String dirnames[]; @@ -3274,7 +3207,7 @@ public final class Menu extends Key { } while (path != null); if (dirnames == null) - return false; + return; /* * * go through the subdirectories @@ -3330,7 +3263,7 @@ public final class Menu extends Key { // copy the valid skins for (s = 0, k = 0; k < npcxfiles; k++) { - if (pcxnames[k].indexOf("_i.pcx") < 0) { + if (!pcxnames[k].contains("_i.pcx")) { if (IconOfSkinExists(pcxnames[k], pcxnames, npcxfiles)) { a = pcxnames[k].lastIndexOf('/'); b = pcxnames[k].lastIndexOf('\\'); @@ -3374,8 +3307,6 @@ public final class Menu extends Key { s_numplayermodels++; } - return true; - } static int pmicmpfnc(playermodelinfo_s a, playermodelinfo_s b) { @@ -3407,12 +3338,12 @@ public final class Menu extends Key { //char currentskin[1024]; String currentskin; - int i = 0; + int i; int currentdirectoryindex = 0; int currentskinindex = 0; - cvar_t hand = Cvar.Get("hand", "0", CVAR_USERINFO | CVAR_ARCHIVE); + cvar_t hand = Objects.requireNonNull(Cvar.Get("hand", "0", CVAR_USERINFO | CVAR_ARCHIVE)); PlayerConfig_ScanDirectories(); @@ -3436,11 +3367,7 @@ public final class Menu extends Key { } //qsort(s_pmi, s_numplayermodels, sizeof(s_pmi[0]), pmicmpfnc); - Arrays.sort(s_pmi, 0, s_numplayermodels, new Comparator() { - public int compare(playermodelinfo_s o1, playermodelinfo_s o2) { - return pmicmpfnc(o1, o2); - } - }); + Arrays.sort(s_pmi, 0, s_numplayermodels, Menu::pmicmpfnc); //memset(s_pmnames, 0, sizeof(s_pmnames)); s_pmnames = new String[MAX_PLAYERMODELS]; @@ -3485,7 +3412,7 @@ public final class Menu extends Key { s_player_model_box.type = MTYPE_SPINCONTROL; s_player_model_box.x = -56; s_player_model_box.y = 70; - s_player_model_box.callback = Menu::ModelCallback; + s_player_model_box.callback = unused -> ModelCallback(); s_player_model_box.cursor_offset = -48; s_player_model_box.curvalue = currentdirectoryindex; s_player_model_box.itemnames = s_pmnames; @@ -3514,7 +3441,7 @@ public final class Menu extends Key { s_player_handedness_box.y = 118; s_player_handedness_box.name = null; s_player_handedness_box.cursor_offset = -48; - s_player_handedness_box.callback = Menu::HandednessCallback; + s_player_handedness_box.callback = unused -> HandednessCallback(); s_player_handedness_box.curvalue = (int) Cvar.VariableValue("hand"); s_player_handedness_box.itemnames = handedness; @@ -3532,7 +3459,7 @@ public final class Menu extends Key { s_player_rate_box.y = 166; s_player_rate_box.name = null; s_player_rate_box.cursor_offset = -48; - s_player_rate_box.callback = Menu::RateCallback; + s_player_rate_box.callback = unused -> RateCallback(); s_player_rate_box.curvalue = i; s_player_rate_box.itemnames = rate_names; @@ -3542,7 +3469,7 @@ public final class Menu extends Key { s_player_download_action.x = -24; s_player_download_action.y = 186; s_player_download_action.statusbar = null; - s_player_download_action.callback = Menu::DownloadOptionsFunc; + s_player_download_action.callback = unused -> DownloadOptionsFunc(); Menu_AddItem(s_player_config_menu, s_player_name_field); Menu_AddItem(s_player_config_menu, s_player_model_title); @@ -3812,12 +3739,10 @@ public final class Menu extends Key { a.ownerdraw.execute(a); } - public static boolean Field_DoEnter(menufield_s f) { + public static void Field_DoEnter(menufield_s f) { if (f.callback != null) { f.callback.execute(f); - return true; } - return false; } public static void Field_Draw(menufield_s f) { @@ -3859,7 +3784,7 @@ public final class Menu extends Key { else offset = f.cursor; - if ((((int) (Timer.Milliseconds() / 250)) & 1) != 0) { + if ((Timer.Milliseconds() / 250 & 1) != 0) { re.DrawChar(f.x + f.parent.x + (offset + 2) * 8 + 8, f.y + f.parent.y, 11); } else { @@ -3928,8 +3853,7 @@ public final class Menu extends Key { /* * * support pasting from the clipboard */ - if ((Character.toUpperCase(key) == 'V' && keydown[K_CTRL]) - || (((key == K_INS) || (key == K_KP_INS)) && keydown[K_SHIFT])) { + if (Character.toUpperCase(key) == 'V' && keydown[K_CTRL] || key == K_INS && keydown[K_SHIFT]) { String cbd; if ((cbd = Sys.GetClipboardData()) != null) { @@ -3950,7 +3874,7 @@ public final class Menu extends Key { } switch (key) { - case K_KP_LEFTARROW: +// case K_KP_LEFTARROW: case K_LEFTARROW: case K_BACKSPACE: if (f.cursor > 0) { @@ -3965,7 +3889,7 @@ public final class Menu extends Key { } break; - case K_KP_DEL: +// case K_KP_DEL: case K_DEL: //memmove(& f.buffer[f.cursor], & f.buffer[f.cursor + 1], strlen(& // f.buffer[f.cursor + 1]) + 1); @@ -4002,7 +3926,7 @@ public final class Menu extends Key { if (menu.nitems < MAXMENUITEMS) { menu.items[menu.nitems] = item; - ((menucommon_s) menu.items[menu.nitems]).parent = menu; + menu.items[menu.nitems].parent = menu; menu.nitems++; } @@ -4057,7 +3981,7 @@ public final class Menu extends Key { public static void Menu_Center(menuframework_s menu) { int height; - height = ((menucommon_s) menu.items[menu.nitems - 1]).y; + height = menu.items[menu.nitems - 1].y; height += 10; menu.y = (viddef.height - height) / 2; @@ -4071,7 +3995,7 @@ public final class Menu extends Key { * * draw contents */ for (i = 0; i < menu.nitems; i++) { - switch (((menucommon_s) menu.items[i]).type) { + switch (menu.items[i].type) { case MTYPE_FIELD: Field_Draw((menufield_s) menu.items[i]); break; @@ -4102,10 +4026,10 @@ public final class Menu extends Key { } else if (item != null && item.type != MTYPE_FIELD) { if ((item.flags & QMF_LEFT_JUSTIFY) != 0) { re.DrawChar(menu.x + item.x - 24 + item.cursor_offset, menu.y - + item.y, 12 + ((int) (Timer.Milliseconds() / 250) & 1)); + + item.y, 12 + (Timer.Milliseconds() / 250 & 1)); } else { re.DrawChar(menu.x + item.cursor_offset, menu.y + item.y, - 12 + ((int) (Timer.Milliseconds() / 250) & 1)); + 12 + (Timer.Milliseconds() / 250 & 1)); } } @@ -4173,28 +4097,24 @@ public final class Menu extends Key { if (m.cursor < 0 || m.cursor >= m.nitems) return null; - return (menucommon_s) m.items[m.cursor]; + return m.items[m.cursor]; } - static boolean Menu_SelectItem(menuframework_s s) { + static void Menu_SelectItem(menuframework_s s) { menucommon_s item = Menu_ItemAtCursor(s); if (item != null) { switch (item.type) { case MTYPE_FIELD: - return Field_DoEnter((menufield_s) item); + Field_DoEnter((menufield_s) item); + return; case MTYPE_ACTION: Action_DoEnter((menuaction_s) item); - return true; + return; case MTYPE_LIST: - // Menulist_DoEnter( ( menulist_s ) item ); - return false; case MTYPE_SPINCONTROL: - // SpinControl_DoEnter( ( menulist_s ) item ); - return false; } } - return false; } public static void Menu_SetStatusBar(menuframework_s m, String string) { @@ -4202,7 +4122,7 @@ public final class Menu extends Key { } public static void Menu_SlideItem(menuframework_s s, int dir) { - menucommon_s item = (menucommon_s) Menu_ItemAtCursor(s); + menucommon_s item = Menu_ItemAtCursor(s); if (item != null) { switch (item.type) { @@ -4221,7 +4141,7 @@ public final class Menu extends Key { int total = 0; for (i = 0; i < menu.nitems; i++) { - if (((menucommon_s) menu.items[i]).type == MTYPE_LIST) { + if (menu.items[i].type == MTYPE_LIST) { int nitems = 0; String n[] = ((menulist_s) menu.items[i]).itemnames; @@ -4237,17 +4157,6 @@ public final class Menu extends Key { return total; } - public static void Menulist_DoEnter(menulist_s l) { - int start; - - start = l.y / 10 + 1; - - l.curvalue = l.parent.cursor - start; - - if (l.callback != null) - l.callback.execute(l); - } - public static void MenuList_Draw(menulist_s l) { String n[]; int y = 0; @@ -4295,7 +4204,7 @@ public final class Menu extends Key { Menu_DrawStringR2LDark(s.x + s.parent.x + LCOLUMN_OFFSET, s.y + s.parent.y, s.name); - s.range = (s.curvalue - s.minvalue) / (float) (s.maxvalue - s.minvalue); + s.range = (s.curvalue - s.minvalue) / (s.maxvalue - s.minvalue); if (s.range < 0) s.range = 0; @@ -4313,15 +4222,6 @@ public final class Menu extends Key { * 8 * s.range), s.y + s.parent.y, 131); } - public static void SpinControl_DoEnter(menulist_s s) { - s.curvalue++; - if (s.itemnames[s.curvalue] == null) - s.curvalue = 0; - - if (s.callback != null) - s.callback.execute(s); - } - public static void SpinControl_DoSlide(menulist_s s, int dir) { s.curvalue += dir; diff --git a/src/lwjake2/game/Cmd.java b/src/lwjake2/game/Cmd.java index 1036556..56451b5 100644 --- a/src/lwjake2/game/Cmd.java +++ b/src/lwjake2/game/Cmd.java @@ -267,7 +267,7 @@ public final class Cmd { // set cmd_args to everything after the first arg if (cmd_argc == 1) { cmd_args = new String(text, ph.index, len - ph.index); - cmd_args.trim(); + cmd_args = cmd_args.trim(); } com_token = Com.Parse(ph); diff --git a/src/lwjake2/game/GameBase.java b/src/lwjake2/game/GameBase.java index ad0e702..9bcbab5 100644 --- a/src/lwjake2/game/GameBase.java +++ b/src/lwjake2/game/GameBase.java @@ -29,6 +29,7 @@ import lwjake2.server.SV_WORLD; import lwjake2.util.Lib; import lwjake2.util.Math3D; +import javax.annotation.Nullable; import java.util.StringTokenizer; @Slf4j diff --git a/src/lwjake2/game/GameMisc.java b/src/lwjake2/game/GameMisc.java index 465b713..8cebdae 100644 --- a/src/lwjake2/game/GameMisc.java +++ b/src/lwjake2/game/GameMisc.java @@ -1620,17 +1620,21 @@ public class GameMisc { self.touch = misc_viper_bomb_touch; self.activator = activator; - EdictIterator es = null; + EdictIterator es; - es = GameBase.G_Find(es, GameBase.findByClass, "misc_viper"); + es = GameBase.G_Find(null, GameBase.findByClass, "misc_viper"); if (es != null) viper = es.o; - Math3D.VectorScale(viper.moveinfo.dir, viper.moveinfo.speed, + Math3D.VectorScale( + (viper != null ? viper.moveinfo.dir : new float[0]), + (viper != null ? viper.moveinfo.speed : 0), self.velocity); self.timestamp = GameBase.level.time; - Math3D.VectorCopy(viper.moveinfo.dir, self.moveinfo.dir); + Math3D.VectorCopy( + (viper != null ? viper.moveinfo.dir : new float[0]), + self.moveinfo.dir); } }; diff --git a/src/lwjake2/game/GameTarget.java b/src/lwjake2/game/GameTarget.java index a07bebc..182b776 100644 --- a/src/lwjake2/game/GameTarget.java +++ b/src/lwjake2/game/GameTarget.java @@ -694,7 +694,7 @@ public class GameTarget { GameBase.gi.dprintf(self.classname + " at " + Lib.vtos(self.s.origin) + ": " + self.target + " is a bad target\n"); - self.enemy = edit.o; + self.enemy = (edit != null ? edit.o : null); } else { GameBase.G_SetMovedir(self.s.angles, self.movedir); } diff --git a/src/lwjake2/game/monsters/M_Boss2.java b/src/lwjake2/game/monsters/M_Boss2.java index 846d44c..e3bd833 100644 --- a/src/lwjake2/game/monsters/M_Boss2.java +++ b/src/lwjake2/game/monsters/M_Boss2.java @@ -590,8 +590,6 @@ public class M_Boss2 { if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0) { chance = 0.4f; - } else if (enemy_range == Defines.RANGE_MELEE) { - chance = 0.8f; } else if (enemy_range == Defines.RANGE_NEAR) { chance = 0.8f; } else if (enemy_range == Defines.RANGE_MID) { diff --git a/src/lwjake2/game/monsters/M_Boss31.java b/src/lwjake2/game/monsters/M_Boss31.java index dd9ff89..bcb3ca0 100644 --- a/src/lwjake2/game/monsters/M_Boss31.java +++ b/src/lwjake2/game/monsters/M_Boss31.java @@ -814,8 +814,6 @@ public class M_Boss31 { if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0) { chance = 0.4f; - } else if (enemy_range == Defines.RANGE_MELEE) { - chance = 0.8f; } else if (enemy_range == Defines.RANGE_NEAR) { chance = 0.4f; } else if (enemy_range == Defines.RANGE_MID) { diff --git a/src/lwjake2/game/monsters/M_Boss32.java b/src/lwjake2/game/monsters/M_Boss32.java index f446b7c..6386fce 100644 --- a/src/lwjake2/game/monsters/M_Boss32.java +++ b/src/lwjake2/game/monsters/M_Boss32.java @@ -1797,8 +1797,6 @@ public class M_Boss32 { if ((self.monsterinfo.aiflags & Defines.AI_STAND_GROUND) != 0) { chance = 0.4f; - } else if (enemy_range == Defines.RANGE_MELEE) { - chance = 0.8f; } else if (enemy_range == Defines.RANGE_NEAR) { chance = 0.4f; } else if (enemy_range == Defines.RANGE_MID) { diff --git a/src/lwjake2/game/pmove_state_t.java b/src/lwjake2/game/pmove_state_t.java index 3ce2f26..24e0490 100644 --- a/src/lwjake2/game/pmove_state_t.java +++ b/src/lwjake2/game/pmove_state_t.java @@ -63,21 +63,19 @@ public class pmove_state_t { } public boolean equals(pmove_state_t p2) { - if (pm_type == p2.pm_type - && origin[0] == p2.origin[0] - && origin[1] == p2.origin[1] - && origin[2] == p2.origin[2] - && velocity[0] == p2.velocity[0] - && velocity[1] == p2.velocity[1] - && velocity[2] == p2.origin[2] - && pm_flags == p2.pm_flags - && pm_time == p2.pm_time - && delta_angles[0] == p2.delta_angles[0] - && delta_angles[1] == p2.delta_angles[1] - && delta_angles[2] == p2.origin[2]) - return true; + return pm_type == p2.pm_type + && origin[0] == p2.origin[0] + && origin[1] == p2.origin[1] + && origin[2] == p2.origin[2] + && velocity[0] == p2.velocity[0] + && velocity[1] == p2.velocity[1] + && velocity[2] == p2.origin[2] + && pm_flags == p2.pm_flags + && pm_time == p2.pm_time + && delta_angles[0] == p2.delta_angles[0] + && delta_angles[1] == p2.delta_angles[1] + && delta_angles[2] == p2.origin[2]; - return false; } /** Reads the playermove from the file. */ diff --git a/src/lwjake2/render/lwjgl/Image.java b/src/lwjake2/render/lwjgl/Image.java index ef4c20e..b12abe5 100644 --- a/src/lwjake2/render/lwjgl/Image.java +++ b/src/lwjake2/render/lwjgl/Image.java @@ -1356,22 +1356,8 @@ public abstract class Image extends Main { image.texnum = TEXNUM_IMAGES + image.getId(); // image pos in array GL_Bind(image.texnum); - if (bits == 8) { - image.has_alpha = - GL_Upload8(pic, width, height, (image.type != it_pic && image.type != it_sky), image.type == it_sky); - } - else { - int[] tmp = new int[pic.length / 4]; - - for (i = 0; i < tmp.length; i++) { - tmp[i] = ((pic[4 * i + 0] & 0xFF) << 0); // & 0x000000FF; - tmp[i] |= ((pic[4 * i + 1] & 0xFF) << 8); // & 0x0000FF00; - tmp[i] |= ((pic[4 * i + 2] & 0xFF) << 16); // & 0x00FF0000; - tmp[i] |= ((pic[4 * i + 3] & 0xFF) << 24); // & 0xFF000000; - } - - image.has_alpha = GL_Upload32(tmp, width, height, (image.type != it_pic && image.type != it_sky)); - } + image.has_alpha = + GL_Upload8(pic, width, height, (image.type != it_pic && image.type != it_sky), image.type == it_sky); image.upload_width = upload_width; // after power of 2 and scales image.upload_height = upload_height; diff --git a/src/lwjake2/server/SV_WORLD.java b/src/lwjake2/server/SV_WORLD.java index 0f049ea..5ea69c6 100644 --- a/src/lwjake2/server/SV_WORLD.java +++ b/src/lwjake2/server/SV_WORLD.java @@ -457,8 +457,7 @@ public class SV_WORLD { clip.trace.startsolid = true; } else clip.trace.set(trace); - } else if (trace.startsolid) - clip.trace.startsolid = true; + } } } diff --git a/src/lwjake2/util/PrintfFormat.java b/src/lwjake2/util/PrintfFormat.java index bd55796..416281e 100644 --- a/src/lwjake2/util/PrintfFormat.java +++ b/src/lwjake2/util/PrintfFormat.java @@ -2451,7 +2451,7 @@ public class PrintfFormat { private String printXFormat(String sx) { int nLeadingZeros = 0; int nBlanks = 0; - if (sx.equals("0") && precisionSet && precision == 0) + if (sx == null || sx.equals("0") && precisionSet && precision == 0) sx = ""; if (precisionSet) nLeadingZeros = precision - sx.length(); @@ -2727,7 +2727,7 @@ public class PrintfFormat { private String printOFormat(String sx) { int nLeadingZeros = 0; int nBlanks = 0; - if (sx.equals("0") && precisionSet && precision == 0) + if (sx == null || sx.equals("0") && precisionSet && precision == 0) sx = ""; if (precisionSet) nLeadingZeros = precision - sx.length(); diff --git a/src/lwjake2/util/Vargs.java b/src/lwjake2/util/Vargs.java index 3040492..97d2bfa 100644 --- a/src/lwjake2/util/Vargs.java +++ b/src/lwjake2/util/Vargs.java @@ -30,7 +30,7 @@ public class Vargs { // initial capacity static final int SIZE = 5; - Vector v; + Vector v = null; public Vargs() { this(SIZE); @@ -39,46 +39,46 @@ public class Vargs { public Vargs(int initialSize) { if (v != null) v.clear(); // clear previous list for GC - v = new Vector(initialSize); + v = new Vector<>(initialSize); } public Vargs add(boolean value) { - v.add(new Boolean(value)); + v.add(value); return this; } public Vargs add(byte value) { - v.add(new Byte(value)); + v.add(value); return this; } public Vargs add(char value) { - v.add(new Character(value)); + v.add(value); return this; } public Vargs add(short value) { - v.add(new Short(value)); + v.add(value); return this; } public Vargs add(int value) { - v.add(new Integer(value)); + v.add(value); return this; } public Vargs add(long value) { - v.add(new Long(value)); + v.add(value); return this; } public Vargs add(float value) { - v.add(new Float(value)); + v.add(value); return this; } public Vargs add(double value) { - v.add(new Double(value)); + v.add(value); return this; }