Merge pull request #1 from CleverRaven/master

Fork Update 03/26/2020
I-am-Erk · Mar 26, 2020 · 792532e · 792532e
2 parents 55cabb7 + e603140
commit 792532e
Show file tree

Hide file tree

Showing 1,019 changed files with 73,227 additions and 65,116 deletions.
diff --git a/.github/stale.yml b/.github/stale.yml
@@ -23,6 +23,7 @@ exemptLabels:
   - "(P5 - Long-term)"
   - "(S2 - Confirmed)"
   - "0.E Feature Freeze"
+  - "0.E Content Freeze"
 
 # Set to true to ignore issues in a project (defaults to false)
 exemptProjects: true

diff --git a/.gitignore b/.gitignore
@@ -87,6 +87,9 @@ Thumbs.db
 cscope.*
 tags
 
+# Generated translation source
+/lang/po/en.po
+
 # Compiled binary translations
 /lang/mo/
 

diff --git a/.travis.yml b/.travis.yml
@@ -57,7 +57,7 @@ jobs:
     # Initial test stage, if this fails everything else is cancelled.
     - stage: Test
       # Clang is consistently the fastest to build, so use it for the initial test.
-      env: CLANG=clang++-3.8 MODS=--mods=RL_Classes TEST_STAGE=1 CXXFLAGS='-Wno-error=unused-command-line-argument -D__extern_always_inline="extern __always_inline"'
+      env: CLANG=clang++-3.8 MODS=--mods=RL_Classes TEST_STAGE=1 CXXFLAGS="-Wno-error=unused-command-line-argument -D__extern_always_inline='extern __always_inline'"
       name: "Clang 3.8 Make build with curses, style check and RL_Classes test"
       compiler: clang
       addons: &clang38
@@ -75,7 +75,7 @@ jobs:
           packages: ["g++-5=5.3.1-14ubuntu2", "libstdc++-5-dev=5.3.1-14ubuntu2", "gcc-5=5.3.1-14ubuntu2", "gcc-5-base=5.3.1-14ubuntu2", "cpp-5=5.3.1-14ubuntu2", "libgcc-5-dev=5.3.1-14ubuntu2", "libasan2=5.3.1-14ubuntu2", "libmpx0=5.3.1-14ubuntu2"]
           sources: [*apt_sources]
 
-    - env: COMPILER=g++-8 CXXFLAGS='-Wno-implicit-fallthrough' TILES=1 SOUND=1 SANITIZE=address
+    - env: COMPILER=g++-8 CXXFLAGS="-Wno-implicit-fallthrough" TILES=1 SOUND=1 SANITIZE=address EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency"
       name: "GCC 8 Make build with Tiles, Sound, astyle and address sanitization"
       dist: bionic
       compiler: gcc
@@ -84,7 +84,7 @@ jobs:
           packages: ["g++-8",   "g++-8-multilib",   "libc6-dbg", "libc6-dbg:i386", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev", "astyle"]
           sources: *apt_sources
 
-    - env: CLANG=clang++-8 SANITIZE=address,undefined EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items ~starve_test"
+    - env: CLANG=clang++-8 SANITIZE=address,undefined EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items ~[starve] ~grenade_lethality"
       name: "Clang 8 Make build with sanitizers enabled, but long-running tests disabled"
       compiler: clang
       addons: &clang8
@@ -94,7 +94,7 @@ jobs:
 
     - stage: "Platforms and Tidy"
     # MXE variant using alternate repository http://mirror.mxe.cc/repos/apt
-      env: COMPILER='g++' LDFLAGS='-static-libgcc -static-libstdc++' MXE_TARGET='i686-w64-mingw32.static' WINE='wine' TILES=1 SOUND=1
+      env: COMPILER=g++ LDFLAGS="-static-libgcc -static-libstdc++" MXE_TARGET="i686-w64-mingw32.static" WINE="wine" TILES=1 SOUND=1
       name: "Mingw-w64 Make cross-compile to Windows with Tiles and Sound"
       compiler: gcc
       addons: &gcc

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -146,7 +146,9 @@ MESSAGE(STATUS "${PROJECT_NAME} build options --\n")
 
 # Preset variables
 IF(NOT LANGUAGES)
-    SET (LANGUAGES de es_AR es_ES fr it_IT ja ko pt_BR ru zh_CN zh_TW)
+    # English is included to workaround a libintl bug that affects performance
+    # on MinGW targets. See lang/CMakeList.txt for more information.
+    SET (LANGUAGES en de es_AR es_ES fr it_IT ja ko pt_BR ru zh_CN zh_TW)
 ENDIF(NOT LANGUAGES)
 
 IF (GIT_BINARY)
@@ -193,7 +195,7 @@ ELSE (CMAKE_BUILD_TYPE STREQUAL Debug)
     MESSAGE(STATUS "PIXMAPS_UNITY_ENTRY_PATH      : ${PIXMAPS_UNITY_ENTRY_PATH}")
     MESSAGE(STATUS "MANPAGE_ENTRY_PATH            : ${MANPAGE_ENTRY_PATH}\n")
     ADD_DEFINITIONS(-DRELEASE)
-    # Use PREFIX as storage of data,gfx, etc.. Usefull only on *nix OS.
+    # Use PREFIX as storage of data,gfx, etc.. Useful only on *nix OS.
     IF (PREFIX AND NOT WIN32)
       ADD_DEFINITIONS(-DDATA_DIR_PREFIX)
     ENDIF (PREFIX AND NOT WIN32)
@@ -221,13 +223,21 @@ IF(MSVC)
 ELSE()
     SET(CATA_WARNINGS
       "-Werror -Wall -Wextra \
+       -Wformat-signedness \
+       -Wlogical-op \
        -Wmissing-declarations \
        -Wmissing-noreturn \
+       -Wnon-virtual-dtor \
        -Wold-style-cast \
        -Woverloaded-virtual \
-       -Wsuggest-override \
        -Wpedantic \
+       -Wsuggest-override \
+       -Wunused-macros \
+       -Wzero-as-null-pointer-constant \
        -Wno-unknown-warning-option")
+    IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES Windows)
+        SET(CATA_WARNINGS "${CATA_WARNINGS} -Wredundant-decls")
+    ENDIF()
     # Compact the whitespace in the warning string
     string(REGEX REPLACE "[\t ]+" " " CATA_WARNINGS "${CATA_WARNINGS}")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS}")

diff --git a/Makefile b/Makefile
@@ -47,6 +47,10 @@
 #  (for example: make LANGUAGES="zh_CN zh_TW" for Chinese)
 #  make localization LANGUAGES=all
 #  (for every .po file in lang/po)
+#  Special note for MinGW: due to a libintl bug (https://savannah.gnu.org/bugs/index.php?58006),
+#  using English without a `.mo` file would cause significant slow down on MinGW
+#  targets. In such case you can compile a `.mo` file for English using `make LANGUAGES="en"`.
+#  `make LANGUAGE="all"` also compiles a `.mo` file for English in addition to other languages.
 # Enable sanitizer (address, undefined, etc.)
 #  make SANITIZE=address
 # Change mapsize (reality bubble size)
@@ -89,12 +93,17 @@
 RELEASE_FLAGS =
 WARNINGS = \
   -Werror -Wall -Wextra \
+  -Wformat-signedness \
+  -Wlogical-op \
   -Wmissing-declarations \
   -Wmissing-noreturn \
+  -Wnon-virtual-dtor \
   -Wold-style-cast \
   -Woverloaded-virtual \
   -Wpedantic \
   -Wsuggest-override \
+  -Wunused-macros \
+  -Wzero-as-null-pointer-constant \
   -Wno-unknown-warning-option
 # Uncomment below to disable warnings
 #WARNINGS = -w
@@ -165,6 +174,13 @@ ifdef MSYSTEM
   MSYS2 = 1
 endif
 
+# Determine JSON formatter binary name
+ifeq ($(MSYS2), 1)
+  JSON_FORMATTER_BIN=tools/format/json_formatter.exe
+else
+  JSON_FORMATTER_BIN=tools/format/json_formatter.cgi
+endif
+
 # Enable backtrace by default
 ifndef BACKTRACE
   # ...except not on native Windows builds, because the relevant headers are
@@ -362,7 +378,7 @@ endif
 CXXFLAGS += $(WARNINGS) $(DEBUG) $(DEBUGSYMS) $(PROFILE) $(OTHERS) -MMD -MP
 TOOL_CXXFLAGS = -DCATA_IN_TOOL
 
-BINDIST_EXTRAS += README.md data doc LICENSE.txt LICENSE-OFL-Terminus-Font.txt VERSION.txt
+BINDIST_EXTRAS += README.md data doc LICENSE.txt LICENSE-OFL-Terminus-Font.txt VERSION.txt $(JSON_FORMATTER_BIN)
 BINDIST    = $(BUILD_PREFIX)cataclysmdda-$(VERSION).tar.gz
 W32BINDIST = $(BUILD_PREFIX)cataclysmdda-$(VERSION).zip
 BINDIST_CMD    = tar --transform=s@^$(BINDIST_DIR)@cataclysmdda-$(VERSION)@ -czvf $(BINDIST) $(BINDIST_DIR)
@@ -475,6 +491,10 @@ ifneq (,$(findstring mingw32,$(CROSS)))
   TARGETSYSTEM=WINDOWS
 endif
 
+ifneq ($(TARGETSYSTEM),WINDOWS)
+  WARNINGS += -Wredundant-decls
+endif
+
 # Global settings for Windows targets
 ifeq ($(TARGETSYSTEM),WINDOWS)
   CHKJSON_BIN = chkjson.exe
@@ -887,14 +907,15 @@ install: version $(TARGET)
 	cp -R --no-preserve=ownership data/motd $(DATA_PREFIX)
 	cp -R --no-preserve=ownership data/credits $(DATA_PREFIX)
 	cp -R --no-preserve=ownership data/title $(DATA_PREFIX)
+	cp -R --no-preserve=ownership data/help $(DATA_PREFIX)
 ifdef TILES
 	cp -R --no-preserve=ownership gfx $(DATA_PREFIX)
 endif
 ifdef SOUND
 	cp -R --no-preserve=ownership data/sound $(DATA_PREFIX)
 endif
 	install --mode=644 data/changelog.txt data/cataicon.ico data/fontdata.json \
-                   LICENSE.txt -t $(DATA_PREFIX)
+                   LICENSE.txt LICENSE-OFL-Terminus-Font.txt -t $(DATA_PREFIX)
 	mkdir -p $(LOCALE_DIR)
 ifdef LANGUAGES
 	LOCALE_DIR=$(LOCALE_DIR) lang/compile_mo.sh $(LANGUAGES)
@@ -918,14 +939,15 @@ install: version $(TARGET)
 	cp -R --no-preserve=ownership data/motd $(DATA_PREFIX)
 	cp -R --no-preserve=ownership data/credits $(DATA_PREFIX)
 	cp -R --no-preserve=ownership data/title $(DATA_PREFIX)
+	cp -R --no-preserve=ownership data/help $(DATA_PREFIX)
 ifdef TILES
 	cp -R --no-preserve=ownership gfx $(DATA_PREFIX)
 endif
 ifdef SOUND
 	cp -R --no-preserve=ownership data/sound $(DATA_PREFIX)
 endif
 	install --mode=644 data/changelog.txt data/cataicon.ico data/fontdata.json \
-                   LICENSE.txt -t $(DATA_PREFIX)
+                   LICENSE.txt LICENSE-OFL-Terminus-Font.txt -t $(DATA_PREFIX)
 	mkdir -p $(LOCALE_DIR)
 ifdef LANGUAGES
 	LOCALE_DIR=$(LOCALE_DIR) lang/compile_mo.sh $(LANGUAGES)
@@ -974,6 +996,7 @@ endif
 	cp -R data/motd $(APPDATADIR)
 	cp -R data/credits $(APPDATADIR)
 	cp -R data/title $(APPDATADIR)
+	cp -R data/help $(APPDATADIR)
 ifdef LANGUAGES
 	lang/compile_mo.sh $(LANGUAGES)
 	mkdir -p $(APPRESOURCESDIR)/lang/mo/
@@ -1067,11 +1090,6 @@ endif
 
 JSON_FILES = $(shell find data -name "*.json" | sed "s|^\./||")
 JSON_WHITELIST = $(filter-out $(shell cat json_blacklist), $(JSON_FILES))
-ifeq ($(MSYS2), 1)
-  JSON_FORMATTER_BIN=tools/format/json_formatter.exe
-else
-  JSON_FORMATTER_BIN=tools/format/json_formatter.cgi
-endif
 
 style-json: $(JSON_WHITELIST)
 

diff --git a/README.md b/README.md
@@ -1,40 +1,40 @@
-[![Build Status](https://travis-ci.org/CleverRaven/Cataclysm-DDA.svg?branch=master)](https://travis-ci.org/CleverRaven/Cataclysm-DDA)
-[![Coverage Status](https://coveralls.io/repos/github/CleverRaven/Cataclysm-DDA/badge.svg?branch=master)](https://coveralls.io/github/CleverRaven/Cataclysm-DDA?branch=master)
-[![Open Source Helpers](https://www.codetriage.com/cleverraven/cataclysm-dda/badges/users.svg)](https://www.codetriage.com/cleverraven/cataclysm-dda)
-![Commit Activity](https://img.shields.io/github/commit-activity/m/CleverRaven/Cataclysm-DDA)
-[![Lines of Code](https://tokei.rs/b1/github/CleverRaven/Cataclysm-DDA?category=code)](https://github.com/XAMPPRocky/tokei)
-
-# Cataclysm: Dark Days Ahead
+# Catalcysm: Dark Days Ahead
 
 Cataclysm: Dark Days Ahead is a roguelike set in a post-apocalyptic world. While some have described it as a "zombie game", there is far more to Cataclysm than that. Struggle to survive in a harsh, persistent, procedurally generated world. Scavenge the remnants of a dead civilization for food, equipment, or, if you are lucky, a vehicle with a full tank of gas to get you the hell out of Dodge. Fight to defeat or escape from a wide variety of powerful monstrosities, from zombies to giant insects to killer robots and things far stranger and deadlier, and against the others like yourself, who want what you have...
 
-## Download
-
 <a href="https://repology.org/project/cataclysm-dda/versions">
-    <img src="https://repology.org/badge/vertical-allrepos/cataclysm-dda.svg" alt="Packaging status" align="right">
+    <img src="https://repology.org/badge/vertical-allrepos/cataclysm-dda.svg" alt="Packaging Status" align="right">
 </a>
 
-Visit [our website](http://cataclysmdda.org) for download links to all stable and experimental releases.
+[![Build Status](https://travis-ci.org/CleverRaven/Cataclysm-DDA.svg?branch=master)](https://travis-ci.org/CleverRaven/Cataclysm-DDA)
+[![Coverage Status](https://coveralls.io/repos/github/CleverRaven/Cataclysm-DDA/badge.svg?branch=master)](https://coveralls.io/github/CleverRaven/Cataclysm-DDA?branch=master)
+[![Open Source Helpers](https://www.codetriage.com/cleverraven/cataclysm-dda/badges/users.svg)](https://www.codetriage.com/cleverraven/cataclysm-dda)
+[![Commit Activity](https://img.shields.io/github/commit-activity/m/CleverRaven/Cataclysm-DDA)](https://github.com/CleverRaven/Cataclysm-DDA/graphs/contributors)
+[![Lines of Code](https://tokei.rs/b1/github/CleverRaven/Cataclysm-DDA?category=code)](https://github.com/XAMPPRocky/tokei)
+
+## Downloads
+
+**Releases** - [Stable](https://cataclysmdda.org/releases/) | [Experimental](https://cataclysmdda.org/experimental/)
 
-The source can either be downloaded as [an archive](https://github.com/CleverRaven/Cataclysm-DDA/archive/master.zip), or you can clone it from [our GitHub repository](https://github.com/CleverRaven/Cataclysm-DDA/).
+**Source** - The source can be downloaded as a [.zip archive](https://github.com/CleverRaven/Cataclysm-DDA/archive/master.zip), or cloned from our [GitHub repo](https://github.com/CleverRaven/Cataclysm-DDA/).
 
-## Packaging status
+### Packaging status
 
-### Arch Linux
+#### Arch Linux
 
-Ncurses and tiles version available in [Community repo](https://www.archlinux.org/packages/?q=cataclysm-dda)
+Ncurses and tiles version available in [community repo](https://www.archlinux.org/packages/?q=cataclysm-dda).
 
 `sudo pacman -S cataclysm-dda`
 
-### Fedora
+#### Fedora
 
-Ncurses and tiles version available in [official repos](https://src.fedoraproject.org/rpms/cataclysm-dda)
+Ncurses and tiles version available in [official repos](https://src.fedoraproject.org/rpms/cataclysm-dda).
 
 `sudo dnf install cataclysm-dda`
 
-### Debian / Ubuntu
+#### Debian / Ubuntu
 
-Ncurses and tiles version available in [official repos](https://tracker.debian.org/pkg/cataclysm-dda)
+Ncurses and tiles version available in [official repos](https://tracker.debian.org/pkg/cataclysm-dda).
 
 `sudo apt install cataclysm-dda-curses cataclysm-dda-sdl`
 
@@ -49,10 +49,10 @@ We also have the following build guides:
 
 ## Contribute
 
-Cataclysm:Dark Days Ahead is the result of contributions from over 1000 volunteers under the Creative Commons Attribution ShareAlike 3.0 license. The code and content of the game is free to use, modify, and redistribute for any purpose whatsoever. See http://creativecommons.org/licenses/by-sa/3.0/ for details.
+Cataclysm: Dark Days Ahead is the result of contributions from over 1000 volunteers under the Creative Commons Attribution ShareAlike 3.0 license. The code and content of the game is free to use, modify, and redistribute for any purpose whatsoever. See http://creativecommons.org/licenses/by-sa/3.0/ for details.
 Some code distributed with the project is not part of the project and is released under different software licenses, the files covered by different software licenses have their own license notices.
 
-[![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=146201)](https://www.bountysource.com/trackers/146201-clever-raven-cataclysm-dda?utm_source=146201&utm_medium=shield&utm_campaign=TRACKER_BADGE)
+[<img src="https://www.bountysource.com/badge/tracker?tracker_id=146201" alt="Bountysource" align="right">](https://www.bountysource.com/trackers/146201-clever-raven-cataclysm-dda?utm_source=146201&utm_medium=shield&utm_campaign=TRACKER_BADGE)
 
 Please see [CONTRIBUTING.md](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/.github/CONTRIBUTING.md) for details.
 

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -35,24 +35,83 @@ if (keystorePropertiesFile.exists()) {
 }
 
 def njobs = getProperty("j")
+if (localProperties.getProperty('j') != null) {
+    njobs = localProperties.getProperty("j")
+}
 
 def localize = getProperty("localize").toBoolean()
+if (localProperties.getProperty('localize') != null) {
+    localize = localProperties.getProperty("localize").toBoolean()
+}
+
 def abi_arm_32 = getProperty("abi_arm_32").toBoolean()
+if (localProperties.getProperty('abi_arm_32') != null) {
+    abi_arm_32 = localProperties.getProperty("abi_arm_32").toBoolean()
+}
+
 def abi_arm_64 = getProperty("abi_arm_64").toBoolean()
+if (localProperties.getProperty('abi_arm_64') != null) {
+    abi_arm_64 = localProperties.getProperty("abi_arm_64").toBoolean()
+}
+
 def abi_x86_32 = getProperty("abi_x86_32").toBoolean()
+if (localProperties.getProperty('abi_x86_32') != null) {
+    abi_x86_32 = localProperties.getProperty("abi_x86_32").toBoolean()
+}
+
 def abi_x86_64 = getProperty("abi_x86_64").toBoolean()
+if (localProperties.getProperty('abi_x86_64') != null) {
+    abi_x86_64 = localProperties.getProperty("abi_x86_64").toBoolean()
+}
+
 def deps = getProperty("deps")
+if (localProperties.getProperty('deps') != null) {
+    deps = localProperties.getProperty("deps")
+}
+
 def override_version = getProperty("override_version")
+if (localProperties.getProperty('override_version') != null) {
+    override_version = localProperties.getProperty("override_version")
+}
+
 def version_header_path = getProperty("version_header_path")
+if (localProperties.getProperty('version_header_path') != null) {
+    version_header_path = localProperties.getProperty("version_header_path")
+}
+
 def override_compileSdkVersion = getProperty("override_compileSdkVersion").toInteger()
+if (localProperties.getProperty('override_compileSdkVersion') != null) {
+    override_compileSdkVersion = localProperties.getProperty("override_compileSdkVersion").toInteger()
+}
+
 def override_minSdkVersion = getProperty("override_minSdkVersion").toInteger()
+if (localProperties.getProperty('override_minSdkVersion') != null) {
+    override_minSdkVersion = localProperties.getProperty("override_minSdkVersion").toInteger()
+}
+
 def override_targetSdkVersion = getProperty("override_targetSdkVersion").toInteger()
+if (localProperties.getProperty('override_targetSdkVersion') != null) {
+    override_targetSdkVersion = localProperties.getProperty("override_targetSdkVersion").toInteger()
+}
+
 def override_ndkBuildAppPlatform = getProperty("override_ndkBuildAppPlatform")
+if (localProperties.getProperty('override_ndkBuildAppPlatform') != null) {
+    override_ndkBuildAppPlatform = localProperties.getProperty("override_ndkBuildAppPlatform")
+}
 
-println("Using compileSdkVersion: $override_compileSdkVersion")
-println("Using minSdkVersion: $override_minSdkVersion")
-println("Using targetSdkVersion: $override_targetSdkVersion")
-println("Using ndkBuildAppPlatform: $override_ndkBuildAppPlatform")
+println("Using [              njobs]: $njobs")
+println("Using [           localize]: $localize")
+println("Using [               deps]: $deps")
+println("Using [   override_version]: $override_version")
+println("Using [version_header_path]: $version_header_path")
+println("Using [  compileSdkVersion]: $override_compileSdkVersion")
+println("Using [      minSdkVersion]: $override_minSdkVersion")
+println("Using [   targetSdkVersion]: $override_targetSdkVersion")
+println("Using [ndkBuildAppPlatform]: $override_ndkBuildAppPlatform")
+println("Using [         abi_arm_32]: $abi_arm_32")
+println("Using [         abi_arm_64]: $abi_arm_64")
+println("Using [         abi_x86_32]: $abi_x86_32")
+println("Using [         abi_x86_64]: $abi_x86_64")
 
 if (!abi_arm_32 && !abi_arm_64 && !abi_x86_32 && !abi_x86_64) {
     throw new GradleException("All supported ABI properties are set to false!")