16_ca needs huge amounts of work and I should remember what needs to be done soon...

[16.git] / src / lib / 16_rf.c

diff --git a/src/lib/16_rf.c b/src/lib/16_rf.c
index bc0afca6164f6c0165f50478650e1ca7b6d98c77..86f40456532ee01fe1185806ee259882ce1b3b16 100755 (executable)
--- a/src/lib/16_rf.c
+++ b/src/lib/16_rf.c
@@ -919,7 +919,8 @@ void RFL_CalcOriginStuff (long x, long y)
        gvar->video.ofs.pan.panx = (originxglobal>>G_P_SHIFT) & 15;\r
        gvar->video.ofs.pan.pansx = gvar->video.ofs.pan.panx & 8;\r
        gvar->video.ofs.pan.pany = gvar->video.ofs.pan.pansy = (originyglobal>>G_P_SHIFT) & 15;\r
-       gvar->video.ofs.pan.panadjust = gvar->video.ofs.pan.panx/8 + gvar->video.ofs.ylookup[gvar->video.ofs.pan.pany];\r
+//     gvar->video.ofs.pan.panadjust = gvar->video.ofs.pan.panx/8 + gvar->video.ofs.ylookup[gvar->video.ofs.pan.pany];\r
+       gvar->video.ofs.pan.panadjust = gvar->video.ofs.pan.panx/8 + (gvar->video.ofs.pan.pany*gvar->video.page[0].stridew);\r
 /*#endif\r
 \r
 #if GRMODE == CGAGR\r
@@ -1368,7 +1369,7 @@ void RFL_BoundNewOrigin (unsigned orgx,unsigned orgy)
 \r
 void RF_ClearBlock (int        x, int y, int width, int height)\r
 {\r
-       eraseblocktype block;\r
+//     eraseblocktype block;\r
 \r
 #if GRMODE == EGAGR\r
        block.screenx = x/8+originxscreen;\r
@@ -1429,7 +1430,7 @@ void RF_RedrawBlock (int x, int y, int width, int height)
 \r
 void RF_CalcTics (void)\r
 {\r
-       long    newtime,oldtimecount;\r
+       long    newtime;//,oldtimecount;\r
        word TimeCount = *clockw;\r
 \r
 //\r
@@ -2678,7 +2679,8 @@ void RFL_EraseBlocks (void)
        //\r
        // erase the block by copying from the master screen\r
        //\r
-               pos = gvar->video.ofs.ylookup[block->screeny]+block->screenx;\r
+//----         pos = gvar->video.ofs.ylookup[block->screeny]+block->screenx;\r
+               pos = (block->screeny*gvar->video.page[0].stridew)+block->screenx;\r
                block->width = (block->width + (pos&1) + 1)& ~1;\r
                pos &= ~1;                              // make sure a word copy gets used\r
 //++++         VW_ScreenToScreen (masterofs+pos,bufferofs+pos,\r