]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
make it compile
authorRudolf Polzer <divverent@xonotic.org>
Wed, 18 Sep 2013 08:47:11 +0000 (10:47 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 18 Sep 2013 08:47:11 +0000 (10:47 +0200)
qcsrc/menu/xonotic/slider_resolution.c

index 128ab0c6ac02e7d60d221b7e5a33c6ec21d92ce8..e6d9096daf16e285e5742013a853bb46b0de0423 100644 (file)
@@ -6,7 +6,7 @@ CLASS(XonoticResolutionSlider) EXTENDS(XonoticTextSlider)
        METHOD(XonoticResolutionSlider, loadCvars, void(entity))
        METHOD(XonoticResolutionSlider, saveCvars, void(entity))
        METHOD(XonoticResolutionSlider, draw, void(entity))
        METHOD(XonoticResolutionSlider, loadCvars, void(entity))
        METHOD(XonoticResolutionSlider, saveCvars, void(entity))
        METHOD(XonoticResolutionSlider, draw, void(entity))
-       ATTRIB(XonoticResolutionSlider, vid_fullscreen, float)
+       ATTRIB(XonoticResolutionSlider, vid_fullscreen, float, -1)
 ENDCLASS(XonoticResolutionSlider)
 entity makeXonoticResolutionSlider();
 void updateConwidths(float width, float height, float pixelheight);
 ENDCLASS(XonoticResolutionSlider)
 entity makeXonoticResolutionSlider();
 void updateConwidths(float width, float height, float pixelheight);
@@ -79,7 +79,7 @@ void XonoticResolutionSlider_addResolution(entity me, float w, float h, float pi
                float bestdenom = rint(aspect);
                float bestnum = 1;
                float denom;
                float bestdenom = rint(aspect);
                float bestnum = 1;
                float denom;
-               for (denom = 2; i < 10; ++i) {
+               for (denom = 2; denom < 10; ++denom) {
                        float num = rint(aspect * denom);
                        if (fabs(num / denom - aspect) < fabs(bestnum / bestdenom - aspect))
                        {
                        float num = rint(aspect * denom);
                        if (fabs(num / denom - aspect) < fabs(bestnum / bestdenom - aspect))
                        {
@@ -96,15 +96,15 @@ void XonoticResolutionSlider_addResolution(entity me, float w, float h, float pi
 float autocvar_menu_vid_allowdualscreenresolution;
 void XonoticResolutionSlider_configureXonoticResolutionSlider(entity me)
 {
 float autocvar_menu_vid_allowdualscreenresolution;
 void XonoticResolutionSlider_configureXonoticResolutionSlider(entity me)
 {
-       float i;
-       vector r0, r;
-
        me.configureXonoticTextSlider(me, "_menu_vid_width");
        me.loadResolutions(me, cvar("vid_fullscreen"));
 }
 void XonoticTextSlider_loadResolutions(entity me, float fullscreen)
 {
        me.configureXonoticTextSlider(me, "_menu_vid_width");
        me.loadResolutions(me, cvar("vid_fullscreen"));
 }
 void XonoticTextSlider_loadResolutions(entity me, float fullscreen)
 {
-       me.clearValues();
+       float i;
+       vector r0, r;
+
+       me.clearValues(me);
 
        if (fullscreen)
        {
 
        if (fullscreen)
        {