X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.h;h=fdce4ad34bc5a52aedfa09864cc2f1ef164282b9;hb=a6dac9aacc0353763dc564afda8b57848afc3e0b;hp=9dc7b4a51337a706fa668b3b6e9fc456583f9eae;hpb=22d35fc2e4df4a61e1d000c7cd59b8b253652a54;p=16.git

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 9dc7b4a5..fdce4ad3 100755
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -33,7 +33,7 @@
 #include "src/lib/16render.h"
 //#include "src/lib/16_map.h"	//new map stuff
 #include "src/lib/16_timer.h"
-#include "src/lib/wcpu/wcpu.h"
+#include "src/lib/wcpu/16_wcpu.h"
 
 #include <hw/cpu/cpu.h>
 #include <hw/dos/dos.h>
@@ -60,6 +60,7 @@ typedef struct {
 	word dyThresh; //Threshold for physical tile switch
 	video_t *video;	//pointer to game variables of the video
 	pan_t *pan;		//pointer the the page panning debug system
+//newer vars!
 	int dx, dy, delta, d;
 } map_view_t;
 /* Map is presumed to:
@@ -75,11 +76,6 @@ typedef struct {
  * 	should have a sprite too. Map is drawn left-to-right, top-to-bottom.
  */
 
-typedef struct
-{
-	map_view_t *mv;
-} map_view_db_t;
-
 //for null map!
 #define MAPW	40
 #define MAPH	30
@@ -126,7 +122,9 @@ extern char global_temp_status_text[512];
 //map_t allocMap(int w, int h);
 //void initMap(map_t *map);
 void walk(map_view_t *pip, player_t *player, word pn);
-void panpagemanual(map_view_t *pip,  player_t *player, word pn);
+void panPageManual(map_view_t *pip,  player_t *player, word pn);
+void modexMVSetup(map_view_t *mv, map_t *map, pan_t *pan, global_game_variables_t *gv);
+void modexMVInit(map_view_t *pip, int tx, int ty);
 void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid);
 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);
@@ -135,8 +133,10 @@ void near ScrollRight(map_view_t *mv, player_t *player, word id, word plid);
 void near ScrollLeft(map_view_t *mv, player_t *player, word id, word plid);
 void near ScrollUp(map_view_t *mv, player_t *player, word id, word plid);
 void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid);
+void playerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn);
 sword chkmap(map_t *map, word q);
 void mapGoTo(map_view_t *mv, int tx, int ty);
+void mapinitmapview(map_view_t *mv, int tx, int ty);
 void near mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);
 void near mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *p, word poopoffset);
 void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *p, word poopoffset);