X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=239883f678332a467dd92647881c71e3454df139;hb=47de84fccfcf27e3cf83004b74eee1215284c5df;hp=2240325b669cd597262f3086c7aa2e09d7bcda7b;hpb=740fdaa69f52c6c312264e473787cbcd2baf7993;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index 2240325b..239883f6 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,13 +1,13 @@
-#include "src\lib\modex16.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include "src\lib\dos_kb.h"
-#include "src\lib\wtest\wtest.c"
-#include "src\lib\xms.c"
+#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\planar.c"
+//====#include "src\lib\ems.c"
 
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */
 
-typedef struct {
+/*typedef struct {
 	bitmap_t *data;
 	word tileHeight;
 	word tileWidth;
@@ -21,7 +21,7 @@ typedef struct {
 	tiles_t *tiles;
 	int width;
 	int height;
-} map_t;
+} map_t;*/
 
 
 typedef struct {
@@ -39,15 +39,15 @@ typedef struct {
 	int tx; //player tile position on the viewable map
 	int ty; //player tile position on the viewable map
 	int triggerx; //player's trigger box tile position on the viewable map
-	int triggery; //player's trigger box tile position on the viewable map
-	int setx; //NOT USED YET! player sprite sheet set on the image x
+	int triggery; //player's trigger box tile position on the viewable map
+	int setx; //NOT USED YET! player sprite sheet set on the image x
 	int sety; //NOT USED YET! player sprite sheet set on the image y
 	word q; //loop variable
 	word d; //direction
+	bitmap_t data; //supposively the sprite sheet data
 	int hp; //hitpoints of the player
 } actor_t;
 
-
 map_t allocMap(int w, int h);
 void initMap(map_t *map);
 void mapScrollRight(map_view_t *mv, byte offset);
@@ -58,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
@@ -66,32 +67,61 @@ 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;
 	map_t map;
 	map_view_t mv, mv2, mv3;
-	map_view_t *bg, *spri, *mask;//, *tmp;
+	map_view_t *bg, *spri, *mask;//, *tmp;
 	byte *pal;
 	byte *ptr;
 	actor_t player;
 	//actor_t npc0;
 
-	/* save the palette */
-	pal  = modexNewPal();
-	modexPalSave(pal);
-	modexFadeOff(4, pal);
-	modexPalBlack();
+//	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);
 
-	/* 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
+	if((emmhandle = emmalloc(emsavail)) < 0)
+	{
+		printf("Insufficient pages available\n");
+		exit(0);
+	}*/
+
+	/* 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 = &map;
 	mv2.map = &map;
@@ -100,8 +130,48 @@ void main() {
 	/* draw the tiles */
 	ptr = map.data;
 	/* data */
-	ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite
+	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;
+		mm.length=sizeof(map);
+		mm.sourceH=0;
+		mm.sourceOff=(long)&map;
+		mm.destH=emmhandle;
+		mm.destOff=1;
+		//halp!
+		ist = move_emem(&mm);
+		printf("%d\n", coretotalEMS());
+		if(!ist){ dealloc_emem(emmhandle); exit(5); }
+		//printf("%d\n", emmhandle);
+	}
+
+	if(isEMS())
+	{
+		XMOVE mm;
+		mm.length=emmhandle;
+		mm.sourceH=0;
+		mm.sourceOff=(long)&ptmp;
+		mm.destH=emmhandle;
+		mm.destOff=0;
+		//halp!
+		ist = move_emem(&mm);
+		printf("%d\n", coretotalEMS());
+		if(!ist){ dealloc_emem(emmhandle); exit(5); }
+		//printf("%d\n", emmhandle);
+	}
+*/
+	/* save the palette */
+	pal = modexNewPal();
+	modexPalSave(pal);
+	modexFadeOff(4, pal);
+	modexPalBlack();
+
 	setkb(1);
 	modexEnter();
 	modexPalBlack();
@@ -127,7 +197,7 @@ void main() {
 	//mapGoTo(mask, 0, 0);
 
 	//TODO: put player in starting position of spot
-	//default player position on the viewable map
+	//default player position on the viewable map
 	player.tx = bg->tx + 10;
 	player.ty = bg->ty + 8;
 	player.x = player.tx*TILEWH;
@@ -135,9 +205,9 @@ void main() {
 	player.triggerx = player.tx;
 	player.triggery = player.ty+1;
 	player.q=1;
-	player.d=0;
-	player.hp=4;
-	//npc
+	player.d=0;
+	player.hp=4;
+	//npc
 	/*npc0.tx = bg->tx + 1;
 	npc0.ty = bg->ty + 1;
 	npc0.x = npc0.tx*TILEWH;
@@ -145,33 +215,33 @@ void main() {
 	npc0.triggerx = npc0.tx;
 	npc0.triggery = npc0.ty+1;
 	npc0.q=1;
-	npc0.d=0;
+	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, &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);
-
+	modexClearRegion(bg->page, player.triggerx*16, player.triggery*16, 16, 16, 1);
+
 	modexClearRegion(spri->page, 5*16, 5*16, 16, 16, 255);
 	modexClearRegion(bg->page, 5*16, 5*16, 16, 16, 255);
-
+
 	modexShowPage(spri->page);
-	while(!keyp(1) && player.hp!=0)
+	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;
-	/*#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;
-
+	#define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;
+	/*#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 < 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))
 			{
@@ -192,11 +262,11 @@ void main() {
 		}
 		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))
@@ -218,12 +288,12 @@ void main() {
 		}
 		npc0.triggerx = npc0.tx-1;
 		npc0.triggery = npc0.ty;
-	}
+	}
 
 	//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))
 			{
@@ -245,10 +315,10 @@ void main() {
 		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))
@@ -270,18 +340,18 @@ void main() {
 		}
 		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--; }
-*/
-
-	//player movement
-	//TODO: make movement into a function!
+	}
+
+	if((npc0.triggery == player.ty && npc0.triggerx == player.tx) || (npc0.ty == player.ty && npc0.tx == player.tx)){ player.hp--; }
+*/
+
+	//player movement
+	//TODO: make movement into a function!
 	//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 < 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))
 			{
@@ -295,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))
 			{
@@ -316,13 +386,13 @@ void main() {
 		}
 		player.triggerx = player.tx+1;
 		player.triggery = player.ty;
-	}
+	}
 
 	//left movement
 	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))
 			{
@@ -357,13 +427,13 @@ void main() {
 		}
 		player.triggerx = player.tx-1;
 		player.triggery = player.ty;
-	}
+	}
 
 	//down movement
 	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))
 			{
@@ -377,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))
 			{
@@ -399,12 +469,12 @@ void main() {
 		player.triggerx = player.tx;
 		player.triggery = player.ty+1;
 	}
-
+
 	//up movement
 	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))
 			{
@@ -441,7 +511,7 @@ void main() {
 		player.triggery = player.ty-1;
 	}
 	//modexClearRegion(mask->page, 66, 66, 2, 40, 0);
-
+
 	if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))
 	{
 		short i;
@@ -450,9 +520,19 @@ void main() {
 			sound(i);
 		}
 		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(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(87))
+	{
+		modexLeave();
+		setkb(0);
+		__asm
+		{
+			mov ah,31h
+			int 21h
+		}
+	}
 	}
 
 	/* fade back to text mode */
@@ -460,23 +540,29 @@ void main() {
 	modexPalBlack();
 	modexLeave();
 	setkb(0);
+	//system("mem /E /P");
 	printf("Project 16 scroll.exe\n");
 	printf("tx: %d\n", bg->tx);
 	printf("ty: %d\n", bg->ty);
-	printf("player.x: %d", player.x);
+	printf("player.x: %d", player.x);
 	if(player.hp==0) printf("%d wwww\n", player.y+8);
 	else printf("\nplayer.y: %d\n", player.y);
 	printf("player.tx: %d\n", player.tx);
 	printf("player.ty: %d\n", player.ty);
 	printf("player.triggx: %d\n", player.triggerx);
-	printf("player.triggy: %d\n", player.triggery);
+	printf("player.triggy: %d\n", player.triggery);
 	printf("player.hp: %d\n", player.hp);
 	printf("player.q: %d\n", player.q);
 	printf("player.d: %d\n", player.d);
 	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("\n");
-	xmsfree(&map);
+	printf("\n");
+	//xmsfree(&map);
+	//xmsfree(bg);
+	//xmsfree(spri);
+	//xmsfree(mask);
+	//xmsreport();
+	//emmclose(emmhandle);
 	switch(detectcpu())
 	{
 		case 0: cpus = "8086/8088 or 186/88"; break;
@@ -496,39 +582,53 @@ allocMap(int w, int h) {
 
 	result.width =w;
 	result.height=h;
-	//if(initxms()) 
-	result.data = malloc(sizeof(byte) * w * h);
-	//else result.data = xmsmalloc(sizeof(byte) * w * h);
+	result.data = malloc(sizeof(byte) * w * h);
+	//result.data = (byte *)alloc_emem(((int)sizeof(byte) * w * h)/1024);
+	/*if(isEMS() || checkEMS())
+	{
+		XMOVE mm;
+		//emmhandle = mallocEMS(coretotalEMS());//alloc_emem((int)sizeof(map))
+		mm.length=sizeof(result);
+		mm.sourceH=0;
+		mm.sourceOff=ptr2long(&result);
+		mm.destH=emmhandle;
+		mm.destOff=0;
+		ist = move_emem(&mm);
+		if(!ist){ dealloc_emem(emmhandle); exit(5); }
+		printf("%d\n", coretotalEMS());
+	}*/
 
 	return result;
 }
 
-
 void
 initMap(map_t *map) {
 	/* just a place holder to fill out an alternating pattern */
 	int x, y;
 	int i;
-	int tile = 1;
-	//if(initxms()) 
-	map->tiles = malloc(sizeof(tiles_t));
-	//else map->tiles = xmsmalloc(sizeof(tiles_t));
+	int tile = 1;
+	//if(!isEMS() || !checkEMS())
+		map->tiles = malloc(sizeof(tiles_t));
+	//else
+	//	map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t));
 
 	/* create the tile set */
-	//if(initxms()) 
-	map->tiles = malloc(sizeof(tiles_t));
-	//else map->tiles->data = xmsmalloc(sizeof(bitmap_t));
+	//if(!isEMS() || !checkEMS())
+		map->tiles->data = malloc(sizeof(bitmap_t));
+	//else
+	//	map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t));
 	map->tiles->data->width = (TILEWH*2);
-	map->tiles->data->height= TILEWH;
-	//if(initxms()) 
-	map->tiles->data->data = malloc((TILEWH*2)*TILEWH);
-	//else map->tiles->data->data = xmsmalloc((TILEWH*2)*TILEWH);
+	map->tiles->data->height= TILEWH;
+	//if(!isEMS() || !checkEMS())
+		map->tiles->data->data = malloc((TILEWH*2)*TILEWH);
+	//else
+	//	map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH);
 	map->tiles->tileHeight = TILEWH;
 	map->tiles->tileWidth =TILEWH;
 	map->tiles->rows = 1;
 	map->tiles->cols = 2;
 
-	i=0;
+	/*i=0;
 	for(y=0; y<TILEWH; y++) {
 	for(x=0; x<(TILEWH*2); x++) {
 		if(x<TILEWH)
@@ -537,7 +637,7 @@ initMap(map_t *map) {
 		  map->tiles->data->data[i] = 0;//0x34;
 		i++;
 	}
-	}
+	}*/
 
 	i=0;
 	for(y=0; y<map->height; y++) {
@@ -675,11 +775,12 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) {
 	word ry;
 	rx = (i % t->cols) * t->tileWidth;
 	ry = (i / t->cols) * t->tileHeight;
+	//mxPutTile(t->data, x, y, t->tileWidth, t->tileHeight);
 	modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, t->data);
 }
 
 
-void 
+void
 mapDrawRow(map_view_t *mv, int tx, int ty, word y) {
 	word x;
 	int i;
@@ -695,7 +796,7 @@ mapDrawRow(map_view_t *mv, int tx, int ty, word y) {
 	}
 }
 
-void 
+void
 mapDrawCol(map_view_t *mv, int tx, int ty, word x) {
 	int y;
 	int i;
@@ -712,12 +813,13 @@ mapDrawCol(map_view_t *mv, int tx, int ty, word x) {
 	}
 	i += mv->map->width;
 	}
-}
-
-/*void npcmove(map_view_t bg, map_view_t fg, )
-{
-	
-}*/
+}
+
+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)