X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.h;h=97759ac786b51688e09ea1cc0ecb4ce6f455aae0;hb=9ee2d68eb9e4c8ee46254efa06e3977cf3b36bdd;hp=c789cc1ad3ce41afea0fe2dcafc500001be61b47;hpb=5e004b57253df9e7572e5f0705c353f559ca0875;p=16.git

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index c789cc1a..97759ac7 100755
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -34,7 +34,7 @@
 //#include "src/lib/16_map.h"	//new map stuff
 #include "src/lib/16_timer.h"
 #include "src/lib/wcpu/16_wcpu.h"
-#include "src/lib/16_sprit.h"
+#include "src/lib/16_spri.h"
 
 #include <hw/cpu/cpu.h>
 #include <hw/dos/dos.h>
@@ -63,6 +63,8 @@
 #define MAPW	40
 #define MAPH	30
 
+//===========================================================================//
+
 	//if(player[0].enti.hp==0) printf("%d wwww\n", player[0].enti.y+8);
 	//else printf("\nplayer[0].enti.y: %d\n", player[0].enti.y);
 //printf("gvar.video.p=%u ", gvar.video.p);
@@ -75,17 +77,18 @@
 //printf("&global_temp_status_text = %Fp\n", &global_temp_status_text);
 //printf("middle tile position: %dx", gvar.video.page[0].tilemidposscreenx);	printf("%d\n", gvar.video.page[0].tilemidposscreeny);
 //printf("	aniframe=%u", player[0].enti.persist_aniframe);
-#define SCROLLEXITMESG 	printf("[0]txy: %dx%d	", mv[1].tx, mv[1].ty); printf("[1]txy: %dx%d", mv[1].tx, mv[1].ty);\
+#define SCROLLEXITMESG 	printf("[0]txy: %dx%d	", mv[0].tx, mv[0].ty); printf("[1]txy: %dx%d", mv[1].tx, mv[1].ty);\
 	printf("\n\n");\
 	printf("player vars:\n");\
 	printf("	xy: %dx%d", player[0].enti.x, player[0].enti.y); printf("	txy: %dx%d", player[0].enti.tx, player[0].enti.ty); printf("	triggxy: %dx%d", player[0].enti.triggerx, player[0].enti.triggery); printf("	value: %d\n", mv[1].map->data[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))]);\
-	printf("	hp: %d", (player[0].enti.hp));	printf("	q: %d", player[0].enti.q);	printf("	info.dir: %d", player[0].info.dir);	printf("	d: %d ", player[0].enti.d);\
-		printf("	pdir: %d\n", player[0].pdir); printf("	delay=%u", player[0].enti.spri->delay);\
+	printf("	hp: %d", (player[0].enti.hp));	printf("	q: %u", player[0].enti.q);	printf("	info.dir: %u", player[0].info.dir);	printf("	d: %u", player[0].enti.d);	printf("	dire: %u", player[0].enti.dire);\
+		printf("	pdir: %u\n", player[0].pdir); printf("	delay=%u", player[0].enti.spri->delay);\
 printf("\n\n");\
 	VL_PrintmodexmemInfo(&gvar.video);\
 \
-	printf("gvar.video.r=%u ", gvar.video.r);\
-	printf("gvar.video.bgps=%u ", gvar.video.bgps);\
+	printf("gvar.video:\n");\
+	printf(" r=%u ", gvar.video.dorender);\
+	printf("bgps=%u ", gvar.video.bgps);\
 printf("\n\n");
 
 extern boolean pagenorendermap, pagedelayrendermap;
@@ -104,7 +107,7 @@ void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid);
 void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid);
 void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid);
 void ZC_mapScroll(map_view_t *mv, player_t *player, word pn);
-void ZC_playerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn);
+void ZC_playerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn, boolean defaultsw);
 sword chkmap(map_t *map, word q);
 void mapGoTo(map_view_t *mv, int tx, int ty);
 void ZC_mapinitMV(map_view_t *mv, int tx, int ty);
@@ -185,7 +188,7 @@ inline void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid
 //sync
 void shinku(global_game_variables_t *gv);
 //animate the sprite
-void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch);
+void near ZC_animatePlayer(map_view_t *pip, player_t *player, nibble pn);
 
 // Move an entity around. Should actually be in 16_entity
 boolean ZC_walk2(entity_t *ent, map_view_t *map_v);