^^

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

diff --git a/src/lib/timer.c b/src/lib/timer.c
old mode 100644 (file)
new mode 100755 (executable)
index 3adc37b..b5edff9
--- a/src/lib/timer.c
+++ b/src/lib/timer.c
@@ -1,45 +1,67 @@
-/* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
- *
- * This file is part of Project 16.
- *
- * Project 16 is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Project 16 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>, or
- * write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-
-#include "src/lib/timer.h"
-
+/* Project 16 Source Code~\r
+ * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669\r
+ *\r
+ * This file is part of Project 16.\r
+ *\r
+ * Project 16 is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; either version 3 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * Project 16 is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>, or\r
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,\r
+ * Fifth Floor, Boston, MA 02110-1301 USA.\r
+ *\r
+ */\r
+\r
+#include "src/lib/timer.h"\r
+\r
 clock_t start_timer(global_game_variables_t *gv)\r
 {\r
-       //time(&(this->t));\r
-       gv->t = clock();\r
-       return gv->t;\r
-}
-
+       gv->kurokku.t = clock();\r
+       gv->kurokku.tiku = 0;\r
+       gv->kurokku.clock_start = *clockw;\r
+       gv->kurokku.clock = clockw;\r
+       gv->kurokku.frames_per_second = 60;\r
+       gv->pee = _nmalloc(sizeof(byte)*2);\r
+       //turn this off if XT\r
+       switch(detectcpu())\r
+       {\r
+               case 0:\r
+                       gv->kurokku.fpscap=0;\r
+               break;\r
+               default:\r
+                       gv->kurokku.fpscap=1;\r
+               break;\r
+       }\r
+       return gv->kurokku.t;\r
+}\r
+\r
 double elapsed_timer(global_game_variables_t *gv)\r
 {\r
-       return (clock() - gv->t) / CLOCKS_PER_SEC;\r
+       return (clock() - gv->kurokku.t) / CLOCKS_PER_SEC;\r
 }\r
 \r
-/*double time_in_seconds(global_game_variables_t *gv)\r
+double ticktock(global_game_variables_t *gv)\r
 {\r
-       return (gv->t) / CLOCKS_PER_SEC;\r
-}*/\r
+       double clocku;\r
+       clocku = (clock() - gv->kurokku.t) / CLOCKS_PER_SEC;\r
+       gv->kurokku.t = clock();\r
+       return clocku;\r
+}\r
 \r
-double time_in_seconds(time_t in_t)\r
+double time_in_seconds(global_game_variables_t *gv)\r
+{\r
+       return (gv->kurokku.t) / CLOCKS_PER_SEC;\r
+}\r
+\r
+/*double time_in_seconds(time_t in_t)\r
 {\r
        return (in_t) / CLOCKS_PER_SEC;\r
-}
+}*/\r