Removed obsolete variables

diff --git a/custom.cpp b/custom.cpp
index 416f697e0b14b04df5f1885790e92ed2d40d1468..3292b2fc9a91304e39d7b92a39ac482ec62d3bf3 100644 (file)
--- a/custom.cpp
+++ b/custom.cpp
@@ -1651,7 +1651,6 @@ static void update_display_vars(void)
        }
 
        vb->inwidth = (current_linear_hpos_short - (display_hstart_cyclewait_skip_start + display_hstart_cyclewait_skip_end)) << (res2 + 1);
-       vb->inwidth2 = vb->inwidth;
        vb->extrawidth = -2;
        if (currprefs.gfx_extrawidth > 0) {
                vb->extrawidth = currprefs.gfx_extrawidth << res2;
@@ -1676,7 +1675,6 @@ static void update_display_vars(void)
                linear_vpos_vb_end = 0;
        }
        vb->inheight = maxv << vres2;
-       vb->inheight2 = vb->inheight;
        vb->inxoffset = 0;
 
        if (currprefs.gfx_overscanmode >= OVERSCANMODE_ULTRA) {
@@ -1696,12 +1694,8 @@ static void update_display_vars(void)
 
        if (vb->inwidth < 16)
                vb->inwidth = 16;
-       if (vb->inwidth2 < 16)
-               vb->inwidth2 = 16;
        if (vb->inheight < 1)
                vb->inheight = 1;
-       if (vb->inheight2 < 1)
-               vb->inheight2 = 1;
 
        if (!vb->hardwiredpositioning) {
                vb->outwidth = vb->inwidth;
@@ -1729,13 +1723,9 @@ static void update_display_vars(void)
 
        if (vb->inwidth > vb->width_allocated)
                vb->inwidth = vb->width_allocated;
-       if (vb->inwidth2 > vb->width_allocated)
-               vb->inwidth2 = vb->width_allocated;
-
+       
        if (vb->inheight > vb->height_allocated)
                vb->inheight = vb->height_allocated;
-       if (vb->inheight2 > vb->height_allocated)
-               vb->inheight2 = vb->height_allocated;
 
        if (vb->outwidth > vb->width_allocated)
                vb->outwidth = vb->width_allocated;

diff --git a/drawing.cpp b/drawing.cpp
index 990abfd45c83066ab9054aa2615722761f33f596..e98cf2647d8a1b31091d8f6d8c8e04f4307d6d9e 100644 (file)
--- a/drawing.cpp
+++ b/drawing.cpp
@@ -1987,8 +1987,6 @@ static void setnativeposition(struct vidbuffer *vb)
        struct vidbuf_description *vidinfo = &adisplays[0].gfxvidinfo;
        vb->inwidth = vidinfo->inbuffer->inwidth;
        vb->inheight = vidinfo->inbuffer->inheight;
-       vb->inwidth2 = vidinfo->inbuffer->inwidth2;
-       vb->inheight2 = vidinfo->inbuffer->inheight2;
        vb->outwidth = vidinfo->inbuffer->outwidth;
        vb->outheight = vidinfo->inbuffer->outheight;
 }

diff --git a/include/xwin.h b/include/xwin.h
index cf103bab29cbc09e42db0edbf51bd5bd61db8f0d..2f06950c4128fd4d7dad7bd90eb0925864d407b2 100644 (file)
--- a/include/xwin.h
+++ b/include/xwin.h
@@ -102,9 +102,6 @@ struct vidbuffer
        /* nominal size of image for centering */
        int inwidth;
        int inheight;
-       /* same but doublescan multiplier included */
-       int inwidth2;
-       int inheight2;
        /* static, hardwired screen position and size (A2024) */
        bool hardwiredpositioning;
        /* extra width, chipset hpos extra in right border */

diff --git a/specialmonitors.cpp b/specialmonitors.cpp
index db0823063439af26561a9071ef73cf1ec2e9f844..2f35ef49b758bb43450eb9abdae83b6745495e7c 100755 (executable)
--- a/specialmonitors.cpp
+++ b/specialmonitors.cpp
@@ -93,8 +93,6 @@ static bool specialmonitor_setresolution(struct vidbuffer *src, struct vidbuffer
        dst->outheight = height;
        dst->inwidth = width;
        dst->inheight = height;
-       dst->inwidth2 = width;
-       dst->inheight2 = height;
        src->hardwiredpositioning = !nativeposition;
        dst->hardwiredpositioning = !nativeposition;