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 156f2e5c30da834af19b7b6192476a556ed74e1b..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,11 @@
 #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 TILERENDER
+#define TILERENDER
 
 #define PBUFSFUN               modexDrawSpritePBufRegion
 #define PBUFBFUN               modexDrawBmpPBufRegion