Menu.mcallback -> Callback
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -23,6 +23,7 @@ import lwjake2.Defines;
|
|||||||
import lwjake2.Globals;
|
import lwjake2.Globals;
|
||||||
import lwjake2.game.Cmd;
|
import lwjake2.game.Cmd;
|
||||||
import lwjake2.game.cvar_t;
|
import lwjake2.game.cvar_t;
|
||||||
|
import lwjake2.qcommon.Callback;
|
||||||
import lwjake2.qcommon.Com;
|
import lwjake2.qcommon.Com;
|
||||||
import lwjake2.qcommon.Cvar;
|
import lwjake2.qcommon.Cvar;
|
||||||
import lwjake2.render.Renderer;
|
import lwjake2.render.Renderer;
|
||||||
@@ -576,11 +577,7 @@ public class VID extends Globals {
|
|||||||
s_ref_list.name = "driver";
|
s_ref_list.name = "driver";
|
||||||
s_ref_list.x = 0;
|
s_ref_list.x = 0;
|
||||||
s_ref_list.y = 0;
|
s_ref_list.y = 0;
|
||||||
s_ref_list.callback = new Menu.mcallback() {
|
s_ref_list.callback = VID::DriverCallback;
|
||||||
public void execute(Object self) {
|
|
||||||
DriverCallback(self);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
s_ref_list.itemnames = refs;
|
s_ref_list.itemnames = refs;
|
||||||
|
|
||||||
s_mode_list.type = MTYPE_SPINCONTROL;
|
s_mode_list.type = MTYPE_SPINCONTROL;
|
||||||
@@ -594,20 +591,12 @@ public class VID extends Globals {
|
|||||||
s_screensize_slider.name = "screen size";
|
s_screensize_slider.name = "screen size";
|
||||||
s_screensize_slider.minvalue = 3;
|
s_screensize_slider.minvalue = 3;
|
||||||
s_screensize_slider.maxvalue = 12;
|
s_screensize_slider.maxvalue = 12;
|
||||||
s_screensize_slider.callback = new Menu.mcallback() {
|
s_screensize_slider.callback = VID::ScreenSizeCallback;
|
||||||
public void execute(Object self) {
|
|
||||||
ScreenSizeCallback(self);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
s_brightness_slider.type = MTYPE_SLIDER;
|
s_brightness_slider.type = MTYPE_SLIDER;
|
||||||
s_brightness_slider.x = 0;
|
s_brightness_slider.x = 0;
|
||||||
s_brightness_slider.y = 30;
|
s_brightness_slider.y = 30;
|
||||||
s_brightness_slider.name = "brightness";
|
s_brightness_slider.name = "brightness";
|
||||||
s_brightness_slider.callback = new Menu.mcallback() {
|
s_brightness_slider.callback = VID::BrightnessCallback;
|
||||||
public void execute(Object self) {
|
|
||||||
BrightnessCallback(self);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
s_brightness_slider.minvalue = 5;
|
s_brightness_slider.minvalue = 5;
|
||||||
s_brightness_slider.maxvalue = 13;
|
s_brightness_slider.maxvalue = 13;
|
||||||
s_brightness_slider.curvalue = ( 1.3f - vid_gamma.value + 0.5f ) * 10;
|
s_brightness_slider.curvalue = ( 1.3f - vid_gamma.value + 0.5f ) * 10;
|
||||||
@@ -618,8 +607,7 @@ public class VID extends Globals {
|
|||||||
s_fs_box.name = "fullscreen";
|
s_fs_box.name = "fullscreen";
|
||||||
s_fs_box.itemnames = yesno_names;
|
s_fs_box.itemnames = yesno_names;
|
||||||
s_fs_box.curvalue = (int)vid_fullscreen.value;
|
s_fs_box.curvalue = (int)vid_fullscreen.value;
|
||||||
s_fs_box.callback = new Menu.mcallback() {
|
s_fs_box.callback = o -> {
|
||||||
public void execute(Object o) {
|
|
||||||
int fs = ((Menu.menulist_s)o).curvalue;
|
int fs = ((Menu.menulist_s)o).curvalue;
|
||||||
if (fs == 0) {
|
if (fs == 0) {
|
||||||
s_mode_list.itemnames = resolutions;
|
s_mode_list.itemnames = resolutions;
|
||||||
@@ -632,28 +620,19 @@ public class VID extends Globals {
|
|||||||
while (i > 0 && fs_modes[i].width > mode_x) i--;
|
while (i > 0 && fs_modes[i].width > mode_x) i--;
|
||||||
s_mode_list.curvalue = i;
|
s_mode_list.curvalue = i;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
s_defaults_action.type = MTYPE_ACTION;
|
s_defaults_action.type = MTYPE_ACTION;
|
||||||
s_defaults_action.name = "reset to default";
|
s_defaults_action.name = "reset to default";
|
||||||
s_defaults_action.x = 0;
|
s_defaults_action.x = 0;
|
||||||
s_defaults_action.y = 90;
|
s_defaults_action.y = 90;
|
||||||
s_defaults_action.callback = new Menu.mcallback() {
|
s_defaults_action.callback = VID::ResetDefaults;
|
||||||
public void execute(Object self) {
|
|
||||||
ResetDefaults(self);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
s_apply_action.type = MTYPE_ACTION;
|
s_apply_action.type = MTYPE_ACTION;
|
||||||
s_apply_action.name = "apply";
|
s_apply_action.name = "apply";
|
||||||
s_apply_action.x = 0;
|
s_apply_action.x = 0;
|
||||||
s_apply_action.y = 100;
|
s_apply_action.y = 100;
|
||||||
s_apply_action.callback = new Menu.mcallback() {
|
s_apply_action.callback = VID::ApplyChanges;
|
||||||
public void execute(Object self) {
|
|
||||||
ApplyChanges(self);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
s_stipple_box.type = MTYPE_SPINCONTROL;
|
s_stipple_box.type = MTYPE_SPINCONTROL;
|
||||||
|
|||||||
10
src/lwjake2/qcommon/Callback.java
Normal file
10
src/lwjake2/qcommon/Callback.java
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
/*
|
||||||
|
* DmitriyMX <dimon550@gmail.com>
|
||||||
|
* 2018-03-08
|
||||||
|
*/
|
||||||
|
package lwjake2.qcommon;
|
||||||
|
|
||||||
|
@FunctionalInterface
|
||||||
|
public interface Callback {
|
||||||
|
void execute(Object object);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user