Merge remote-tracking branch 'upstream/master'

[16.git] / src / lib / scroll16.h

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 39d43caa07b3c9805b67dd9b69b392fffc524572..dbfb7930b5ebf1e06940070349d242e4bf3bb058 100755 (executable)
--- 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
  *
  * This file is part of Project 16.
  *
@@ -30,11 +30,15 @@
 #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"
 
-#define SPRITE
-//#define BMPTYPE
+//#define SPRITE
+#define TILERENDER
+
+#define PBUFSFUN               modexDrawSpritePBufRegion
+#define PBUFBFUN               modexDrawBmpPBufRegion
+#define PLAYERBMPDATA  &player[pn].data
 
 typedef struct {
        map_t *map;
@@ -50,8 +54,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
@@ -71,7 +73,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(map_view_t *pip, global_game_variables_t *gv);
 void near animatePlayer(map_view_t *pip, player_t *player, word playnum, sword scrollswitch);
 
 #endif /*__SCROLL16_H_*/