Merge branch 'master' into multiplayer-stuff

2019-02-18 01:12:47 -05:00
parent 08579edbcd e95140270b
commit 5695617d64
34 changed files with 300 additions and 224 deletions
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -690,7 +690,7 @@ bool8 ScrCmd_initclock(struct ScriptContext *ctx)
    return FALSE;
 }

-bool8 ScrCmd_dodailyevents(struct ScriptContext *ctx)
+bool8 ScrCmd_dotimebasedevents(struct ScriptContext *ctx)
 {
    DoTimeBasedEvents();
    return FALSE;