X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=239883f678332a467dd92647881c71e3454df139;hb=47de84fccfcf27e3cf83004b74eee1215284c5df;hp=b91adf7db218ff5e583009d4e96c867808c92458;hpb=a6eadf5caebd181c24e3c210f3e5dc0b2e50b9c4;p=16.git diff --git a/src/scroll.c b/src/scroll.c index b91adf7d..239883f6 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -1,16 +1,13 @@ -#include "src\lib\modex16.h" -#include -#include -#include "src\lib\dos_kb.h" -#include "16\lib\x\modex.h" +#include "src\lib\dos_kb.h" +#include "src\lib\mapread.c" +//#include "16\lib\x\modex.h" #include "src\lib\wtest\wtest.c" -#include "src\lib\ems.c" +#include "src\lib\planar.c" +//====#include "src\lib\ems.c" //word far *clock= (word far*) 0x046C; /* 18.2hz clock */ -int emmhandle,ist; - -typedef struct { +/*typedef struct { bitmap_t *data; word tileHeight; word tileWidth; @@ -24,7 +21,7 @@ typedef struct { tiles_t *tiles; int width; int height; -} map_t; +} map_t;*/ typedef struct { @@ -61,6 +58,7 @@ 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 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 @@ -69,13 +67,18 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword //#define LOOPMAX (TILEWH/SPEED) //place holder definitions -#define MAPX 200 -#define MAPY 150 +//#define MAPX 200 +//#define MAPY 150 #define TRIGGX 10 #define TRIGGY 9 void main() { + long emmhandle; + long emsavail; + char teststr[80]; + int i; bitmap_t ptmp;//, npctmp; // player sprite + planar_buf_t *p; const char *cpus; static int persist_aniframe = 0; /* gonna be increased to 1 before being used, so 0 is ok for default */ page_t screen, screen2, screen3; @@ -87,10 +90,37 @@ void main() { actor_t player; //actor_t npc0; - if(isEMS() || checkEMS()){ printf("%d\n", coretotalEMS()); emmhandle = mallocEMS(coretotalEMS()); } +// atexit(qclean()); + /*if(!emmtest()) + { + printf("Expanded memory is not present\n"); + exit(0); + } + + if(!emmok()) + { + printf("Expanded memory manager is not present\n"); + exit(0); + } + + emsavail = emmavail(); + if(emsavail == -1) + { + printf("Expanded memory manager error\n"); + exit(0); + } + printf("There are %ld pages available\n",emsavail); + + if((emmhandle = emmalloc(emsavail)) < 0) + { + printf("Insufficient pages available\n"); + exit(0); + }*/ - /* create the map */ - map = allocMap(MAPX,MAPY); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly + /* create the map */ + loadmap("data/test.map", &map/*, 0*/); + 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 + //loadmap(NULL, &map, 1); //if(isEMS()) printf("%d tesuto\n", coretotalEMS()); initMap(&map); mv.map = ↦ @@ -103,6 +133,9 @@ void main() { ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite + /* create the planar buffer */ + p = planar_buf_from_bitmap(&ptmp); + /*if(isEMS()) { XMOVE mm; @@ -134,7 +167,7 @@ void main() { } */ /* save the palette */ - pal = modexNewPal(); + pal = modexNewPal(); modexPalSave(pal); modexFadeOff(4, pal); modexPalBlack(); @@ -208,7 +241,7 @@ void main() { //right movement if(npc0.d == 2) { - if(npc0.tx < MAPX && !(npc0.tx+1 == TRIGGX && npc0.ty == TRIGGY) && !(npc0.tx+1 == player.tx && npc0.ty == player.ty)) + 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)) { @@ -260,7 +293,7 @@ void main() { //down movement if(npc0.d == 3) { - if(npc0.ty < MAPY && !(npc0.tx == TRIGGX && npc0.ty+1 == TRIGGY) && !(npc0.tx == player.tx && npc0.ty == player.ty+1)) + 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)) { @@ -318,7 +351,7 @@ void main() { 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 < MAPX && player.tx == bg->tx + 10 && !(player.tx+1 == TRIGGX && player.ty == TRIGGY)) + if(bg->tx >= 0 && bg->tx+20 < map.width && player.tx == bg->tx + 10 && !(player.tx+1 == TRIGGX && player.ty == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) { @@ -332,7 +365,7 @@ void main() { player.q++; } else { player.q = 1; player.d = 0; player.tx++; } } - else if(player.tx < MAPX && !(player.tx+1 == TRIGGX && player.ty == TRIGGY)) + else if(player.tx < map.width && !(player.tx+1 == TRIGGX && player.ty == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) { @@ -359,7 +392,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 <= MAPX && player.tx == bg->tx + 10 && !(player.tx-1 == TRIGGX && player.ty == TRIGGY)) + if(bg->tx > 0 && bg->tx+20 <= map.width && player.tx == bg->tx + 10 && !(player.tx-1 == TRIGGX && player.ty == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) { @@ -400,7 +433,7 @@ 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 < MAPY && player.ty == bg->ty + 8 && !(player.tx == TRIGGX && player.ty+1 == TRIGGY)) + if(bg->ty >= 0 && bg->ty+15 < map.height && player.ty == bg->ty + 8 && !(player.tx == TRIGGX && player.ty+1 == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) { @@ -414,7 +447,7 @@ void main() { player.q++; } else { player.q = 1; player.d = 0; player.ty++; } } - else if(player.ty < MAPY && !(player.tx == TRIGGX && player.ty+1 == TRIGGY)) + else if(player.ty < map.height && !(player.tx == TRIGGX && player.ty+1 == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) { @@ -441,7 +474,7 @@ 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 <= MAPY && player.ty == bg->ty + 8 && !(player.tx == TRIGGX && player.ty-1 == TRIGGY)) + if(bg->ty > 0 && bg->ty+15 <= map.height && player.ty == bg->ty + 8 && !(player.tx == TRIGGX && player.ty-1 == TRIGGY)) { if(player.q<=(TILEWH/SPEED)) { @@ -489,7 +522,17 @@ 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(0x0E)) while(1){ if(xmsmalloc(24)) break; } + if(keyp(87)) + { + modexLeave(); + setkb(0); + __asm + { + mov ah,31h + int 21h + } + } } /* fade back to text mode */ @@ -519,13 +562,7 @@ void main() { //xmsfree(spri); //xmsfree(mask); //xmsreport(); - if(isEMS()) - { - printf("%d\n", get_emem()); - printf("%d\n", coretotalEMS()); - dealloc_emem(emmhandle); - printf("%d\n", coretotalEMS()); - } + //emmclose(emmhandle); switch(detectcpu()) { case 0: cpus = "8086/8088 or 186/88"; break; @@ -591,7 +628,7 @@ initMap(map_t *map) { map->tiles->rows = 1; map->tiles->cols = 2; - i=0; + /*i=0; for(y=0; ytiles->data->data[i] = 0;//0x34; i++; } - } + }*/ i=0; for(y=0; yheight; y++) { @@ -777,6 +814,13 @@ mapDrawCol(map_view_t *mv, int tx, int ty, word x) { i += mv->map->width; } } + +void qclean() +{ + modexLeave(); + setkb(0); +} + 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) {