Merge remote-tracking branch 'upstream/master'

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

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 55122d14131cb46cd9b201be136542d3fd2d7ebf..41634957455fae46f0847231cece1246f845cb44 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.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.
  *
@@ -597,8 +597,9 @@ void shinku(map_view_t *pip, global_game_variables_t *gv)
                word bgcol = 0;
                word type = 1;
                //t=(((*(gv->clock))-gv->clock_start) /18.2);
-               sprintf(gv->pee, "%f fps", (double)gv->kurokku.tiku/ticktock(gv));
-               modexprint(pip[1].page, 16, 16, 1, 15, 0, gv->pee, 1);
+               //sprintf(gv->pee, "%f fps", (double)gv->kurokku.tiku/ticktock(gv));
+               printf("%f fps", (double)gv->kurokku.tiku/ticktock(gv));
+               //modexprint(pip[1].page, 16, 16, 1, 15, 0, gv->pee, 1);
                //(gv->clock_start)=*(gv->clock);
                gv->kurokku.tiku=0;
        }