Merge branch 'master' of gitea.planet-casio.com:Slyvtt/Collab_RPG

CMakeLists.txt

@@ -12,7 +12,7 @@ find_package(Gint 2.9 REQUIRED)
 find_package(LibProf 2.4 REQUIRED)
 
 #set the color mode either to 1b or 2b
-set(COLORMODE_fx 2b)
+set(COLORMODE_fx 1b)
 #set the color mode either to 2b or EGA64
 set(COLORMODE_cg EGA64)
 

src/config.h

@@ -1,6 +1,11 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
+
+#if !defined(FXCG50) && defined(COLOR2BIT)
+    #define GRAYMODEOK
+#endif
+
 #define USB_FEATURE 1
 
 #endif

src/dialogs.c

@@ -3,11 +3,37 @@
 #include <gint/keyboard.h>
 #include <gint/cpu.h>
 
+#include <string.h>
+
+#include "config.h"
+
+
 #define BOX_HEIGHT (F_HEIGHT/PXSIZE+8)
 
 extern font_t fontRPG;
 #define FONT_USED fontRPG
 
+#ifdef GRAYMODEOK
+    #include <gint/gray.h>
+    uint32_t *lightVRAMnext, *darkVRAMnext;
+    uint32_t *lightVRAMcurrent, *darkVRAMcurrent;
+#endif //GRAYMODEOK
+
+
+void blit()
+{
+        dupdate();
+       
+        #ifdef GRAYMODEOK
+            dgray_getvram( &lightVRAMnext, &darkVRAMnext );
+            dgray_getscreen( &lightVRAMcurrent, &darkVRAMcurrent );
+            
+            memcpy( lightVRAMnext, lightVRAMcurrent, 256*sizeof( uint32_t) );
+            memcpy( darkVRAMnext, darkVRAMcurrent, 256*sizeof( uint32_t) );
+        #endif
+}
+
+
 int showtext_opt(Game *game, bopti_image_t *face, char *text,
                  int call_before_end(void), bool start_anim, bool end_anim) {
     dfont(&FONT_USED);
@@ -19,11 +45,14 @@ int showtext_opt(Game *game, bopti_image_t *face, char *text,
     /* Run a little fancy animation. */
     for(i=0;i<BOX_HEIGHT;i++){
         draw(game);
+
         drect(0, 0, DWIDTH, i*PXSIZE, C_WHITE);
         drect(0, i*PXSIZE, DWIDTH, (i+1)*PXSIZE, C_BLACK);
         dsubimage(4*PXSIZE, 2*PXSIZE, face, 0, 0, F_WIDTH, (i-8)*PXSIZE,
               DIMAGE_NONE);
-        dupdate();
+
+        blit();
+
         while(game->frame_duration < 20) sleep();
         game->frame_duration = 0;
     }
@@ -96,7 +125,9 @@ int showtext_opt(Game *game, bopti_image_t *face, char *text,
         drect(0, i*PXSIZE, DWIDTH, (i+1)*PXSIZE, C_BLACK);
         dsubimage(4*PXSIZE, 2*PXSIZE, face, 0, 0, F_WIDTH, (i-8)*PXSIZE,
               DIMAGE_NONE);
-        dupdate();
+
+        blit();
+
         while(game->frame_duration < 20) sleep();
         game->frame_duration = 0;
     }

src/main.c

@@ -12,10 +12,6 @@
 #endif //USB_FEATURE
 
 
-#if !defined(FXCG50) && defined(COLOR2BIT)
-    #define GRAYMODEOK
-#endif
-
 #ifdef GRAYMODEOK
     #include <gint/gray.h>
 #endif //GRAYMODEOK
@@ -103,7 +99,7 @@ int main(void) {
         dgray(DGRAY_ON);
     #endif
 
-    showtext(&game, &player_face_img, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ultricies sed, dolor. Cras elementum ultrices diam. Maecenas ligula massa, varius a, semper congue, euismod non, mi. Proin porttitor, orci nec nonummy molestie, enim est eleifend mi, non fermentum diam nisl sit amet erat. Duis semper. Duis arcu massa, scelerisque vitae, consequat in, pretium a, enim. Pellentesque congue. Ut in risus volutpat libero pharetra tempor. Cras vestibulum bibendum augue. Praesent egestas leo in pede. Praesent blandit odio eu enim. Pellentesque sed dui ut augue blandit sodales. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aliquam nibh. Mauris ac mauris sed pede pellentesque fermentum. Maecenas adipiscing ante non diam sodales hendrerit. Ut velit mauris, egestas sed, gravida nec, ornare ut, mi. Aenean ut orci vel massa suscipit pulvinar. Nulla sollicitudin. Fusce varius, ligula non tempus aliquam, nunc turpis ullamcorper nibh, in tempus sapien eros vitae ligula. Pellentesque rhoncus nunc et augue. Integer id felis. Curabitur aliquet pellentesque diam. Integer quis metus vitae elit lobortis egestas. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi vel erat non mauris convallis vehicula. Nulla et sapien. Integer tortor tellus, aliquam faucibus, convallis id, congue eu, quam. Mauris ullamcorper felis vitae erat. Proin feugiat, augue non elementum posuere, metus purus iaculis lectus, et tristique ligula justo vitae magna. Aliquam convallis sollicitudin purus. Praesent aliquam, enim at fermentum mollis, ligula massa adipiscing nisl, ac euismod nibh nisl eu lectus. Fusce vulputate sem at sapien. Vivamus leo. Aliquam euismod libero eu enim. Nulla nec felis sed leo placerat imperdiet. Aenean suscipit nulla in justo. Suspendisse cursus rutrum augue. Nulla tincidunt tincidunt mi. Curabitur iaculis, lorem vel rhoncus faucibus, felis magna fermentum augue, et ultricies lacus lorem varius purus. Curabitur eu amet.");
+    showtext(&game, &player_face_img, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse lectus tortor, dignissim sit amet.");
     do{
         /* clear screen */
         dclear(C_WHITE);