Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war

In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 13:28:38 -05:00
parent f8d0646b09
commit 7b30be0058
21 changed files with 72 additions and 54 deletions
@@ -1,5 +1,5 @@
 #define TICK_LIMIT_RUNNING 80
-#define TICK_LIMIT_TO_RUN 78
+#define TICK_LIMIT_TO_RUN 70
 #define TICK_LIMIT_MC 70
 #define TICK_LIMIT_MC_INIT_DEFAULT 98

@@ -20,4 +20,8 @@ When using time2text(), please use "DDD" to find the weekday. Refrain from using

 #define HOURS MINUTES*60

-#define TICKS *world.tick_lag
+#define TICKS *world.tick_lag
+
+#define DS2TICKS(DS) (DS/world.tick_lag)
+
+#define TICKS2DS(T) (T TICKS)