merge upstream

2026-05-17 03:08:26 +00:00 · 2014-12-21 13:45:26 -08:00
parent f0e22c9ff9 f588c54d52
commit f409d39f1a
193 changed files with 4491 additions and 9483 deletions
@@ -21,13 +21,15 @@
 #endif

 #include "../common/features.h"
-#include "../common/misc_functions.h"
 #include "../common/rulesys.h"
 #include "../common/string_util.h"
+#include "../common/misc_functions.h"
+
 #include "map.h"
 #include "npc.h"
 #include "quest_parser_collection.h"
 #include "water_map.h"
+
 #include <math.h>
 #include <stdlib.h>