X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=65929b5a9bca125bb8a076b16a0ecef6929f3839;hb=077782026074116470d9637507d988ffcc29ef58;hp=174b7bab7c8d4a90d9e010bb705c1eb36d553a0d;hpb=3b3eab57721d856c06fd21d62cb7f0c42fbdd4f0;p=16.git diff --git a/src/scroll.c b/src/scroll.c index 174b7bab..65929b5a 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -1,11 +1,35 @@ +/* Project 16 Source Code~ + * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669 + * + * This file is part of Project 16. + * + * Project 16 is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * Project 16 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see , or + * write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + #include "src/lib/dos_kb.h" #include "src/lib/mapread.h" -#include "src/lib/wtest/wtest.c" -#include "src/lib/planar.c" +#include "src/lib/wcpu/wcpu.h" +#include "src/lib/planar.h" //====#include "src\lib\ems.c" - + //word far *clock= (word far*) 0x046C; /* 18.2hz clock */ +//optimize scroll*!!!! + typedef struct { map_t *map; page_t *page; @@ -28,21 +52,26 @@ typedef struct { word d; //direction bitmap_t data; //supposively the sprite sheet data int hp; //hitpoints of the player -} actor_t; +} actor_t; + +typedef struct +{ + map_view_t *mv; +} map_view_db_t; map_t allocMap(int w, int h); void initMap(map_t *map); -void mapScrollRight(map_view_t *mv, byte offset); -void mapScrollLeft(map_view_t *mv, byte offest); -void mapScrollUp(map_view_t *mv, byte offset); -void mapScrollDown(map_view_t *mv, byte offset); +void mapScrollRight(map_view_t *mv, byte offset, word id); +void mapScrollLeft(map_view_t *mv, byte offest, word id); +void mapScrollUp(map_view_t *mv, byte offset, word id); +void mapScrollDown(map_view_t *mv, byte offset, word id); void mapGoTo(map_view_t *mv, int tx, int ty); void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y); void mapDrawRow(map_view_t *mv, int tx, int ty, word y); void mapDrawCol(map_view_t *mv, int tx, int ty, word x); void qclean(); void pdump(map_view_t *pee); -void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, short scrolloffsetswitch, int x, int y, int ls, int lp, bitmap_t *bmp); +void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, short scrolloffsetswitch, int x, int y, int ls, int lp, bitmap_t *bmp); #define TILEWH 16 #define QUADWH TILEWH/2 @@ -56,11 +85,11 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword //#define TRIGGY 9 void main() { - size_t oldfreemem=GetFreeSize(); +//++++ size_t oldfreemem=GetFreeSize(); /*long emmhandle; long emsavail; - char teststr[80];*/ - word panswitch=0, panq=1, pand=0; //for panning! + char teststr[80];*/ + word panswitch=0, panq=1, pand=0, panpagenum=0; //for panning! int i; static word paloffset=0; bitmap_t ptmp;//, npctmp; // player sprite @@ -69,13 +98,14 @@ void main() { static int persist_aniframe = 0; /* gonna be increased to 1 before being used, so 0 is ok for default */ page_t screen, screen2, screen3; map_t map; - map_view_t mv, mv2, mv3; - map_view_t *bg, *spri, *mask;//, *tmp; + map_view_t mv[3];//mv, mv2, mv3; + map_view_t *bg, *spri, *mask;//, *tmp; + //map_view_db_t pgid[4]; byte *dpal, *gpal; - byte *ptr; + byte *ptr; byte *mappalptr; - actor_t player; - bitmap_t font; + actor_t player; +// bitmap_t font; //actor_t npc0; // atexit(qclean()); @@ -106,29 +136,29 @@ void main() { }*/ /* create the map */ -//0000 printf("Total used @ before map load: %zu\n", oldfreemem-GetFreeSize()); -//0000 fprintf(stderr, "testing~\n"); - loadmap("data/test.map", &map); -//0000 fprintf(stderr, "yay map loaded~~\n"); +//0000 printf("Total used @ before map load: %zu\n", oldfreemem-GetFreeSize()); +//0000 fprintf(stderr, "testing~\n"); + loadmap("data/test.map", &map); +//0000 fprintf(stderr, "yay map loaded~~\n"); //---- map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly //if(isEMS()) printf("%d tesuto\n", coretotalEMS()); //---- initMap(&map); - mv.map = ↦ - mv2.map = ↦ - mv3.map = ↦ + mv[0].map = ↦ + mv[1].map = ↦ + mv[2].map = ↦ /* draw the tiles */ ptr = map.data; mappalptr = map.tiles->data->palette; /* data */ -//0000 printf("Total used @ before image loading: %zu\n", oldfreemem-GetFreeSize()); - ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite - //font = bitmapLoadPcx("data/font.pcx"); +//0000 printf("Total used @ before image loading: %zu\n", oldfreemem-GetFreeSize()); + ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite +// font = bitmapLoadPcx("data/font.pcx"); //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite /* create the planar buffer */ -//0000 printf("Total used @ before planar buffer creation: %zu\n", oldfreemem-GetFreeSize()); - p = planar_buf_from_bitmap(&ptmp); +//0000 printf("Total used @ before planar buffer creation: %zu\n", oldfreemem-GetFreeSize()); + p = planar_buf_from_bitmap(&ptmp); //0000 printf("Total used @ after planar buffer creation: %zu\n", oldfreemem-GetFreeSize()); /*if(isEMS()) @@ -176,7 +206,7 @@ void main() { //printf(" %d\n", sizeof(ptmp.data)); //printf("1: %d\n", paloffset); map.tiles->data->offset=(paloffset/3); - modexPalUpdate(map.tiles->data, &paloffset, 0, 0); + //XTmodexPalUpdate(map.tiles->data, &paloffset, 0, 0); printf("\n====\n"); printf("0 paloffset= %d\n", paloffset/3); printf("====\n\n"); @@ -188,17 +218,18 @@ void main() { /* setup camera and screen~ */ screen = modexDefaultPage(); screen.width += (TILEWH*2); - screen.height += (TILEWH*2)+QUADWH; - mv.page = &screen; - screen2 = modexNextPage(mv.page); - mv2.page = &screen2; - screen3 = screen2; - mv3.page = &screen3; + screen.height += (TILEWH*2);//+QUADWH; + mv[0].page = &screen; + screen2 = modexNextPage(mv[0].page); + mv[1].page = &screen2; + screen3 = modexNextPage0(mv[1].page, 320, 240); //(352*176)+1024 is the remaining amount of memory left wwww + //screen3 = modexNextPage0(mv2.page, 320, 192); //(352*176)+1024 is the remaining amount of memory left wwww + mv[2].page = &screen3; /* set up paging */ - bg = &mv; - spri = &mv2; - mask = &mv3; + bg = &mv[0]; + spri = &mv[1]; + mask = &mv[2]; //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen mapGoTo(bg, 0, 0); @@ -229,146 +260,33 @@ void main() { modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp); modexShowPage(spri->page); -// printf("Total used @ before loop: %zu\n", oldfreemem-GetFreeSize()); +// printf("Total used @ before loop: %zu\n", oldfreemem-GetFreeSize()); + modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1); modexFadeOn(4, gpal); 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 //to stop scrolling and have the player position data move to the edge of the screen with respect to the direction //when player.tx or player.ty == 0 or player.tx == 20 or player.ty == 15 then stop because that is edge of map and you do not want to walk of the map - #define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1; - - //modexClearRegion(bg->page, player.x, player.y, 16, 16, 4); //currently the over scan color! - /*#define INC_PER_FRAME_NPC if(npc0.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1; - - if(npc0.d == 0 && npc0.q == 1) npc0.d =rand()%8; - if(npc0.d>4) - npc0.d=0; - - //right movement - if(npc0.d == 2) - { - if(npc0.tx < map.width && !(npc0.tx+1 == TRIGGX && npc0.ty == TRIGGY) && !(npc0.tx+1 == player.tx && npc0.ty == player.ty)) - { - if(npc0.q<=(TILEWH/SPEED)) - { - INC_PER_FRAME_NPC; - npc0.x+=SPEED; - //animatePlayer(bg, spri, mask, 1, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp); - animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp); - modexShowPage(spri->page); - npc0.q++; - } else { npc0.q = 1; npc0.d = 0; npc0.tx++; } - } - else - { - modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32); - modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 32, 24, 32, &npctmp); - modexShowPage(spri->page); - npc0.d = 0; - } - npc0.triggerx = npc0.tx+1; - npc0.triggery = npc0.ty; - } - - //left movement - if(npc0.d == 4) - { - if(npc0.tx > 1 && !(npc0.tx-1 == TRIGGX && npc0.ty == TRIGGY) && !(npc0.tx-1 == player.tx && npc0.ty == player.ty)) - { - if(npc0.q<=(TILEWH/SPEED)) - { - INC_PER_FRAME_NPC; - npc0.x-=SPEED; - //animatePlayer(bg, spri, mask, 3, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp); - animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp); - modexShowPage(spri->page); - npc0.q++; - } else { npc0.q = 1; npc0.d = 0; npc0.tx--; } - } - else - { - modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32); - modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 96, 24, 32, &npctmp); - modexShowPage(spri->page); - npc0.d = 0; - } - npc0.triggerx = npc0.tx-1; - npc0.triggery = npc0.ty; - } - - //down movement - if(npc0.d == 3) - { - if(npc0.ty < map.height && !(npc0.tx == TRIGGX && npc0.ty+1 == TRIGGY) && !(npc0.tx == player.tx && npc0.ty == player.ty+1)) - { - if(npc0.q<=(TILEWH/SPEED)) - { - INC_PER_FRAME_NPC; - npc0.y+=SPEED; - //animatePlayer(bg, spri, mask, 2, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp); - animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp); - modexShowPage(spri->page); - npc0.q++; - } else { npc0.q = 1; npc0.d = 0; npc0.ty++; } - } - else - { - modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32); - modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp); - modexShowPage(spri->page); - npc0.d = 0; - } - npc0.triggerx = npc0.tx; - npc0.triggery = npc0.ty+1; - } - - //up movement - if(npc0.d == 1) - { - if(npc0.ty > 1 && !(npc0.tx == TRIGGX && npc0.ty-1 == TRIGGY) && !(npc0.tx+1 == player.tx && npc0.ty == player.ty-1)) - { - if(npc0.q<=(TILEWH/SPEED)) - { - INC_PER_FRAME_NPC; - npc0.y-=SPEED; - //animatePlayer(bg, spri, mask, 0, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp); - modexShowPage(spri->page); - animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp); - npc0.q++; - } else { npc0.q = 1; npc0.d = 0; npc0.ty--; } - } - else - { - modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32); - modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 0, 24, 32, &npctmp); - modexShowPage(spri->page); - npc0.d = 0; - } - npc0.triggerx = npc0.tx; - npc0.triggery = npc0.ty-1; - } - - if((npc0.triggery == player.ty && npc0.triggerx == player.tx) || (npc0.ty == player.ty && npc0.tx == player.tx)){ player.hp--; } -*/ + #define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1; //player movement - //TODO: make movement into a function! + //TODO: make movement into a function! if(!panswitch){ //right movement if((keyp(77) && !keyp(75) && player.d == 0) || player.d == 2) { if(player.d == 0){ player.d = 2; } - if(bg->tx >= 0 && bg->tx+20 < map.width && player.tx == bg->tx + 10 && + if(bg->tx >= 0 && bg->tx+20 < map.width && player.tx == bg->tx + 10 && !(bg->map->data[(player.tx)+(map.width*(player.ty-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY)) //collision detection! { if(player.q<=(TILEWH/SPEED)) { INC_PER_FRAME; //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); + animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); + mapScrollRight(mv, SPEED, 0); + mapScrollRight(mv, SPEED, 1); //mapScrollRight(mask, SPEED); modexShowPage(spri->page); player.q++; @@ -401,7 +319,7 @@ void main() { if((keyp(75) && !keyp(77) && player.d == 0) || player.d == 4) { if(player.d == 0){ player.d = 4; } - if(bg->tx > 0 && bg->tx+20 <= map.width && player.tx == bg->tx + 10 && + if(bg->tx > 0 && bg->tx+20 <= map.width && player.tx == bg->tx + 10 && !(bg->map->data[(player.tx-2)+(map.width*(player.ty-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY)) //collision detection! { if(player.q<=(TILEWH/SPEED)) @@ -409,8 +327,8 @@ void main() { INC_PER_FRAME; //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(mv, SPEED, 0); + mapScrollLeft(mv, SPEED, 1); //mapScrollLeft(mask, SPEED); modexShowPage(spri->page); player.q++; @@ -443,16 +361,16 @@ void main() { if((keyp(80) && !keyp(72) && player.d == 0) || player.d == 3) { if(player.d == 0){ player.d = 3; } - if(bg->ty >= 0 && bg->ty+15 < map.height && player.ty == bg->ty + 8 && + if(bg->ty >= 0 && bg->ty+15 < map.height && player.ty == bg->ty + 8 && !(bg->map->data[(player.tx-1)+(map.width*(player.ty))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY)) //collision detection! { if(player.q<=(TILEWH/SPEED)) { INC_PER_FRAME; //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); + animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); + mapScrollDown(mv, SPEED, 0); + mapScrollDown(mv, SPEED, 1); //mapScrollDown(mask, SPEED); modexShowPage(spri->page); player.q++; @@ -485,16 +403,16 @@ void main() { if((keyp(72) && !keyp(80) && player.d == 0) || player.d == 1) { if(player.d == 0){ player.d = 1; } - if(bg->ty > 0 && bg->ty+15 <= map.height && player.ty == bg->ty + 8 && + if(bg->ty > 0 && bg->ty+15 <= map.height && player.ty == bg->ty + 8 && !(bg->map->data[(player.tx-1)+(map.width*(player.ty-2))] == 0))//!(player.tx == TRIGGX && player.ty-1 == TRIGGY)) //collision detection! { if(player.q<=(TILEWH/SPEED)) { INC_PER_FRAME; //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); + animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); + mapScrollUp(mv, SPEED, 0); + mapScrollUp(mv, SPEED, 1); //mapScrollUp(mask, SPEED); modexShowPage(spri->page); player.q++; @@ -522,18 +440,32 @@ void main() { player.triggerx = player.tx; player.triggery = player.ty-1; } -}else{ -//88 switch! +}else{ +//88 switch! //right movement if((keyp(77) && !keyp(75) && pand == 0) || pand == 2) { if(pand == 0){ pand = 2; } if(panq<=(TILEWH/SPEED)) - { - bg->page->dx++; - spri->page->dx++; - modexShowPage(bg->page); - modexShowPage(spri->page); + { + switch(panpagenum) + { + case 0: + //bg + bg->page->dx++; + modexShowPage(bg->page); + break; + case 1: + //spri + spri->page->dx++; + modexShowPage(spri->page); + break; + case 2: + //fg + mask->page->dx++; + modexShowPage(mask->page); + break; + } panq++; } else { panq = 1; pand = 0; } } @@ -543,10 +475,24 @@ void main() { if(pand == 0){ pand = 4; } if(panq<=(TILEWH/SPEED)) { - bg->page->dx--; - spri->page->dx--; - modexShowPage(bg->page); - modexShowPage(spri->page); + switch(panpagenum) + { + case 0: + //bg + bg->page->dx--; + modexShowPage(bg->page); + break; + case 1: + //spri + spri->page->dx--; + modexShowPage(spri->page); + break; + case 2: + //fg + mask->page->dx--; + modexShowPage(mask->page); + break; + } panq++; } else { panq = 1; pand = 0; } } @@ -556,10 +502,24 @@ void main() { if(pand == 0){ pand = 3; } if(panq<=(TILEWH/SPEED)) { - bg->page->dy--; - spri->page->dy--; - modexShowPage(bg->page); - modexShowPage(spri->page); + switch(panpagenum) + { + case 0: + //bg + bg->page->dy--; + modexShowPage(bg->page); + break; + case 1: + //spri + spri->page->dy--; + modexShowPage(spri->page); + break; + case 2: + //fg + mask->page->dy--; + modexShowPage(mask->page); + break; + } panq++; } else { panq = 1; pand = 0; } } @@ -569,15 +529,32 @@ void main() { if(pand == 0){ pand = 1; } if(panq<=(TILEWH/SPEED)) { - bg->page->dy++; - spri->page->dy++; - modexShowPage(bg->page); - modexShowPage(spri->page); + switch(panpagenum) + { + case 0: + //bg + bg->page->dy++; + modexShowPage(bg->page); + break; + case 1: + //spri + spri->page->dy++; + modexShowPage(spri->page); + break; + case 2: + //fg + mask->page->dy++; + modexShowPage(mask->page); + break; + } panq++; } else { panq = 1; pand = 0; } - } + } } - //if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5)) + + //the scripting stuf.... + + //if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5)) if(((bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0) && keyp(0x1C))||(player.tx == 5 && player.ty == 5)) { short i; @@ -588,20 +565,24 @@ void main() { nosound(); } if(player.q == (TILEWH/SPEED)+1 && player.d > 0 && (player.triggerx == 5 && player.triggery == 5)){ player.hp--; } - //if(keyp(0x0E)) while(1){ if(xmsmalloc(24)) break; } - if(keyp(0x44)) bputs(bg->page, &font, player.triggerx, player.triggery, "wwww"); //f10 - if(keyp(25)){ pdump(bg); pdump(spri); } + //debugging binds! + //if(keyp(0x0E)) while(1){ if(xmsmalloc(24)) break; } + if(keyp(2)){ modexShowPage(bg->page); panpagenum=0; } + if(keyp(3)){ modexShowPage(spri->page); panpagenum=1; } + if(keyp(4)){ modexShowPage(mask->page); panpagenum=2; } + if(keyp(0x44)){ bputs(spri->page, player.x+(TILEWH*2), player.y+(TILEWH*2), "wwww"); } //f10 + if(keyp(25)){ pdump(bg); pdump(spri); } //p if(keyp(24)){ modexPalUpdate0(gpal); paloffset=0; pdump(bg); pdump(spri); } if(keyp(22)){ paloffset=0; modexPalBlack(); modexPalUpdate(&ptmp, &paloffset, 0, 0); printf("1paloffset = %d\n", paloffset/3); modexPalUpdate(map.tiles->data, &paloffset, 0, 0); printf("2paloffset = %d\n", paloffset/3); - pdump(bg); pdump(spri); } + pdump(bg); pdump(spri); } //pan switch - if(keyp(88)){if(!panswitch) panswitch++; else panswitch--; } + if(keyp(88)){if(!panswitch) panswitch++; else panswitch--; } //f12 //TSR - if(keyp(87)) + if(keyp(87)) //f11 { modexLeave(); setkb(0); @@ -610,9 +591,9 @@ void main() { mov ah,31h int 21h } - } - - if((player.q==1) && !(player.x%TILEWH==0 && player.y%TILEWH==0)) break; //incase things go out of sync! + } + + if((player.q==1) && !(player.x%TILEWH==0 && player.y%TILEWH==0)) break; //incase things go out of sync! } @@ -625,30 +606,30 @@ void main() { setkb(0); printf("Project 16 scroll.exe\n"); printf("tx: %d\n", bg->tx); - printf("ty: %d\n", bg->ty); + printf("ty: %d\n", bg->ty); printf("player.x: %d", player.x); printf(" player.y: %d\n", player.y); //if(player.hp==0) printf("%d wwww\n", player.y+8); //else printf("\nplayer.y: %d\n", player.y); printf("player.tx: %d", player.tx); printf(" player.ty: %d\n", player.ty); printf("player.triggx: %d", player.triggerx); printf(" player.triggy: %d\n", player.triggery); - printf("player.hp: %d", player.hp); printf(" player.q: %d", player.q); printf(" player.d: %d\n", player.d); + printf("player.hp: %d", player.hp); printf(" player.q: %d", player.q); printf(" player.d: %d\n", player.d); printf("tile data value at player trigger position: %d\n", bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))]); printf("palette offset: %d\n", paloffset/3); - printf("Total used: %zu\n", oldfreemem-GetFreeSize()); - printf("Total free: %zu\n", GetFreeSize()); +//++++ printf("Total used: %zu\n", oldfreemem-GetFreeSize()); +//++++ printf("Total free: %zu\n", GetFreeSize()); printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n"); printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n"); printf("Screen: %dx", screen.width); printf("%d\n", screen.height); - printf("Screen2: %dx", screen2.width); printf("%d\n", screen2.height); + printf("Screen2: %dx", screen2.width); printf("%d\n", screen2.height); //printf("map.width=%d map.height=%d map.data[0]=%d\n", bg->map->width, bg->map->height, bg->map->data[0]); //xmsfree(&map); //xmsfree(bg); //xmsfree(spri); //xmsfree(mask); //xmsreport(); - //emmclose(emmhandle); - printf("%Fp\n", bios_8x8_font()); - printf("%c\n", *bios_8x8_font()); + //emmclose(emmhandle); + printf("%Fp\n", bios_8x8_font()); + //printf("%c\n", *bios_8x8_font()); switch(detectcpu()) { case 0: cpus = "8086/8088 or 186/88"; break; @@ -746,98 +727,111 @@ initMap(map_t *map) { } //tile = tile ? 0 : 1; }*/ -} - +} + void -mapScrollRight(map_view_t *mv, byte offset) { +mapScrollRight(map_view_t *mv, byte offset, word id) +{ word x, y; /* coordinate for drawing */ /* increment the pixel position and update the page */ - mv->page->dx += offset; + mv[id].page->dx += offset; /* check to see if this changes the tile */ - if(mv->page->dx >= mv->dxThresh ) { + if(mv[id].page->dx >= mv[id].dxThresh ) { /* go forward one tile */ - mv->tx++; + mv[id].tx++; /* Snap the origin forward */ - mv->page->data += 4; - mv->page->dx = mv->map->tiles->tileWidth; - //} + mv[id].page->data += 4; + mv[id].page->dx = mv[id].map->tiles->tileWidth; /* draw the next column */ - x= SCREEN_WIDTH + mv->map->tiles->tileWidth; - mapDrawCol(mv, mv->tx + 20 , mv->ty-1, x); + x= SCREEN_WIDTH + mv[id].map->tiles->tileWidth; + if(id==0) + mapDrawCol(&mv[0], mv[0].tx + 20 , mv[0].ty-1, x); + else + modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*17); } } void -mapScrollLeft(map_view_t *mv, byte offset) { +mapScrollLeft(map_view_t *mv, byte offset, word id) +{ word x, y; /* coordinate for drawing */ /* increment the pixel position and update the page */ - mv->page->dx -= offset; + mv[id].page->dx -= offset; /* check to see if this changes the tile */ - if(mv->page->dx == 0) { + if(mv[id].page->dx == 0) { /* go backward one tile */ - mv->tx--; + mv[id].tx--; /* Snap the origin backward */ - mv->page->data -= 4; - mv->page->dx = mv->map->tiles->tileWidth; - //} - /* draw the next column */ - mapDrawCol(mv, mv->tx-1, mv->ty-1, 0); + mv[id].page->data -= 4; + mv[id].page->dx = mv[id].map->tiles->tileWidth; + + /* draw the next column */ + x= 0; + if(id==0) + mapDrawCol(&mv[0], mv[0].tx-1, mv[0].ty-1, 0); + else + modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*17); } } void -mapScrollUp(map_view_t *mv, byte offset) { +mapScrollUp(map_view_t *mv, byte offset, word id) +{ word x, y; /* coordinate for drawing */ /* increment the pixel position and update the page */ - mv->page->dy -= offset; + mv[id].page->dy -= offset; /* check to see if this changes the tile */ - if(mv->page->dy == 0 ) { + if(mv[id].page->dy == 0 ) { /* go down one tile */ - mv->ty--; + mv[id].ty--; /* Snap the origin downward */ - mv->page->data -= mv->page->width*4; - mv->page->dy = mv->map->tiles->tileHeight; - //} + mv[id].page->data -= mv[id].page->width*4; + mv[id].page->dy = mv[id].map->tiles->tileHeight; /* draw the next row */ y= 0; - mapDrawRow(mv, mv->tx-1 , mv->ty-1, y); + if(id==0) + mapDrawRow(&mv[0], mv[0].tx-1 , mv[0].ty-1, 0); + else + modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*22, mv[id].map->tiles->tileHeight); } } void -mapScrollDown(map_view_t *mv, byte offset) { +mapScrollDown(map_view_t *mv, byte offset, word id) +{ word x, y; /* coordinate for drawing */ /* increment the pixel position and update the page */ - mv->page->dy += offset; + mv[id].page->dy += offset; /* check to see if this changes the tile */ - if(mv->page->dy >= mv->dyThresh ) { + if(mv[id].page->dy >= mv[id].dyThresh ) { /* go down one tile */ - mv->ty++; + mv[id].ty++; /* Snap the origin downward */ - mv->page->data += mv->page->width*4; - mv->page->dy = mv->map->tiles->tileHeight; - //} + mv[id].page->data += mv[id].page->width*4; + mv[id].page->dy = mv[id].map->tiles->tileHeight; /* draw the next row */ - y= SCREEN_HEIGHT + mv->map->tiles->tileHeight; - mapDrawRow(mv, mv->tx-1 , mv->ty+15, y); + y= SCREEN_HEIGHT + mv[id].map->tiles->tileHeight; + if(id==0) + mapDrawRow(&mv[0], mv[0].tx-1 , mv[0].ty+15, y); + else + modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*22, mv[id].map->tiles->tileHeight); } - } @@ -858,8 +852,8 @@ mapGoTo(map_view_t *mv, int tx, int ty) { /* draw the tiles */ modexClearRegion(mv->page, 0, 0, mv->page->width, mv->page->height, 0); - py=0; - i=mv->ty * mv->map->width + mv->tx; + py=0; + i=mv->ty * mv->map->width + mv->tx; for(ty=mv->ty-1; py < SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; ty++, py+=mv->map->tiles->tileHeight) { mapDrawRow(mv, tx-1, ty, py); i+=mv->map->width - tx; @@ -874,13 +868,13 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) { //if(i==0) i=2; if(i==0) { - //wwww + //wwww modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 0); //currently the over scan color! } else { rx = (((i-1) % ((t->data->width)/t->tileWidth)) * t->tileWidth); - ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight); + ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight); ////0000 printf("i=%d\n", i); //mxPutTile(t->data, x, y, t->tileWidth, t->tileHeight); modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data)); @@ -894,7 +888,7 @@ mapDrawRow(map_view_t *mv, int tx, int ty, word y) { int i; /* the position within the map array */ - i=ty * mv->map->width + tx; + i=ty * mv->map->width + tx; for(x=0; xdxThresh && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) { if(i>=0) { /* we are in the map, so copy! */ @@ -983,5 +977,6 @@ animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, s //modexClearRegion(top->page, 66, 66, 2, 40, 0); //modexCopyPageRegion(dest->page, top->page, 66, 66, 66, 66, 2, 40); //turn this off if XT - if(detectcpu() > 0) modexWaitBorder(); + //XTif(detectcpu() > 0) + modexWaitBorder(); }