X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.h;h=77065af9f8ac4512bc2cd0f2f3ccb855611461c7;hb=54e80274a159f2c8f12bbb284403927616c686c5;hp=ea3cfb27b8312b7f7819064855eea596ca247be5;hpb=c86ea2ca9231b1c715e7bfdf16b4134d8fc27a71;p=16.git diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h index ea3cfb27..77065af9 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,21 @@ #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 +#include +#include +#include +#include + //#define SPRITE -//#define BMPTYPE +//#define TILERENDER + +#define PBUFSFUN modexDrawSpritePBufRegion +#define PBUFBFUN modexDrawBmpPBufRegion +#define PLAYERBMPDATA &player[pn].data typedef struct { map_t *map; @@ -50,9 +60,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