Bug 3119: Firewall does not protect from storms

CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.13)
 
+include_directories (${CMAKE_CURRENT_SOURCE_DIR})
+
 set(CMAKE_C_STANDARD 99)
 if (WIN32)
 file(TO_CMAKE_PATH "${CMAKE_MODULE_PATH}" CMAKE_MODULE_PATH )

src/alchemy.c

@@ -22,7 +22,7 @@
 #include "util/message.h"
 #include <util/rand.h>
 
-#include <storage.h>
+#include <storage/storage.h>
 
 #include <stb_ds.h>
 

src/attributes/attributes.c

@@ -36,7 +36,8 @@
 #include <util/macros.h>
 #include <util/resolve.h>
 
-#include <storage.h>
+#include <storage/storage.h>
+
 #include <stdlib.h>
 
 typedef struct obs_data {

src/attributes/dict.c

@@ -2,21 +2,22 @@
 #include "key.h"
 
 /* kernel includes */
+#include <kernel/attrib.h>
 #include <kernel/building.h>
 #include <kernel/faction.h>
+#include <kernel/gamedata.h>
 #include <kernel/region.h>
 #include <kernel/ship.h>
 #include <kernel/unit.h>
 
 /* util includes */
-#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/log.h>
-#include <kernel/gamedata.h>
 #include <util/resolve.h>
 
-#include <strings.h>
-#include <storage.h>
+#include <storage/storage.h>
+
+#include <clibs/strings.h>
 
 /* stdc includes */
 #include <string.h>

src/attributes/follow.c

@@ -1,12 +1,12 @@
 #include "follow.h"
 
-#include <kernel/unit.h>
-
 #include <kernel/attrib.h>
 #include <kernel/gamedata.h>
+#include <kernel/unit.h>
+
 #include <util/variant.h>
 
-#include <storage.h>
+#include <storage/storage.h>
 
 static int read_follow(variant * var, void *owner, gamedata *data)
 {

src/attributes/hate.c

@@ -1,13 +1,13 @@
 #include "hate.h"
 
-#include <kernel/unit.h>
-
 #include <kernel/attrib.h>
 #include <kernel/gamedata.h>
+#include <kernel/unit.h>
+
 #include <util/macros.h>
 #include <util/resolve.h>
 
-#include <storage.h>
+#include <storage/storage.h>
 
 static int verify_hate(attrib * a, void *owner)
 {

src/attributes/key.c

@@ -5,8 +5,10 @@
 
 #include <kernel/attrib.h>
 #include <kernel/gamedata.h>
+
 #include <util/log.h>
-#include <storage.h>
+
+#include <storage/storage.h>
 
 #include <errno.h>
 #include <stdlib.h>

src/attributes/movement.c

@@ -2,7 +2,7 @@
 
 #include <kernel/attrib.h>
 
-#include <storage.h>
+#include <storage/storage.h>
 
 #include <assert.h>
 #include <limits.h>

src/attributes/otherfaction.c

@@ -6,9 +6,10 @@
 #include <kernel/attrib.h>
 #include <kernel/gamedata.h>
 
+#include <storage/storage.h>
+
 #include <assert.h>
 #include <stdbool.h>         // for true, false
-#include <storage.h>
 
 /*
  * simple attributes that do not yet have their own file

src/attributes/racename.c

@@ -2,7 +2,7 @@
 
 #include <kernel/attrib.h>
 
-#include <strings.h>
+#include <clibs/strings.h>
 
 /* libc includes */
 #include <stdlib.h>

src/attributes/raceprefix.c

@@ -2,7 +2,7 @@
 
 #include <kernel/attrib.h>
 
-#include <strings.h>
+#include <clibs/strings.h>
 
 #include <assert.h>
 #include <string.h>

src/attributes/seenspell.c

@@ -1,3 +1,5 @@
+#include "seenspell.h"
+
 #include <kernel/faction.h>
 #include <kernel/spell.h>
 #include <kernel/spellbook.h>
@@ -6,10 +8,10 @@
 #include <util/log.h>
 #include <util/macros.h>
 
-#include "seenspell.h"
 
-#include <selist.h>
-#include <storage.h>
+#include <storage/storage.h>
+
+#include <clibs/selist.h>
 
 #include <stdlib.h>
 #include <string.h>

src/attributes/targetregion.c

@@ -1,12 +1,13 @@
 #include "targetregion.h"
 
-#include <kernel/region.h>
 
 #include <kernel/attrib.h>
 #include <kernel/gamedata.h>
+#include <kernel/region.h>
+
 #include <util/resolve.h>
 
-#include <storage.h>
+#include <storage/storage.h>
 
 static void
 write_targetregion(const variant *var, const void *owner, struct storage *store)

src/battle.c

@@ -59,7 +59,7 @@
 #include "util/rand.h"
 #include "util/rng.h"
 
-#include <strings.h>
+#include <clibs/strings.h>
 
 #include <gb_string.h>
 #include <stb_ds.h>

src/battle.test.c

@@ -34,14 +34,14 @@
 #include "util/rand.h"
 #include "util/variant.h"
 
+#include <clibs/strings.h>
 #include <CuTest.h>
 
 #include <stb_ds.h>
 
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>                // for abort, calloc
-#include <strings.h>
 
 #include "tests.h"
 

src/bind_config.c

@@ -14,7 +14,7 @@
 #include <util/log.h>
 #include <util/path.h>
 
-#include <strings.h>
+#include <clibs/strings.h>
 
 #include <cJSON.h>
 

src/bind_region.c

@@ -24,11 +24,11 @@
 #include <util/log.h>
 #include <util/message.h>
 
-#include <strings.h>
-
 #include <attributes/key.h>
 #include <attributes/racename.h>
 
+#include <clibs/strings.h>
+
 #include <lua.h>
 #include <lauxlib.h>
 #include <tolua.h>

src/bind_storage.c

@@ -8,7 +8,7 @@
 #include <kernel/gamedata.h>
 #include <util/log.h>
 
-#include <storage.h>
+#include <storage/storage.h>
 
 #include <math.h>
 #include <stdio.h>

src/bind_unit.c

@@ -40,7 +40,7 @@
 #include <util/order_parser.h>        // for OP_Parser, OrderParserStruct
 #include <util/variant.h>
 
-#include <strings.h>
+#include <clibs/strings.h>
 
 #include <stb_ds.h>
 

src/creport.c

@@ -69,10 +69,10 @@ static char g_bigbuf[BUFFERSIZE];
 #include <util/message.h>
 #include <util/nrmessage.h>
 
-#include <filestream.h>
-#include <selist.h>
-#include <stream.h>
-#include <strings.h>
+#include <storage/filestream.h>
+#include <storage/stream.h>
+#include <clibs/selist.h>
+#include <clibs/strings.h>
 
 #include <stb_ds.h>
 

src/crimport.c

@@ -36,9 +36,9 @@
 #include <util/lists.h>
 #include <util/log.h>
 
-#include <crpat.h>
-#include <critbit.h>
-#include <strings.h>
+#include <crpat/crpat.h>
+#include <clibs/critbit.h>
+#include <clibs/strings.h>
 
 #include <stb_ds.h>
 

src/defaults.c

@@ -63,10 +63,10 @@
 #include <spells/regioncurse.h>
 #include <spells/unitcurse.h>
 
-#include <iniparser.h>
-#include <strings.h>
+#include <clibs/strings.h>
 
 #include <stb_ds.h>
+#include <iniparser.h>
 
 /* libc includes */
 #include <assert.h>
@@ -79,7 +79,7 @@
 #include <limits.h>
 
 /**
-	- Die alten Befehle nicht beim Befehle laden l�schen, sondern in u->defaults bef�rdern
+	- Die alten Befehle nicht beim Befehle laden l�schen, sondern in u->defaults bef�rdern
 	- Dann (hier) beim setzen des langen Befehls wegschmeissen, es sei denn es ist ein K_MOVE,
 	- im Falle von K_MOVE eine Variante von update_defaults machen, nur lange Befehle behalten.
 */

src/eressea.c

@@ -52,7 +52,7 @@
 #include "vortex.h"
 #include "wormhole.h"
 
-#include <strings.h>
+#include <clibs/strings.h>
 
 #include <assert.h>
 #include <errno.h>

src/exparse.c

@@ -22,7 +22,7 @@
 #include "util/crmessage.h"
 #include "util/nrmessage.h"
 
-#include <strings.h>
+#include <clibs/strings.h>
 
 #include <expat.h>
 #include <stb_ds.h>

src/gamedb.c

@@ -5,7 +5,7 @@
 #include "kernel/faction.h"
 #include "kernel/db/driver.h"
 
-#include <strings.h>
+#include <clibs/strings.h>
 
 static int generate_factions(void *data, db_faction *results, int nresults)
 {

src/helpers.c

@@ -20,7 +20,7 @@
 #include <kernel/spell.h>
 #include <kernel/unit.h>
 
-#include <storage.h>
+#include <storage/storage.h>
 
 #include <stb_ds.h>
 #include <tolua.h>

src/jsonconf.c

@@ -39,7 +39,7 @@
 #include "util/path.h"
 #include "util/pofile.h"
 
-#include <strings.h>
+#include <clibs/strings.h>
 
 /* external libraries */
 #include <stb_ds.h>

src/kernel/alliance.c

@@ -1,6 +1,7 @@
 #include "alliance.h"
 
-/* kernel includes */
+/* other kernel includes */
+#include "attrib.h"
 #include "calendar.h"
 #include "config.h"
 #include "building.h"
@@ -14,16 +15,15 @@
 #include <attributes/key.h>
 
 /* util includes */
-#include <kernel/attrib.h>
 #include <util/base36.h>
 #include <util/language.h>
 #include <util/message.h>
 #include <util/parser.h>
 #include <util/rng.h>
 #include <util/umlaut.h>
 
-#include <selist.h>
-#include <strings.h>
+#include <clibs/selist.h>
+#include <clibs/strings.h>
 
 /* libc includes */
 #include <assert.h>

src/kernel/ally.c

@@ -4,17 +4,18 @@
 #include "config.h"
 #include "ally.h"
 
+#include "attrib.h"
 #include "unit.h"
 #include "region.h"
+#include "gamedata.h"
 #include "group.h"
 #include "faction.h"
 #include "objtypes.h"
 
-#include <kernel/attrib.h>
-#include <kernel/gamedata.h>
 
-#include <storage.h>
-#include <strings.h>
+#include <storage/storage.h>
+
+#include <clibs/strings.h>
 
 #include <stb_ds.h>
 

src/kernel/attrib.c

@@ -4,9 +4,10 @@
 #include <util/variant.h>
 #include <kernel/gamedata.h>
 
-#include <critbit.h>
-#include <storage.h>
-#include <strings.h>
+#include <storage/storage.h>
+
+#include <clibs/critbit.h>
+#include <clibs/strings.h>
 
 #include <stb_ds.h>