APMODE_ -> GF_

diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index 837102888c2ce1d7a1e64546fb4e2c9100fb4a82..e19588d2afe7e8692dbad6fa5f013130e02841f0 100644 (file)
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -2602,11 +2602,11 @@ static int canstretch(struct AmigaMonitor *mon)
        if (!WIN32GFX_IsPicassoScreen(mon)) {
                if (!currprefs.gfx_windowed_resize)
                        return 0;
-               if (currprefs.gf[APMODE_NATIVE].gfx_filter_autoscale == AUTOSCALE_RESIZE)
+               if (currprefs.gf[GF_NORMAL].gfx_filter_autoscale == AUTOSCALE_RESIZE)
                        return 0;
                return 1;
        } else {
-               if (currprefs.win32_rtgallowscaling || currprefs.gf[APMODE_RTG].gfx_filter_autoscale)
+               if (currprefs.win32_rtgallowscaling || currprefs.gf[GF_RTG].gfx_filter_autoscale)
                        return 1;
        }
        return 0;
@@ -4248,7 +4248,7 @@ void target_default_options (struct uae_prefs *p, int type)
                p->win32_powersavedisabled = true;
                p->sana2 = 0;
                p->win32_rtgmatchdepth = 1;
-               p->gf[APMODE_RTG].gfx_filter_autoscale = RTG_MODE_SCALE;
+               p->gf[GF_RTG].gfx_filter_autoscale = RTG_MODE_SCALE;
                p->win32_rtgallowscaling = 0;
                p->win32_rtgscaleaspectratio = -1;
                p->win32_rtgvblankrate = 0;
@@ -4263,10 +4263,10 @@ void target_default_options (struct uae_prefs *p, int type)
                p->gfx_api = 2;
                if (p->gfx_api > 1)
                        p->color_mode = 5;
-               if (p->gf[APMODE_NATIVE].gfx_filter == 0)
-                       p->gf[APMODE_NATIVE].gfx_filter = 1;
-               if (p->gf[APMODE_RTG].gfx_filter == 0)
-                       p->gf[APMODE_RTG].gfx_filter = 1;
+               if (p->gf[GF_NORMAL].gfx_filter == 0)
+                       p->gf[GF_NORMAL].gfx_filter = 1;
+               if (p->gf[GF_RTG].gfx_filter == 0)
+                       p->gf[GF_RTG].gfx_filter = 1;
                WIN32GUI_LoadUIString (IDS_INPUT_CUSTOM, buf, sizeof buf / sizeof (TCHAR));
                for (int i = 0; i < GAMEPORT_INPUT_SETTINGS; i++)
                        _stprintf (p->input_config_name[i], buf, i + 1);
@@ -4359,8 +4359,8 @@ void target_save_options (struct zfile *f, struct uae_prefs *p)
        cfgfile_target_dwrite_bool (f, _T("midirouter"), p->win32_midirouter);
                        
        cfgfile_target_dwrite_bool (f, _T("rtg_match_depth"), p->win32_rtgmatchdepth);
-       cfgfile_target_dwrite_bool(f, _T("rtg_scale_small"), p->gf[1].gfx_filter_autoscale == 1);
-       cfgfile_target_dwrite_bool(f, _T("rtg_scale_center"), p->gf[1].gfx_filter_autoscale == 2);
+       cfgfile_target_dwrite_bool(f, _T("rtg_scale_small"), p->gf[GF_RTG].gfx_filter_autoscale == 1);
+       cfgfile_target_dwrite_bool(f, _T("rtg_scale_center"), p->gf[GF_RTG].gfx_filter_autoscale == 2);
        cfgfile_target_dwrite_bool (f, _T("rtg_scale_allow"), p->win32_rtgallowscaling);
        cfgfile_target_dwrite (f, _T("rtg_scale_aspect_ratio"), _T("%d:%d"),
                p->win32_rtgscaleaspectratio >= 0 ? (p->win32_rtgscaleaspectratio / ASPECTMULT) : -1,
@@ -4570,12 +4570,12 @@ int target_parse_option (struct uae_prefs *p, const TCHAR *option, const TCHAR *
        if (cfgfile_yesno (option, value, _T("rtg_match_depth"), &p->win32_rtgmatchdepth))
                return 1;
        if (cfgfile_yesno (option, value, _T("rtg_scale_small"), &tbool)) {
-               p->gf[1].gfx_filter_autoscale = tbool ? RTG_MODE_SCALE : 0;
+               p->gf[GF_RTG].gfx_filter_autoscale = tbool ? RTG_MODE_SCALE : 0;
                return 1;
        }
        if (cfgfile_yesno (option, value, _T("rtg_scale_center"), &tbool)) {
                if (tbool)
-                       p->gf[1].gfx_filter_autoscale = RTG_MODE_CENTER;
+                       p->gf[GF_RTG].gfx_filter_autoscale = RTG_MODE_CENTER;
                return 1;
        }
        if (cfgfile_yesno (option, value, _T("rtg_scale_allow"), &p->win32_rtgallowscaling))