diff --git a/bin/inicrunch_linux b/bin/inicrunch_linux new file mode 100755 index 0000000..5c9a812 Binary files /dev/null and b/bin/inicrunch_linux differ diff --git a/bin/inicrunch b/bin/inicrunch_osx similarity index 100% rename from bin/inicrunch rename to bin/inicrunch_osx diff --git a/data/art824/bitmaps/placementBad.bmp b/data/art824/bitmaps/placementbad.bmp similarity index 100% rename from data/art824/bitmaps/placementBad.bmp rename to data/art824/bitmaps/placementbad.bmp diff --git a/data/art824/bitmaps/placementGood.bmp b/data/art824/bitmaps/placementgood.bmp similarity index 100% rename from data/art824/bitmaps/placementGood.bmp rename to data/art824/bitmaps/placementgood.bmp diff --git a/data/art824/bitmaps/RocketArtifact.bmp b/data/art824/bitmaps/rocketartifact.bmp similarity index 100% rename from data/art824/bitmaps/RocketArtifact.bmp rename to data/art824/bitmaps/rocketartifact.bmp diff --git a/data/art824/HQ.amx b/data/art824/hq.amx similarity index 96% rename from data/art824/HQ.amx rename to data/art824/hq.amx index 81572f1..2d1770b 100644 --- a/data/art824/HQ.amx +++ b/data/art824/hq.amx @@ -28,40 +28,40 @@ <_x0034_ href="#ref-21"/> -HQ\hq_a_0_0.png +hq\hq_a_0_0.png -HQ\hq_a_0_1.png +hq\hq_a_0_1.png -HQ\hq_a_0_2.png +hq\hq_a_0_2.png -HQ\hq_a_0_3.png +hq\hq_a_0_3.png -HQ\Hq_a_1_0.png +hq\hq_a_1_0.png -HQ\hq_a_1_1.png +hq\hq_a_1_1.png -HQ\hq_a_1_2.png +hq\hq_a_1_2.png -HQ\hq_a_1_3.png +hq\hq_a_1_3.png -HQ\Hq_a_2_0.png +hq\hq_a_2_0.png -HQ\hq_a_0_4.png +hq\hq_a_0_4.png -HQ\hq_a_1_4.png +hq\hq_a_1_4.png -HQ\icon.png +hq\icon.png a 0 diff --git a/data/art824/HQ/hq_a_0_0.png b/data/art824/hq/hq_a_0_0.png similarity index 100% rename from data/art824/HQ/hq_a_0_0.png rename to data/art824/hq/hq_a_0_0.png diff --git a/data/art824/HQ/hq_a_0_1.png b/data/art824/hq/hq_a_0_1.png similarity index 100% rename from data/art824/HQ/hq_a_0_1.png rename to data/art824/hq/hq_a_0_1.png diff --git a/data/art824/HQ/hq_a_0_2.png b/data/art824/hq/hq_a_0_2.png similarity index 100% rename from data/art824/HQ/hq_a_0_2.png rename to data/art824/hq/hq_a_0_2.png diff --git a/data/art824/HQ/hq_a_0_3.png b/data/art824/hq/hq_a_0_3.png similarity index 100% rename from data/art824/HQ/hq_a_0_3.png rename to data/art824/hq/hq_a_0_3.png diff --git a/data/art824/HQ/hq_a_0_4.png b/data/art824/hq/hq_a_0_4.png similarity index 100% rename from data/art824/HQ/hq_a_0_4.png rename to data/art824/hq/hq_a_0_4.png diff --git a/data/art824/HQ/Hq_a_1_0.png b/data/art824/hq/hq_a_1_0.png similarity index 100% rename from data/art824/HQ/Hq_a_1_0.png rename to data/art824/hq/hq_a_1_0.png diff --git a/data/art824/HQ/hq_a_1_1.png b/data/art824/hq/hq_a_1_1.png similarity index 100% rename from data/art824/HQ/hq_a_1_1.png rename to data/art824/hq/hq_a_1_1.png diff --git a/data/art824/HQ/hq_a_1_2.png b/data/art824/hq/hq_a_1_2.png similarity index 100% rename from data/art824/HQ/hq_a_1_2.png rename to data/art824/hq/hq_a_1_2.png diff --git a/data/art824/HQ/hq_a_1_3.png b/data/art824/hq/hq_a_1_3.png similarity index 100% rename from data/art824/HQ/hq_a_1_3.png rename to data/art824/hq/hq_a_1_3.png diff --git a/data/art824/HQ/hq_a_1_4.png b/data/art824/hq/hq_a_1_4.png similarity index 100% rename from data/art824/HQ/hq_a_1_4.png rename to data/art824/hq/hq_a_1_4.png diff --git a/data/art824/HQ/Hq_a_2_0.png b/data/art824/hq/hq_a_2_0.png similarity index 100% rename from data/art824/HQ/Hq_a_2_0.png rename to data/art824/hq/hq_a_2_0.png diff --git a/data/art824/HQ/icon.png b/data/art824/hq/icon.png similarity index 100% rename from data/art824/HQ/icon.png rename to data/art824/hq/icon.png diff --git a/data/art824/ltank.amx b/data/art824/ltank.amx index 628ac28..2d06154 100644 --- a/data/art824/ltank.amx +++ b/data/art824/ltank.amx @@ -96,25 +96,25 @@ ltank\ltank_base_7_0.png -ltank\ltank_base_1_0.PNG +ltank\ltank_base_1_0.png -ltank\ltank_base_2_0.PNG +ltank\ltank_base_2_0.png -ltank\ltank_base_3_0.PNG +ltank\ltank_base_3_0.png -ltank\ltank_base_4_0.PNG +ltank\ltank_base_4_0.png -ltank\ltank_base_5_0.PNG +ltank\ltank_base_5_0.png -ltank\ltank_base_6_0.PNG +ltank\ltank_base_6_0.png -ltank\ltank_base_0_0.PNG +ltank\ltank_base_0_0.png ltank\ltank_fire_15_2.png diff --git a/data/art824/mobilehq.amx b/data/art824/mobilehq.amx index 045b4e2..d4a8ca3 100644 --- a/data/art824/mobilehq.amx +++ b/data/art824/mobilehq.amx @@ -29,7 +29,7 @@ <_x0039_ href="#ref-22"/> -mobilehq\mobilehq_run_0_0.PNG +mobilehq\mobilehq_run_0_0.png mobilehq\mobilehq_run_2_0.png @@ -50,7 +50,7 @@ mobilehq\mobilehq_run_7_0.png -mobilehq\mobilehq_run_1_0.PNG +mobilehq\mobilehq_run_1_0.png run 0 diff --git a/data/art824/Radar.amx b/data/art824/radar.amx similarity index 95% rename from data/art824/Radar.amx rename to data/art824/radar.amx index a3a7634..240f5c8 100644 --- a/data/art824/Radar.amx +++ b/data/art824/radar.amx @@ -26,34 +26,34 @@ <_x0034_ href="#ref-19"/> -Radar\radar_a_0_3.png +radar\radar_a_0_3.png -Radar\radar_a_0_1.png +radar\radar_a_0_1.png -Radar\radar_a_0_2.png +radar\radar_a_0_2.png -Radar\radar_a_0_0.png +radar\radar_a_0_0.png -Radar\radar_a_1_3.png +radar\radar_a_1_3.png -Radar\radar_a_1_1.png +radar\radar_a_1_1.png -Radar\radar_a_1_2.png +radar\radar_a_1_2.png -Radar\radar_a_1_0.png +radar\radar_a_1_0.png -Radar\radar_a_2_0.png +radar\radar_a_2_0.png -Radar\icon.png +radar\icon.png a 0 diff --git a/data/art824/replicator.amx b/data/art824/replicator.amx index 5f56b7b..48b44ef 100644 --- a/data/art824/replicator.amx +++ b/data/art824/replicator.amx @@ -40,58 +40,58 @@ replicator\icon.png -replicator\replicatorOn_04.png +replicator\replicatoron_04.png -replicator\replicatorOff_01.png +replicator\replicatoroff_01.png -replicator\replicatorOff_02.png +replicator\replicatoroff_02.png -replicator\replicatorOff_03.png +replicator\replicatoroff_03.png -replicator\replicatorOff_04.png +replicator\replicatoroff_04.png -replicator\replicatorOn_01.png +replicator\replicatoron_01.png -replicator\replicatorOn_02.png +replicator\replicatoron_02.png -replicator\replicatorOn_03.png +replicator\replicatoron_03.png -replicator\replicatorLightsA_01.png +replicator\replicatorlightsa_01.png -replicator\replicatorLightsB_01.png +replicator\replicatorlightsb_01.png -replicator\replicatorLightsB_05.png +replicator\replicatorlightsb_05.png -replicator\replicatorLightsA_02.png +replicator\replicatorlightsa_02.png -replicator\replicatorLightsA_03.png +replicator\replicatorlightsa_03.png -replicator\replicatorLightsA_04.png +replicator\replicatorlightsa_04.png -replicator\replicatorLightsA_05.png +replicator\replicatorlightsa_05.png -replicator\replicatorLightsB_02.png +replicator\replicatorlightsb_02.png -replicator\replicatorLightsB_03.png +replicator\replicatorlightsb_03.png -replicator\replicatorLightsB_04.png +replicator\replicatorlightsb_04.png a 0a diff --git a/data/art824/replicator/replicatorLightsA_01.png b/data/art824/replicator/replicatorlightsa_01.png similarity index 100% rename from data/art824/replicator/replicatorLightsA_01.png rename to data/art824/replicator/replicatorlightsa_01.png diff --git a/data/art824/replicator/replicatorLightsA_02.png b/data/art824/replicator/replicatorlightsa_02.png similarity index 100% rename from data/art824/replicator/replicatorLightsA_02.png rename to data/art824/replicator/replicatorlightsa_02.png diff --git a/data/art824/replicator/replicatorLightsA_03.png b/data/art824/replicator/replicatorlightsa_03.png similarity index 100% rename from data/art824/replicator/replicatorLightsA_03.png rename to data/art824/replicator/replicatorlightsa_03.png diff --git a/data/art824/replicator/replicatorLightsA_04.png b/data/art824/replicator/replicatorlightsa_04.png similarity index 100% rename from data/art824/replicator/replicatorLightsA_04.png rename to data/art824/replicator/replicatorlightsa_04.png diff --git a/data/art824/replicator/replicatorLightsA_05.png b/data/art824/replicator/replicatorlightsa_05.png similarity index 100% rename from data/art824/replicator/replicatorLightsA_05.png rename to data/art824/replicator/replicatorlightsa_05.png diff --git a/data/art824/replicator/replicatorLightsB_01.png b/data/art824/replicator/replicatorlightsb_01.png similarity index 100% rename from data/art824/replicator/replicatorLightsB_01.png rename to data/art824/replicator/replicatorlightsb_01.png diff --git a/data/art824/replicator/replicatorLightsB_02.png b/data/art824/replicator/replicatorlightsb_02.png similarity index 100% rename from data/art824/replicator/replicatorLightsB_02.png rename to data/art824/replicator/replicatorlightsb_02.png diff --git a/data/art824/replicator/replicatorLightsB_03.png b/data/art824/replicator/replicatorlightsb_03.png similarity index 100% rename from data/art824/replicator/replicatorLightsB_03.png rename to data/art824/replicator/replicatorlightsb_03.png diff --git a/data/art824/replicator/replicatorLightsB_04.png b/data/art824/replicator/replicatorlightsb_04.png similarity index 100% rename from data/art824/replicator/replicatorLightsB_04.png rename to data/art824/replicator/replicatorlightsb_04.png diff --git a/data/art824/replicator/replicatorLightsB_05.png b/data/art824/replicator/replicatorlightsb_05.png similarity index 100% rename from data/art824/replicator/replicatorLightsB_05.png rename to data/art824/replicator/replicatorlightsb_05.png diff --git a/data/art824/replicator/replicatorOff_01.png b/data/art824/replicator/replicatoroff_01.png similarity index 100% rename from data/art824/replicator/replicatorOff_01.png rename to data/art824/replicator/replicatoroff_01.png diff --git a/data/art824/replicator/replicatorOff_02.png b/data/art824/replicator/replicatoroff_02.png similarity index 100% rename from data/art824/replicator/replicatorOff_02.png rename to data/art824/replicator/replicatoroff_02.png diff --git a/data/art824/replicator/replicatorOff_03.png b/data/art824/replicator/replicatoroff_03.png similarity index 100% rename from data/art824/replicator/replicatorOff_03.png rename to data/art824/replicator/replicatoroff_03.png diff --git a/data/art824/replicator/replicatorOff_04.png b/data/art824/replicator/replicatoroff_04.png similarity index 100% rename from data/art824/replicator/replicatorOff_04.png rename to data/art824/replicator/replicatoroff_04.png diff --git a/data/art824/replicator/replicatorOn_01.png b/data/art824/replicator/replicatoron_01.png similarity index 100% rename from data/art824/replicator/replicatorOn_01.png rename to data/art824/replicator/replicatoron_01.png diff --git a/data/art824/replicator/replicatorOn_02.png b/data/art824/replicator/replicatoron_02.png similarity index 100% rename from data/art824/replicator/replicatorOn_02.png rename to data/art824/replicator/replicatoron_02.png diff --git a/data/art824/replicator/replicatorOn_03.png b/data/art824/replicator/replicatoron_03.png similarity index 100% rename from data/art824/replicator/replicatorOn_03.png rename to data/art824/replicator/replicatoron_03.png diff --git a/data/art824/replicator/replicatorOn_04.png b/data/art824/replicator/replicatoron_04.png similarity index 100% rename from data/art824/replicator/replicatorOn_04.png rename to data/art824/replicator/replicatoron_04.png diff --git a/data/art824/Research.amx b/data/art824/research.amx similarity index 96% rename from data/art824/Research.amx rename to data/art824/research.amx index 9f41637..64cef6b 100644 --- a/data/art824/Research.amx +++ b/data/art824/research.amx @@ -23,25 +23,25 @@ <_x0034_ href="#ref-16"/> -Research\research_a_0_0.png +research\research_a_0_0.png -Research\research_dish_0_2.png +research\research_dish_0_2.png -Research\research_dish_0_1.png +research\research_dish_0_1.png -Research\research_dish_0_0.png +research\research_dish_0_0.png -Research\research_a_2_0.png +research\research_a_2_0.png -Research\research_a_1_0.png +research\research_a_1_0.png -Research\icon.png +research\icon.png a 0 diff --git a/data/art824/VTS.amx b/data/art824/vts.amx similarity index 96% rename from data/art824/VTS.amx rename to data/art824/vts.amx index eb8fc68..d6f5013 100644 --- a/data/art824/VTS.amx +++ b/data/art824/vts.amx @@ -26,25 +26,25 @@ <_x0037_ href="#ref-19"/> -VTS\vts_b_0_0.png +vts\vts_b_0_0.png -VTS\vts_b_1_0.png +vts\vts_b_1_0.png -VTS\vts_b_2_0.png +vts\vts_b_2_0.png -VTS\vts_a_2_0.png +vts\vts_a_2_0.png -VTS\vts_a_1_0.png +vts\vts_a_1_0.png -VTS\vts_a_0_0.png +vts\vts_a_0_0.png -VTS\icon.png +vts\icon.png a 0 diff --git a/data/art824/warehouse/warehouse_a_2_2.PNG b/data/art824/warehouse/warehouse_a_2_2.png similarity index 100% rename from data/art824/warehouse/warehouse_a_2_2.PNG rename to data/art824/warehouse/warehouse_a_2_2.png diff --git a/data/makefile b/data/makefile index 0d858f1..189681b 100644 --- a/data/makefile +++ b/data/makefile @@ -1,11 +1,14 @@ -# -# Depth related settings, default 8 -# - MONO=mono -#CPP=gcc -E -P -x c -Wno-trigraphs + +UNAME := $(shell uname) +ifeq ($(UNAME), Darwin) +INICRUNCH=inicrunch_osx CPP=cpp -P -Wno-invalid-pp-token -Wno-trigraphs -INICRUNCH=inicrunch +endif +ifeq ($(UNAME), Linux) +INICRUNCH=inicrunch_linux +CPP=cpp -P -Wno-trigraphs +endif HELPFILE=help.txt @@ -171,16 +174,16 @@ $(ARTDIR)/bitmaps/galax2c.bmp \ $(ARTDIR)/bitmaps/galax3a.bmp \ $(ARTDIR)/bitmaps/galax3b.bmp \ $(ARTDIR)/bitmaps/galax3c.bmp \ -$(ARTDIR)/bitmaps/placementBad.bmp \ -$(ARTDIR)/bitmaps/placementGood.bmp \ +$(ARTDIR)/bitmaps/placementbad.bmp \ +$(ARTDIR)/bitmaps/placementgood.bmp \ $(ARTDIR)/bitmaps/plant.bmp \ $(ARTDIR)/bitmaps/plant1.bmp \ $(ARTDIR)/bitmaps/plant2.bmp \ $(ARTDIR)/bitmaps/plant3.bmp \ $(ARTDIR)/bitmaps/plant4.bmp \ $(ARTDIR)/bitmaps/plant5.bmp \ -$(ARTDIR)/bitmaps/RocketArtifact.bmp \ -$(ARTDIR)/bitmaps/Rocks.bmp \ +$(ARTDIR)/bitmaps/rocketartifact.bmp \ +$(ARTDIR)/bitmaps/rocks.bmp \ $(ARTDIR)/bitmaps/tree.bmp \ $(ARTDIR)/bitmaps/tree1.bmp \ $(ARTDIR)/bitmaps/tree2.bmp \ diff --git a/inicrunch/Makefile b/inicrunch/Makefile new file mode 100644 index 0000000..a58eb7d --- /dev/null +++ b/inicrunch/Makefile @@ -0,0 +1,16 @@ +TOOLDIR=../bin +CPP_FLAGS=-Wno-multichar -Wno-write-strings + +UNAME := $(shell uname) +ifeq ($(UNAME), Darwin) +BINARY=inicrunch_osx +endif +ifeq ($(UNAME), Linux) +BINARY=inicrunch_linux +endif + +all: + g++ $(CPP_FLAGS) main.cpp ini.cpp -o $(TOOLDIR)/$(BINARY) + +clean: + rm -f $(TOOLDIR)/$(BINARY) diff --git a/inicrunch/ini.cpp b/inicrunch/ini.cpp index b6688ce..f0c33a8 100644 --- a/inicrunch/ini.cpp +++ b/inicrunch/ini.cpp @@ -204,7 +204,7 @@ IniSection *LoadIniFile(char *pszFn, int *pcSections) FILE *pf = fopen(pszFn, "rb"); if (pf == NULL) - return false; + return NULL; while (true) { // Get the next line diff --git a/inicrunch/ini.h b/inicrunch/ini.h index ef5d787..28e582c 100644 --- a/inicrunch/ini.h +++ b/inicrunch/ini.h @@ -1,7 +1,10 @@ -typedef unsigned long dword; +typedef unsigned int dword; typedef unsigned char byte; typedef unsigned short word; + +#ifndef NULL #define NULL 0 +#endif #include diff --git a/inicrunch/make.sh b/inicrunch/make.sh deleted file mode 100755 index f26c7cd..0000000 --- a/inicrunch/make.sh +++ /dev/null @@ -1 +0,0 @@ -gcc -lstdc++ main.cpp ini.cpp -o ../bin/inicrunch \ No newline at end of file