//#include "src/lib/16_map.h" //new map stuff\r
#include "src/lib/16_timer.h"\r
#include "src/lib/wcpu/16_wcpu.h"\r
-#include "src/lib/16_sprit.h"\r
+#include "src/lib/16_spri.h"\r
\r
#include <hw/cpu/cpu.h>\r
#include <hw/dos/dos.h>\r
#define MAPW 40\r
#define MAPH 30\r
\r
+//===========================================================================//\r
+\r
//if(player[0].enti.hp==0) printf("%d wwww\n", player[0].enti.y+8);\r
//else printf("\nplayer[0].enti.y: %d\n", player[0].enti.y);\r
//printf("gvar.video.p=%u ", gvar.video.p);\r
//printf("&global_temp_status_text = %Fp\n", &global_temp_status_text);\r
//printf("middle tile position: %dx", gvar.video.page[0].tilemidposscreenx); printf("%d\n", gvar.video.page[0].tilemidposscreeny);\r
//printf(" aniframe=%u", player[0].enti.persist_aniframe);\r
-#define SCROLLEXITMESG printf("[0]txy: %dx%d ", mv[1].tx, mv[1].ty); printf("[1]txy: %dx%d", mv[1].tx, mv[1].ty);\\r
+#define SCROLLEXITMESG printf("[0]txy: %dx%d ", mv[0].tx, mv[0].ty); printf("[1]txy: %dx%d", mv[1].tx, mv[1].ty);\\r
printf("\n\n");\\r
printf("player vars:\n");\\r
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))]);\\r
- 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);\\r
- printf(" pdir: %d\n", player[0].pdir); printf(" delay=%u", player[0].enti.spri->delay);\\r
+ 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);\\r
+ printf(" pdir: %u\n", player[0].pdir); printf(" delay=%u", player[0].enti.spri->delay);\\r
printf("\n\n");\\r
VL_PrintmodexmemInfo(&gvar.video);\\r
\\r
- printf("gvar.video.r=%u ", gvar.video.r);\\r
- printf("gvar.video.bgps=%u ", gvar.video.bgps);\\r
+ printf("gvar.video:\n");\\r
+ printf(" r=%u ", gvar.video.dorender);\\r
+ printf("bgps=%u ", gvar.video.bgps);\\r
printf("\n\n");\r
\r
extern boolean pagenorendermap, pagedelayrendermap;\r
void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid);\r
void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid);\r
void ZC_mapScroll(map_view_t *mv, player_t *player, word pn);\r
-void ZC_playerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn);\r
+void ZC_playerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn, boolean defaultsw);\r
sword chkmap(map_t *map, word q);\r
void mapGoTo(map_view_t *mv, int tx, int ty);\r
void ZC_mapinitMV(map_view_t *mv, int tx, int ty);\r
//sync\r
void shinku(global_game_variables_t *gv);\r
//animate the sprite\r
-void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch);\r
+void near ZC_animatePlayer(map_view_t *pip, player_t *player, nibble pn);\r
\r
// Move an entity around. Should actually be in 16_entity\r
boolean ZC_walk2(entity_t *ent, map_view_t *map_v);\r