X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.h;h=c8e4a1a8aa112d0af2d10cea003d77b21a5fe060;hb=9e4ec19da5e1df6d0f18978ceb567a9712185aab;hp=300a05141085b08fa7a50365740519e60c4360ad;hpb=9c094584b72c9c1ad4ae3b1cb641690297480661;p=16.git

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 300a0514..c8e4a1a8 100755
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123
  *
  * This file is part of Project 16.
  *
@@ -29,11 +29,23 @@
 #include "src/lib/16_in.h"
 #include "src/lib/bitmap.h"
 #include "src/lib/planar.h"
-#include "src/lib/mapread.h"
-#include "src/lib/timer.h"
+#include "src/lib/mapread.h" //map is loaded here www
+#include "src/lib/16_timer.h"
 #include "src/lib/wcpu/wcpu.h"
 
-//#define SPRITE
+#include <hw/cpu/cpu.h>
+#include <hw/dos/dos.h>
+#include <hw/vga/vga.h>
+#include <hw/vga/vrl.h>
+
+#define SPRITE
+//#define TILERENDER
+
+//modexDrawSpritePBufRegion
+//modexDrawBmpPBufRegion
+#define PBUFSFUN		modexDrawSpriteRegion
+#define PBUFBFUN		modexDrawBmpRegion
+#define PLAYERBMPDATA	player[pn].data
 
 typedef struct {
 	map_t *map;
@@ -42,6 +54,8 @@ typedef struct {
 	int ty; //appears to be the top left tile position on the viewable screen map
 	word dxThresh; //????
 	word dyThresh; //????
+	video_t *video;	//pointer to game variables of the video
+	pan_t *pan;		//pointer the the page panning debug system
 } map_view_t;
 
 typedef struct
@@ -53,13 +67,21 @@ typedef struct
 #define MAPW	40
 #define MAPH	30
 
+extern boolean pageflipflop, pageploop;
+extern unsigned char shinku_fps_indicator_page;
+
 //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 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);
 void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid);
+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);
 sword chkmap(map_t *map, word q);
 void mapGoTo(map_view_t *mv, int tx, int ty);
 void near mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);
@@ -68,7 +90,7 @@ void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *p, word p
 void mapDrawWRow(map_view_t *mv, int tx, int ty, word y);
 void mapDrawWCol(map_view_t *mv, int tx, int ty, word x);
 //void qclean();
-void shinku(map_view_t *pip, global_game_variables_t *gv);
+void shinku(global_game_variables_t *gv);
 void near animatePlayer(map_view_t *pip, player_t *player, word playnum, sword scrollswitch);
 
 #endif /*__SCROLL16_H_*/