rearrange globals

[picodrive.git] / pico / draw.c

diff --git a/pico/draw.c b/pico/draw.c
index 83010a4..0939f3f 100644 (file)
--- a/pico/draw.c
+++ b/pico/draw.c
@@ -1027,7 +1027,7 @@ static NOINLINE void PrepareSprites(int full)
 \r
   if (!(Pico.video.reg[12]&1))\r
     max_sprites = 64, max_line_sprites = 16, max_width = 264;\r
-  if (PicoOpt & POPT_DIS_SPRITE_LIM)\r
+  if (PicoIn.opt & POPT_DIS_SPRITE_LIM)\r
     max_line_sprites = MAX_LINE_SPRITES;\r
 \r
   if (pvid->reg[1]&8) max_lines = 240;\r
@@ -1267,7 +1267,7 @@ void FinalizeLine555(int sh, int line, struct PicoEState *est)
   if (Pico.video.reg[12]&1) {\r
     len = 320;\r
   } else {\r
-    if (!(PicoOpt&POPT_DIS_32C_BORDER)) pd+=32;\r
+    if (!(PicoIn.opt&POPT_DIS_32C_BORDER)) pd+=32;\r
     len = 256;\r
   }\r
 \r
@@ -1314,7 +1314,7 @@ static void FinalizeLine8bit(int sh, int line, struct PicoEState *est)
   if (Pico.video.reg[12]&1) {\r
     len = 320;\r
   } else {\r
-    if (!(PicoOpt & POPT_DIS_32C_BORDER))\r
+    if (!(PicoIn.opt & POPT_DIS_32C_BORDER))\r
       pd += 32;\r
     len = 256;\r
   }\r
@@ -1427,7 +1427,7 @@ static int DrawDisplay(int sh)
   else if (est->rendstatus & PDRAW_INTERLACE)\r
     DrawAllSpritesInterlace(1, sh);\r
   // have sprites without layer pri bit ontop of sprites with that bit\r
-  else if ((sprited[1] & 0xd0) == 0xd0 && (PicoOpt & POPT_ACC_SPRITES))\r
+  else if ((sprited[1] & 0xd0) == 0xd0 && (PicoIn.opt & POPT_ACC_SPRITES))\r
     DrawSpritesHiAS(sprited, sh);\r
   else if (sh && (sprited[1] & SPRL_MAY_HAVE_OP))\r
     DrawSpritesSHi(sprited, est);\r
@@ -1481,7 +1481,7 @@ PICO_INTERNAL void PicoFrameStart(void)
   Pico.est.DrawScanline = 0;\r
   skip_next_line = 0;\r
 \r
-  if (PicoOpt & POPT_ALT_RENDERER)\r
+  if (PicoIn.opt & POPT_ALT_RENDERER)\r
     return;\r
 \r
   if (Pico.m.dirtyPal)\r
@@ -1577,7 +1577,7 @@ void PicoDrawUpdateHighPal(void)
 {\r
   struct PicoEState *est = &Pico.est;\r
   int sh = (Pico.video.reg[0xC] & 8) >> 3; // shadow/hilight?\r
-  if (PicoOpt & POPT_ALT_RENDERER)\r
+  if (PicoIn.opt & POPT_ALT_RENDERER)\r
     sh = 0; // no s/h support\r
 \r
   PicoDoHighPal555(sh, 0, &Pico.est);\r
@@ -1597,7 +1597,7 @@ void PicoDrawSetOutFormat(pdso_t which, int use_32x_line_mode)
       break;\r
 \r
     case PDF_RGB555:\r
-      if ((PicoAHW & PAHW_32X) && use_32x_line_mode)\r
+      if ((PicoIn.AHW & PAHW_32X) && use_32x_line_mode)\r
         FinalizeLine = FinalizeLine32xRGB555;\r
       else\r
         FinalizeLine = FinalizeLine555;\r
@@ -1640,7 +1640,7 @@ void PicoDrawSetCallbacks(int (*begin)(unsigned int num), int (*end)(unsigned in
   PicoScan32xBegin = NULL;\r
   PicoScan32xEnd = NULL;\r
 \r
-  if ((PicoAHW & PAHW_32X) && FinalizeLine != FinalizeLine32xRGB555) {\r
+  if ((PicoIn.AHW & PAHW_32X) && FinalizeLine != FinalizeLine32xRGB555) {\r
     PicoScan32xBegin = begin;\r
     PicoScan32xEnd = end;\r
   }\r