From: sparky4 <sparky4@cock.li>
Date: Wed, 29 Jul 2015 17:58:58 +0000 (-0500)
Subject: scroll.exe somewhat works again! wwww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=0d02518552465fdbf55c4fc57fd04916ea0ad53e;p=16.git

scroll.exe somewhat works again! wwww
	modified:   16.hed
	modified:   inputest.exe
	modified:   makefile
	modified:   scroll.exe
	modified:   sountest.exe
	modified:   src/lib/16_in.h
	modified:   src/scroll.c
---

diff --git a/16.hed b/16.hed
index 39776ae9..b0e066a7 100644
Binary files a/16.hed and b/16.hed differ
diff --git a/inputest.exe b/inputest.exe
index 37ca5d82..b23b7ecd 100644
Binary files a/inputest.exe and b/inputest.exe differ
diff --git a/makefile b/makefile
index b3efaf54..136770b8 100644
--- a/makefile
+++ b/makefile
@@ -213,8 +213,8 @@ wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c
 16text.$(OBJ): $(SRCLIB)16text.c
 	wcl $(FLAGS) -c $(SRCLIB)16text.c
 
-mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib
-	wcl $(FLAGS) -c $(SRCLIB)mapread.c 16.lib
+mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c
+	wcl $(FLAGS) -c $(SRCLIB)mapread.c
 
 #fmapread.$(OBJ): $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib
 #	wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib
@@ -286,3 +286,5 @@ clean: .symbolic
 	@$(REMOVECOMMAND) __WCL__.LNK
 #	@$(REMOVECOMMAND) *.smp
 	@$(REMOVECOMMAND) *.SMP
+	@$(REMOVECOMMAND) 16.hed
+	
diff --git a/scroll.exe b/scroll.exe
index cb599321..9ed8aeca 100644
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/sountest.exe b/sountest.exe
index 4aa8c2b3..b8b35c33 100644
Binary files a/sountest.exe and b/sountest.exe differ
diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 8008ab86..9b3e9db9 100644
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -219,7 +219,7 @@ typedef	struct
 	word q; //loop variable
 	word speed;		//player speed!
 	bitmap_t data; //supposively the sprite sheet data
-	int hp; //hitpoints of the player
+	sword hp; //hitpoints of the player
 	word persist_aniframe;    /* gonna be increased to 1 before being used, so 0 is ok for default */
 	CursorInfo	info;
 	ControlType	Controls;
diff --git a/src/scroll.c b/src/scroll.c
index 03411b3c..d56ce36e 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -37,7 +37,7 @@ void main()
 	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;
+	static map_t map;
 	map_view_t mv[3];
 	map_view_t *bg, *spri, *mask;//, *tmp;
 	//map_view_db_t pgid[4];
@@ -81,9 +81,9 @@ void main()
 
 	/* create the map */
 //0000	printf("Total used @ before map load:			%zu\n", oldfreemem-GetFreeSize());
-//0000	fprintf(stderr, "testing~\n");
+fprintf(stderr, "testing~\n");
 	loadmap("data/test.map", &map);
-//0000	fprintf(stderr, "yay map loaded~~\n");
+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);
@@ -391,15 +391,15 @@ void main()
 	//else printf("\nplayer[0].y: %d\n", player[0].y);
 	printf("player[0].tx: %d", player[0].tx); printf("		player[0].ty: %d\n", player[0].ty);
 	printf("player[0].triggx: %d", player[0].triggerx); printf("	player[0].triggy: %d\n", player[0].triggery);
-	printf("player[0].hp: %d", player[0].hp);	printf("	player[0].q: %d", player[0].q);	printf("	player[0].info.dir: %d\n", player[0].info.dir);
+	printf("player[0].hp: %d", (player[0].hp));	printf("	player[0].q: %d", player[0].q);	printf("	player[0].info.dir: %d\n", player[0].info.dir);
 	printf("tile data value at player trigger position: %d\n", bg->map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))]);
 	printf("palette offset:	%d\n", paloffset/3);
 //++++	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("Screen: %d", screen.width);	printf("%d\n", screen.height);
+	printf("Screen2: %d", 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);