Merge pull request #87 from CleverRaven/master

Merge pull request CleverRaven#38146 from Ramza13/battery
fengjixuchui · Feb 19, 2020 · d12d748 · d12d748
2 parents e06a676 + 9286722
commit d12d748
Show file tree

Hide file tree

Showing 184 changed files with 2,670 additions and 3,379 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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"
+    - env: CLANG=clang++-8 SANITIZE=address,undefined EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items ~starve_test"
       name: "Clang 8 Make build with sanitizers enabled, but long-running tests disabled"
       compiler: clang
       addons: &clang8

diff --git a/LICENSE-OFL-Terminus-Font.TXT → LICENSE-OFL-Terminus-Font.txt b/LICENSE-OFL-Terminus-Font.TXT → LICENSE-OFL-Terminus-Font.txt
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -4,7 +4,7 @@ The Square font (data/font/square.ttf) is copyright Wouter van Oortmerssen, lice
 
 GNU Unifont (data/font/unitfont.ttf) is licensed under GNU General Public License v2+ with the GNU font embedding exception. Visit http://unifoundry.com/LICENSE.txt for details.
 
-Terminus Font (data/font/terminus.ttf) is licensed under the SIL Open Font License (see LICENSE-OFL-Terminus-Font.TXT).
+Terminus Font (data/font/terminus.ttf) is licensed under the SIL Open Font License (see LICENSE-OFL-Terminus-Font.txt).
 
 CATCH unit-test framework (tests/catch/catch.hpp) is licensed under the Boost Software License. Visit https://github.com/philsquared/Catch/blob/master/LICENSE.txt to read the license.
 

diff --git a/Makefile b/Makefile
@@ -362,7 +362,7 @@ endif
 CXXFLAGS += $(WARNINGS) $(DEBUG) $(DEBUGSYMS) $(PROFILE) $(OTHERS) -MMD -MP
 TOOL_CXXFLAGS = -DCATA_IN_TOOL
 
-BINDIST_EXTRAS += README.md data doc LICENSE.txt
+BINDIST_EXTRAS += README.md data doc LICENSE.txt LICENSE-OFL-Terminus-Font.txt VERSION.txt
 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)

diff --git a/cataclysm-launcher b/cataclysm-launcher
@@ -30,7 +30,7 @@ fi
 
 if [ "$BIN" ]
 then
-    exec "./$BIN"
+    exec ./$BIN $@
 else
     echo "Couldn't find cataclysm game binary in $DIR/"
     exit 1

diff --git a/data/font/Square-Smallcaps.ttf b/data/font/Square-Smallcaps.ttf
diff --git a/data/font/fixedsys.ttf b/data/font/fixedsys.ttf
diff --git a/data/font/square.ttf b/data/font/square.ttf
diff --git a/data/font/terminus-bold.fon b/data/font/terminus-bold.fon