X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.c;h=798c9aee620d301092c95943d350f0570097abed;hb=17be56acf6a4d9c44762ea85bc6998955525e864;hp=436e5666d98858cfb4cd9c69a24a81efc3852ed0;hpb=7365c8dd41ee9b31982d4d3e994567918cfeeb6b;p=16.git

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 436e5666..798c9aee 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -228,6 +228,8 @@ modexDefaultPage(page_t *p)
 	page.th = page.sh/TILEWH;
 	page.tilemidposscreenx = page.tw/2;
 	page.tilemidposscreeny = (page.th/2)+1;
+	page.tilesw=p->tilesw;
+	page.tilesh=p->tilesh;
 	//pageSize = p->sw*p->sh;
 	page.id = 0;
 
@@ -426,7 +428,6 @@ modexDrawBmp(page_t *page, int x, int y, bitmap_t *bmp) {
     modexDrawBmpRegion(page, x, y, 0, 0, bmp->width, bmp->height, bmp);
 }
 
-
 void
 modexDrawBmpRegion(page_t *page, int x, int y,
                    int rx, int ry, int rw, int rh, bitmap_t *bmp) {
@@ -495,10 +496,27 @@ modexDrawBmpRegion(page_t *page, int x, int y,
 }
 
 void
-modex_sparky4_DrawBmpRegion(page_t *page, int x, int y,
-                   int rx, int ry, int rw, int rh, bitmap_t *bmp) {
-    word poffset = (word) page->data  + y*(page->width/4) + x/4;
-    byte far *data = bmp->data;//+bmp->offset;
+modexDrawPlanarBuf(page_t *page, int x, int y, planar_buf_t *bmp) {
+    /* TODO - adapt from test code */
+        int plane;
+        for(plane=0; plane < 4; plane++)
+        {
+                //fack
+        }
+}
+
+
+void
+modexDrawSprite(page_t *page, int x, int y, bitmap_t *bmp) {
+    /* draw the whole sprite */
+    modexDrawSpriteRegion(page, x, y, 0, 0, bmp->width, bmp->height, bmp);
+}
+
+/*void
+modexDrawSpriteRegion(page_t *page, int x, int y,
+                      int rx, int ry, int rw, int rh, bitmap_t *bmp) {
+    word poffset = (word)page->data + y*(page->width/4) + x/4;
+    byte *data = bmp->data;//+bmp->offset;
     word bmpOffset = (word) data + ry * bmp->width + rx;
     word width = rw;
     word height = rh;
@@ -509,11 +527,6 @@ modex_sparky4_DrawBmpRegion(page_t *page, int x, int y,
     word rowCounter;
     byte planeCounter = 4;
 
-/*	printf("bmp->data=%Fp\n",bmp->data);
-	printf("*bmp->data=%Fp\n",*(bmp->data));
-	printf("&bmp->data=%Fp\n",&(bmp->data));*/
-
-        //code is a bit slow here
     __asm {
                 MOV AX, SCREEN_SEG      ; go to the VGA memory
                 MOV ES, AX
@@ -535,7 +548,17 @@ modex_sparky4_DrawBmpRegion(page_t *page, int x, int y,
         ROW_LOOP:
                 MOV CX, width           ; count the columns
         SCAN_LOOP:
+                LODSB
+                DEC SI
+                CMP AL, 0
+                JNE DRAW_PIXEL          ; draw non-zero pixels
+
+                INC DI                  ; skip the transparent pixel
+                ADD SI, 1
+                JMP NEXT_PIXEL
+        DRAW_PIXEL:
                 MOVSB                   ; copy the pixel
+        NEXT_PIXEL:
                 SUB CX, 3               ; we skip the next 3
                 ADD SI, 3               ; skip the bmp pixels
                 LOOP SCAN_LOOP          ; finish the scan
@@ -559,24 +582,7 @@ modex_sparky4_DrawBmpRegion(page_t *page, int x, int y,
                 DEC planeCounter
                 JNZ PLANE_LOOP          ; do all 4 planes
     }
-}
-
-void
-modexDrawPlanarBuf(page_t *page, int x, int y, planar_buf_t *bmp) {
-    /* TODO - adapt from test code */
-        int plane;
-        for(plane=0; plane < 4; plane++)
-        {
-                //fack
-        }
-}
-
-
-void
-modexDrawSprite(page_t *page, int x, int y, bitmap_t *bmp) {
-    /* draw the whole sprite */
-    modexDrawSpriteRegion(page, x, y, 0, 0, bmp->width, bmp->height, bmp);
-}
+}//backup!*/
 
 void
 modexDrawSpriteRegion(page_t *page, int x, int y,
@@ -610,7 +616,7 @@ modexDrawSpriteRegion(page_t *page, int x, int y,
                 MOV AX, height          ; start the row counter
                 MOV rowCounter, AX      ;
                 MOV DI, poffset         ; go to the first pixel
-                MOV SI, bmpOffset       ; go to the bmp pixel
+                MOV DI, bmpOffset       ; go to the bmp pixel
         ROW_LOOP:
                 MOV CX, width           ; count the columns
         SCAN_LOOP:
@@ -650,7 +656,6 @@ modexDrawSpriteRegion(page_t *page, int x, int y,
     }
 }
 
-
 /* copy a region of video memory from one page to another.
  * It assumes that the left edge of the tile is the same on both
  * regions and the memory areas do not overlap.