X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=7d68b45d6e3e65d32d30bd1a9b723b904f5f98d8;hb=b2c7a4b0c99f595a79affd7151bf3c717d67ba1a;hp=99910f26e134c1129df7ee5c6d5e105112c6822d;hpb=76278b1d3be2ebf4a635cdec253dfe48450075df;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index 99910f26..7d68b45d 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123
  *
  * This file is part of Project 16.
  *
@@ -21,7 +21,7 @@
  */
 
 #include "src/lib/scroll16.h"
-#include "src/lib/timer.h"
+#include "src/lib/16_timer.h"
 #include "src/lib/wcpu/wcpu.h"
 
 //#define FADE
@@ -65,13 +65,12 @@ void main(int argc, char *argv[])
 	else bakapee = 1;
 
 	testcontrolnoisy=0;
-	gfxtest=1;
 
 	player[0].persist_aniframe=0;
 	player[0].speed=4;
 	//player[0].data = &pp;
 
-	printf("starting timer\n");
+	printf("starting timer	");
 	start_timer(&gvar);
 	printf("ok\n");
 	//extern struct inconfig inpu;
@@ -79,10 +78,10 @@ void main(int argc, char *argv[])
 //	atexit(qclean());
 
 	/* create the map */
-	fprintf(stderr, "testing map load~\n");
+	fprintf(stderr, "testing map load~	");
 	loadmap("data/test.map", &map);
 	chkmap(&map, 0);
-	printf("chkmap ok\n");
+	printf("chkmap ok	");
 	fprintf(stderr, "yay map loaded~~\n");
 	mv[0].map = ↦
 	mv[1].map = ↦
@@ -99,7 +98,7 @@ void main(int argc, char *argv[])
 
 	/* create the planar buffer */
 ////++++	(player[0].data) = *planar_buf_from_bitmap(&p);
-	printf("load pee!!\n");
+	printf("load pee!!	");
 	pp = planar_buf_from_bitmap(&p);
 	printf("done!\n");