p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...

diff --git a/src/lib/16_vl_2.c b/src/lib/16_vl_2.c
index 1dfa23dc3e5d7116874d70d0cca9224274809278..7fc2bf995c5b8c9816bbe958c76c69295eb69fc8 100755 (executable)
--- a/src/lib/16_vl_2.c
+++ b/src/lib/16_vl_2.c
@@ -33,8 +33,9 @@ char global_temp_status_text2[512];
 \r
 void VL_modexPrintTextBox(global_game_variables_t *gvar)\r
 {\r
-#define PRINTTEXTBOXW  gvar->video.page[0].width\r
+#define PRINTTEXTBOXW  gvar->video.page[0].sw\r
 #define PRINTTEXTBOXH  160\r
+//#define PRINTTEXTBOXSIZE     51200\r
 #define PRINTTEXTBOXHLINE              0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD,   0xCD//, 0xCD,   0xCD,   0xCD,   0xCD\r
 #define PRINTTEXTBOXHLINETOP           0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCB, 0xCD, PRINTTEXTBOXHLINE\r
 #define PRINTTEXTBOXHLINEBOTTOM        0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCA, 0xCD, PRINTTEXTBOXHLINE\r
@@ -57,16 +58,18 @@ void VL_modexPrintTextBox(global_game_variables_t *gvar)
        nibble i;\r
        boolean                 done;\r
        ScanCode                scan;\r
+//     word            huge    textboxbuff[PRINTTEXTBOXSIZE];\r
 #ifndef PRINTTEXTBOXSTABLE\r
        word q;\r
 #endif\r
        //backuppart\r
-       modexCopyPageRegion(&gvar->video.page[0], &gvar->video.page[1],\r
-                       0,\r
-                       0,\r
+       modexCopyPageRegion(&gvar->video.page[1], &gvar->video.page[0],\r
                        x,\r
-                       PRINTTEXTBOXH,\r
+                       gvar->video.page[0].height-PRINTTEXTBOXH,\r
+                       x,\r
+                       gvar->video.page[0].height-PRINTTEXTBOXH,\r
                        PRINTTEXTBOXW, PRINTTEXTBOXH);\r
+//     memcpy(&textboxbuff, gvar->video.page[0].data, PRINTTEXTBOXSIZE);\r
 //             mxOutText(xpos+1, ypos+gvar.video.page[0].height-40, "|    |Chikyuu:$line1");\r
 //             mxOutText(xpos+1, ypos+gvar.video.page[0].height-32, "|    |$line2");\r
 //             mxOutText(xpos+1, ypos+gvar.video.page[0].height-24, "|    |$line3");\r
@@ -91,6 +94,7 @@ void VL_modexPrintTextBox(global_game_variables_t *gvar)
 #endif\r
        sprintf(global_temp_status_text, "%s", str3);\r
        modexprint(&(gvar->video.page[(gvar->video.p)]), x, y+gvar->video.page[0].height-v, type, 1, col, bgcol, 1, global_temp_status_text);\r
+       //PRINT TEXT\r
        for (i = 0,done = false;!done;)\r
        {\r
                while (!(scan = gvar->in.inst->LastScan))\r
@@ -104,15 +108,18 @@ void VL_modexPrintTextBox(global_game_variables_t *gvar)
                        case sc_Escape:\r
                                done = true;\r
                        break;\r
+                       case sc_Q:\r
                        case sc_Enter:\r
                                //PM_GetPage(i, gvar);\r
                        break;\r
                }\r
        }\r
-       modexCopyPageRegion(&gvar->video.page[1], &gvar->video.page[0],\r
+\r
+       modexCopyPageRegion(&gvar->video.page[0], &gvar->video.page[1],\r
+                       x,\r
+                       gvar->video.page[0].height-PRINTTEXTBOXH,\r
                        x,\r
-                       PRINTTEXTBOXH,\r
-                       0,\r
-                       0,\r
+                       gvar->video.page[0].height-PRINTTEXTBOXH,\r
                        PRINTTEXTBOXW, PRINTTEXTBOXH);\r
+//     memcpy(&gvar->video.page[0].data, &textboxbuff, PRINTTEXTBOXSIZE);\r
 }\r

diff --git a/src/xcroll.c b/src/xcroll.c
index 2fd958694ae593fe83e6de65108d823f0ba19a55..1b42f8f04be1b0ec75803e496e6a3801792eb853 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -161,7 +161,6 @@ void main(int argc, char *argv[])
        {\r
                gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;\r
                gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;\r
-               modexWaitBorder();\r
                shinku(&gvar);\r
                //top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square\r
                //to stop scrolling and have the gvar.player position data move to the edge of the screen with respect to the direction\r