soft scaler improved, menu bgs fixed

[fceu.git] / drivers / gp2x / menu.c

diff --git a/drivers/gp2x/menu.c b/drivers/gp2x/menu.c
index e4b3488..5cedc85 100644 (file)
--- a/drivers/gp2x/menu.c
+++ b/drivers/gp2x/menu.c
@@ -1,7 +1,5 @@
+// menu system for gpfce - FCE Ultra port\r
 // (c) Copyright 2006,2007 notaz, All rights reserved.\r
-// Free for non-commercial use.\r
-\r
-// For commercial use, separate licencing terms must be obtained.\r
 \r
 #include <stdio.h>\r
 #include <string.h>\r
@@ -1386,10 +1384,17 @@ static void menu_prepare_bg(void)
        if (fceugi)\r
        {\r
                /* raw emu frame should now be at gp2x_screen */\r
-               soft_scale((char *)gp2x_screen + 32, gp2x_palette16, srendline, erendline-srendline);\r
-               if (srendline)\r
-                       memset32((int *)((char *)gp2x_screen + 32), 0, srendline*320*2/4);\r
-               memcpy(menu_bg, gp2x_screen + 32, 320*240*2);\r
+               if (Settings.scaling != 0)\r
+               {\r
+                       soft_scale((char *)gp2x_screen + 32, gp2x_palette16, srendline, erendline-srendline);\r
+                       if (srendline)\r
+                               memset32((int *)((char *)gp2x_screen + 32), 0, srendline*320*2/4);\r
+                       memcpy(menu_bg, gp2x_screen + 32, 320*240*2);\r
+               }\r
+               else\r
+               {\r
+                       convert2RGB555(menu_bg, gp2x_screen, gp2x_palette16, 320*240);\r
+               }\r
        }\r
        else\r
        {\r