X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.h;h=669237b47e92803a1c07910639a3bab2b4ced065;hb=40391c09eb16ee6d6261bca1e37ba08a3de2af9c;hp=f4e0b9cbe61ed80abc29fdd5b939bb4cce953014;hpb=6b585194480dbbfb1ca8ae9d4564418b24e79d48;p=16.git

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
old mode 100644
new mode 100755
index f4e0b9cb..669237b4
--- 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.
  *
@@ -24,11 +24,26 @@
 #define __SCROLL16_H_
 
 #include "src/lib/16_head.h"
+#include "src/lib/bakapee.h"
 #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/16_timer.h"
+#include "src/lib/wcpu/wcpu.h"
+
+#include <hw/cpu/cpu.h>
+#include <hw/dos/dos.h>
+#include <hw/vga/vga.h>
+#include <hw/vga/vrl.h>
+
+//#define SPRITE
+//#define TILERENDER
+
+#define PBUFSFUN		modexDrawSpritePBufRegion
+#define PBUFBFUN		modexDrawBmpPBufRegion
+#define PLAYERBMPDATA	&player[pn].data
 
 typedef struct {
 	map_t *map;
@@ -37,6 +52,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
@@ -44,25 +61,35 @@ typedef struct
 	map_view_t *mv;
 } map_view_db_t;
 
-#define TILEWH 16
-#define QUADWH			TILEWH/2
-//#define LOOPMAX (TILEWH/(player[0].speed))
+//for null map!
+#define MAPW	40
+#define MAPH	30
+
+extern boolean pageflipflop;
 
 //map_t allocMap(int w, int h);
 //void initMap(map_t *map);
 void walk(map_view_t *pip, player_t *player, word pn);
-void mapScrollRight(map_view_t *mv, player_t *player, word id, word plid);
-void mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid);
-void mapScrollUp(map_view_t *mv, player_t *player, word id, word plid);
-void mapScrollDown(map_view_t *mv, player_t *player, word id, word plid);
+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 mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);
-void mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *p, word poopoffset);
-void mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *p, word poopoffset);
+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);
 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 pdump(page_t *pee);
-void qclean();
-void animatePlayer(map_view_t *pip, player_t *player, word playnum, sword scrollswitch);
+//void qclean();
+void shinku(global_game_variables_t *gv);
+void near animatePlayer(map_view_t *pip, player_t *player, word playnum, sword scrollswitch);
+
+extern unsigned char shinku_fps_indicator_page;
 
 #endif /*__SCROLL16_H_*/