METHOD(XonoticResolutionSlider, saveCvars, void(entity))
ENDCLASS(XonoticResolutionSlider)
entity makeXonoticResolutionSlider();
-void updateConwidths();
+void updateConwidths(float width, float height, float pixelheight);
#endif
#ifdef IMPLEMENTATION
-void updateConwidths()
+// Updates cvars (to be called by menu.qc at startup or on detected res change)
+void updateConwidths(float width, float height, float pixelheight)
{
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");
+
+ // Save off current settings.
+ cvar_set("_menu_vid_width", ftos(width));
+ cvar_set("_menu_vid_height", ftos(height));
+ cvar_set("_menu_vid_pixelheight", ftos(pixelheight));
+
+ r_x = width;
+ r_y = height;
+ r_z = 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");
f = 1;
c = c * f; // fteqcc fail
- cvar_set("vid_width", ftos(rint(r_x)));
- cvar_set("vid_height", ftos(rint(r_y)));
- cvar_set("vid_pixelheight", ftos(rint(r_z)));
cvar_set("vid_conwidth", ftos(rint(c_x)));
cvar_set("vid_conheight", ftos(rint(c_y)));
}
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
}
+float autocvar_menu_vid_allowdualscreenresolution;
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_x < 640 || r_y < 480)
continue;
if(r_x > 2 * r_y) // likely dualscreen resolution, skip this one
- continue;
+ if(autocvar_menu_vid_allowdualscreenresolution <= 0)
+ continue;
+
me.addResolution(me, r_x, r_y, r_z);
}
}
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