METHOD(XonoticResolutionSlider, saveCvars, void(entity))
ENDCLASS(XonoticResolutionSlider)
entity makeXonoticResolutionSlider();
+void initConwidths();
void updateConwidths();
#endif
#ifdef IMPLEMENTATION
+void initConwidths()
+{
+ cvar_set("_menu_vid_width", cvar_string("vid_width"));
+ cvar_set("_menu_vid_height", cvar_string("vid_height"));
+ cvar_set("_menu_vid_pixelheight", cvar_string("vid_pixelheight"));
+}
void updateConwidths()
{
vector r, c;
float minfactor, maxfactor;
float sz, f;
- r_x = cvar("menu_vid_width");
- r_y = cvar("menu_vid_height");
- r_z = cvar("menu_vid_pixelheight");
+ r_x = cvar("_menu_vid_width");
+ r_y = cvar("_menu_vid_height");
+ r_z = cvar("_menu_vid_pixelheight");
sz = cvar("menu_vid_scale");
// calculate the base resolution
if(f < 1)
c = c * f; // ensures that c_x <= r_x and c_y <= r_y
- minfactor = min(1, 640 / c_x); // can be > 1 only if c_x is <640
- maxfactor = max3(1, r_x / c_x, r_y / c_y); // can be < 1 only if r_x < c_x and r_y < c_y
+ minfactor = min(1, 640 / c_x); // can be > 1 only if c_x is <640
+ maxfactor = max(1, r_x / c_x, r_y / c_y); // can be < 1 only if r_x < c_x and r_y < c_y
dprint("min factor: ", ftos(minfactor), "\n");
dprint("max factor: ", ftos(maxfactor), "\n");
}
void XonoticResolutionSlider_addResolution(entity me, float w, float h, float pixelheight)
{
- me.addValue(me, strzone(strcat(ftos(w), "x", ftos(h))), strzone(strcat(ftos(w), " ", ftos(h), " ", ftos(pixelheight))));
+ me.addValue(me, strzone(sprintf(_("%dx%d"), w, h)), strzone(strcat(ftos(w), " ", ftos(h), " ", ftos(pixelheight))));
// FIXME (in case you ever want to dynamically instantiate this): THIS IS NEVER FREED
}
void XonoticResolutionSlider_configureXonoticResolutionSlider(entity me)
float i;
vector r0, r;
- me.configureXonoticTextSlider(me, "menu_vid_width");
+ me.configureXonoticTextSlider(me, "_menu_vid_width");
r0 = '0 0 0';
for(i = 0;; ++i)
if(r == r0)
continue;
r0 = r;
- if(r_x < 640 || r_y < 400)
+ if(r_x < 640 || r_y < 480)
+ continue;
+ if(r_x > 2 * r_y) // likely dualscreen resolution, skip this one
continue;
me.addResolution(me, r_x, r_y, r_z);
}
+ if(me.nValues == 0)
+ {
+ me.addResolution(me, 640, 480, 1);
+ me.addResolution(me, 800, 600, 1);
+ me.addResolution(me, 1024, 768, 1);
+ me.addResolution(me, 1280, 960, 1);
+ me.addResolution(me, 1280, 1024, 1);
+ me.addResolution(me, 1650, 1080, 1);
+ me.addResolution(me, 1920, 1080, 1);
+ }
+
me.configureXonoticTextSliderValues(me);
}
void XonoticResolutionSlider_loadCvars(entity me)
{
- me.setValueFromIdentifier(me, strcat(cvar_string("menu_vid_width"), " ", cvar_string("menu_vid_height"), " ", cvar_string("menu_vid_pixelheight")));
+ me.setValueFromIdentifier(me, strcat(cvar_string("_menu_vid_width"), " ", cvar_string("_menu_vid_height"), " ", cvar_string("_menu_vid_pixelheight")));
}
void XonoticResolutionSlider_saveCvars(entity me)
{
if(me.value >= 0 || me.value < me.nValues)
{
tokenize_console(me.getIdentifier(me));
- cvar_set("menu_vid_width", argv(0));
- cvar_set("menu_vid_height", argv(1));
- cvar_set("menu_vid_pixelheight", argv(2));
+ cvar_set("_menu_vid_width", argv(0));
+ cvar_set("_menu_vid_height", argv(1));
+ cvar_set("_menu_vid_pixelheight", argv(2));
}
}
#endif