X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.h;h=a3402a02801377ec6ee892cb9c7452a1aa20d9bf;hb=7b443f44a0facce17e7489bd06c5ef91dff0c127;hp=ea3cfb27b8312b7f7819064855eea596ca247be5;hpb=c86ea2ca9231b1c715e7bfdf16b4134d8fc27a71;p=16.git

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index ea3cfb27..a3402a02 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 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -28,13 +28,23 @@
 #include "src/lib/modex16.h"
 #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
-//#define BMPTYPE
+#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;
@@ -43,6 +53,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
@@ -50,20 +62,25 @@ typedef struct
 	map_view_t *mv;
 } map_view_db_t;
 
-//temp defines
-#define TILEWH 16
-#define QUADWH			TILEWH/2
 //for null map!
 #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);
@@ -72,7 +89,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_*/