From: sparky4 Date: Fri, 13 Feb 2015 15:49:11 +0000 (-0600) Subject: modified: pcxtest.exe X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=4ad02fbfd115a532ae478b3ba709faee3b43e0fc;p=16.git modified: pcxtest.exe modified: scroll.exe modified: src/lib/modex16.c modified: src/scroll.c modified: test.exe modified: test2.exe --- diff --git a/pcxtest.exe b/pcxtest.exe index 41fd3d95..af532db1 100644 Binary files a/pcxtest.exe and b/pcxtest.exe differ diff --git a/scroll.exe b/scroll.exe index 6bca0736..c529d4f9 100644 Binary files a/scroll.exe and b/scroll.exe differ diff --git a/src/lib/modex16.c b/src/lib/modex16.c index 0137b625..d0707ffd 100644 --- a/src/lib/modex16.c +++ b/src/lib/modex16.c @@ -288,7 +288,12 @@ modexDrawBmpRegion(page_t *page, int x, int y, void modexDrawPlanarBuf(page_t *page, int x, int y, planar_buf_t *bmp) { - /* TODO - adapt from test code */ + /* TODO - adapt from test code */ + int plane; + for(plane=0; plane < 4; plane++) + { + //fack + } } diff --git a/src/scroll.c b/src/scroll.c index 3d6dcab6..1f84af18 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -1,6 +1,7 @@ #include "src\lib\modex16.h" #include -#include +#include +#include #include "src\lib\dos_kb.h" #include "16\lib\x\modex.h" #include "src\lib\wtest\wtest.c" @@ -156,7 +157,7 @@ void main() { XMOVE mm; mm.length=emmhandle; mm.sourceH=0; - mm.sourceOff=(long)(bitmap_t *)p; + mm.sourceOff=(long)&ptmp; mm.destH=emmhandle; mm.destOff=0; //halp! @@ -217,7 +218,7 @@ void main() { npc0.q=1; npc0.d=0; modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);*/ - modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, (bitmap_t *)p); + modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp); modexClearRegion(spri->page, player.triggerx*16, player.triggery*16, 16, 16, 1); modexClearRegion(bg->page, player.triggerx*16, player.triggery*16, 16, 16, 1); @@ -225,7 +226,8 @@ void main() { modexClearRegion(spri->page, 5*16, 5*16, 16, 16, 255); modexClearRegion(bg->page, 5*16, 5*16, 16, 16, 255); - modexShowPage(spri->page); + modexShowPage(spri->page); + memcpy ( &mv2, p, (p->pwidth*(p->height))+1 ); while(!keyp(1) && player.hp>0) { //top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square @@ -356,8 +358,8 @@ void main() { if(player.q<=(TILEWH/SPEED)) { INC_PER_FRAME; - //animatePlayer(bg, spri, mask, 1, 1, player.x, player.y, persist_aniframe, q, (bitmap_t *)p); - animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, (bitmap_t *)p); + //animatePlayer(bg, spri, mask, 1, 1, player.x, player.y, persist_aniframe, q, &ptmp); + animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); mapScrollRight(bg, SPEED); mapScrollRight(spri, SPEED); //mapScrollRight(mask, SPEED); @@ -371,8 +373,8 @@ void main() { { INC_PER_FRAME; player.x+=SPEED; - //animatePlayer(bg, spri, mask, 1, 0, player.x, player.y, persist_aniframe, q, (bitmap_t *)p); - animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, (bitmap_t *)p); + //animatePlayer(bg, spri, mask, 1, 0, player.x, player.y, persist_aniframe, q, &ptmp); + animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); modexShowPage(spri->page); player.q++; } else { player.q = 1; player.d = 0; player.tx++; } @@ -380,7 +382,7 @@ void main() { else { modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32); - modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 32, 24, 32, (bitmap_t *)p); + modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 32, 24, 32, &ptmp); modexShowPage(spri->page); player.d = 0; } @@ -397,8 +399,8 @@ void main() { if(player.q<=(TILEWH/SPEED)) { INC_PER_FRAME; - //animatePlayer(bg, spri, mask, 3, 1, player.x, player.y, persist_aniframe, q, (bitmap_t *)p); - animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, (bitmap_t *)p); + //animatePlayer(bg, spri, mask, 3, 1, player.x, player.y, persist_aniframe, q, &ptmp); + animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); mapScrollLeft(bg, SPEED); mapScrollLeft(spri, SPEED); //mapScrollLeft(mask, SPEED); @@ -412,8 +414,8 @@ void main() { { INC_PER_FRAME; player.x-=SPEED; - //animatePlayer(bg, spri, mask, 3, 0, player.x, player.y, persist_aniframe, q, (bitmap_t *)p); - animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, (bitmap_t *)p); + //animatePlayer(bg, spri, mask, 3, 0, player.x, player.y, persist_aniframe, q, &ptmp); + animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); modexShowPage(spri->page); player.q++; } else { player.q = 1; player.d = 0; player.tx--; } @@ -421,7 +423,7 @@ void main() { else { modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32); - modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 96, 24, 32, (bitmap_t *)p); + modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 96, 24, 32, &ptmp); modexShowPage(spri->page); player.d = 0; } @@ -438,8 +440,8 @@ void main() { if(player.q<=(TILEWH/SPEED)) { INC_PER_FRAME; - //animatePlayer(bg, spri, mask, 2, 1, player.x, player.y, persist_aniframe, q, (bitmap_t *)p); - animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, (bitmap_t *)p); + //animatePlayer(bg, spri, mask, 2, 1, player.x, player.y, persist_aniframe, q, &ptmp); + animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); mapScrollDown(bg, SPEED); mapScrollDown(spri, SPEED); //mapScrollDown(mask, SPEED); @@ -453,8 +455,8 @@ void main() { { INC_PER_FRAME; player.y+=SPEED; - //animatePlayer(bg, spri, mask, 2, 0, player.x, player.y, persist_aniframe, q, (bitmap_t *)p); - animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, (bitmap_t *)p); + //animatePlayer(bg, spri, mask, 2, 0, player.x, player.y, persist_aniframe, q, &ptmp); + animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); modexShowPage(spri->page); player.q++; } else { player.q = 1; player.d = 0; player.ty++; } @@ -462,7 +464,7 @@ void main() { else { modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32); - modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, (bitmap_t *)p); + modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp); modexShowPage(spri->page); player.d = 0; } @@ -479,8 +481,8 @@ void main() { if(player.q<=(TILEWH/SPEED)) { INC_PER_FRAME; - //animatePlayer(bg, spri, mask, 0, 1, player.x, player.y, persist_aniframe, q, (bitmap_t *)p); - animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, (bitmap_t *)p); + //animatePlayer(bg, spri, mask, 0, 1, player.x, player.y, persist_aniframe, q, &ptmp); + animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); mapScrollUp(bg, SPEED); mapScrollUp(spri, SPEED); //mapScrollUp(mask, SPEED); @@ -494,16 +496,16 @@ void main() { { INC_PER_FRAME; player.y-=SPEED; - //animatePlayer(bg, spri, mask, 0, 0, player.x, player.y, persist_aniframe, q, (bitmap_t *)p); + //animatePlayer(bg, spri, mask, 0, 0, player.x, player.y, persist_aniframe, q, &ptmp); modexShowPage(spri->page); - animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, (bitmap_t *)p); + animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); player.q++; } else { player.q = 1; player.d = 0; player.ty--; } } else { modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32); - modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 0, 24, 32, (bitmap_t *)p); + modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 0, 24, 32, &ptmp); modexShowPage(spri->page); player.d = 0; } diff --git a/test.exe b/test.exe index 2c0f7105..c84415ec 100644 Binary files a/test.exe and b/test.exe differ diff --git a/test2.exe b/test2.exe index 6ac101b6..dad8568a 100644 Binary files a/test2.exe and b/test2.exe differ