X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.h;h=33c7ed153aedf36568685ff9e250313c47842b44;hb=d31b48962de4f4384cca54f92db59ccc0bb06fbc;hp=6af4553d04ca0ee05fee051240e529553ce80b97;hpb=86470bee97dd0d0663008826a0cfa976a9a65c2a;p=16.git

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 6af4553d..33c7ed15 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.
  *
@@ -30,11 +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;
@@ -50,9 +59,6 @@ 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
@@ -72,7 +78,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(page_t *page, 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_*/