X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.h;h=d3711b5e52cdb60ab566aabb47bdbd58b243cf60;hb=46a8c35140479f5957e35eeb8cd27da9b9da6630;hp=2b7d9a67c9eabd9702fa18db8585c8a17f0ef3be;hpb=45151cf05d1815a6bb2c04cb6ef7650d9113df61;p=16.git

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
old mode 100644
new mode 100755
index 2b7d9a67..d3711b5e
--- 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.
  *
@@ -30,10 +30,20 @@
 #include "src/lib/bitmap.h"
 #include "src/lib/planar.h"
 #include "src/lib/mapread.h"
-#include "src/lib/timer.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 BMPTYPE
+//#define TILERENDER
+
+#define PBUFSFUN		modexDrawSpritePBufRegion
+#define PBUFBFUN		modexDrawBmpPBufRegion
+#define PLAYERBMPDATA	&player[pn].data
 
 typedef struct {
 	map_t *map;
@@ -49,8 +59,6 @@ typedef struct
 	map_view_t *mv;
 } map_view_db_t;
 
-#define TILEWH 16
-#define QUADWH			TILEWH/2
 //for null map!
 #define MAPW	40
 #define MAPH	30
@@ -58,19 +66,21 @@ typedef struct
 //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 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);
 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 qclean();
-void shinku(page_t *page, global_game_variables_t *gv);
-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_*/