add zoo roofs

Fix namespace comment
remove invalid spell id from spellbook
CleverRaven · chriseich21 · Jul 14, 2019 · b0urgeoisie · Jul 14, 2019
Unified Split

Showing 3,870 changed files with 6,323,310 additions and 209,822 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -0,0 +1,26 @@
+  
+version: '{branch}.{build}'
+  
+os: Windows
+  
+clone_folder: C:\Projects\Cataclysm-DDA
+  
+shallow_clone: true
+  
+pull_requests:
+  
+    do_not_increment_build_number: false
+  
+environment:
+  
+    matrix:
+  
+        - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+  
+          PROJECT: /msvc-full-features/Cataclysm-vcpkg-static.sln
+  
+          COMPILER: msvc2017
+  
+          TOOLCHAIN: msvc15
+  
+          PLATFORM: x64
+  
+          CONFIGURATION: Release
+  
+          APPVEYOR_SAVE_CACHE_ON_ERROR: true
+  
+matrix:
+  
+    fast_finish: false
+  
+cache:
+  
+  - 'c:\tools\vcpkg\installed'
+  
+install:
+  
+    # Install dependency packages
+  
+    - cmd: vcpkg --triplet %PLATFORM%-windows-static install sdl2 sdl2-image sdl2-mixer sdl2-ttf gettext
+  
+build:
+  
+  parallel: true
+  
+  project: /msvc-full-features/Cataclysm-vcpkg-static.sln
+  
+  verbosity: minimal
diff --git a/.astylerc b/.astylerc
@@ -0,0 +1,51 @@
+  
+# These options are mirrored in .astylerc and doc/CODE_STYLE.txt
+  
+
+  
+# "One True Brace Style"
+  
+--style=1tbs
+  
+
+  
+# Attach brackets to class and struct inline function definitions.
+  
+--attach-inlines
+  
+
+  
+# 4 spaces per indentation level and per tab stop
+  
+--indent=spaces=4
+  
+
+  
+# 'char *foo' instead of 'char* foo'
+  
+--align-pointer=name
+  
+
+  
+# maximum length for a single unbroken line
+  
+--max-code-length=100
+  
+
+  
+# 'foo ||\nbar' instead of 'foo\n|| bar'
+  
+--break-after-logical
+  
+
+  
+# indent 'public:' 'protected:' 'private:' deeper than 'class' or 'struct'
+  
+--indent-classes
+  
+
+  
+# indent 'case' lines deeper than 'switch'
+  
+--indent-switches
+  
+
+  
+# indent later lines of multi-line preprocessor directives
+  
+# to be deprecated by --indent-preproc-define
+  
+--indent-preprocessor
+  
+
+  
+# indent comments on column 1 to match the code block they are in
+  
+--indent-col1-comments
+  
+
+  
+# indent multi-line control block headers like 'if (foo\nbar)'
+  
+--min-conditional-indent=0
+  
+
+  
+# add space around operators with two operands
+  
+--pad-oper
+  
+
+  
+# add brackets to unbracketed one line conditional statements
+  
+--add-brackets
+  
+
+  
+# replaces tabs with spaces in non-indent sections, except in strings
+  
+--convert-tabs
+  
+
+  
+# remove extra space padding around parentheses
+  
+--unpad-paren
+  
+
+  
+# insert space padding around parentheses on the inside only
+  
+--pad-paren-in
+  
+
diff --git a/.clang-tidy b/.clang-tidy
@@ -0,0 +1,95 @@
+  
+# Enable some categories of checks and then disable individual ones.
+  
+# The disabled checks that appear as part of the initial alphabetical section
+  
+# enabling categories (e.g. cert-err58-cpp) are ones that do not make sense for
+  
+# this codebase and we do not intend to fix.  The disabled checks appearing
+  
+# thereafter in a separate alphabetical list have yet to be triaged.  We may
+  
+# fix their errors or recategorise them as checks we don't care about.
+  
+Checks: "\
+  
+bugprone-*,\
+  
+cata-*,\
+  
+cert-*,\
+  
+-cert-err58-cpp,\
+  
+clang-diagnostic-*,\
+  
+cppcoreguidelines-slicing,\
+  
+llvm-namespace-comment,\
+  
+misc-*,\
+  
+modernize-*,\
+  
+performance-*,\
+  
+readability-*,\
+  
+-bugprone-incorrect-roundings,\
+  
+-bugprone-integer-division,\
+  
+-bugprone-macro-parentheses,\
+  
+-bugprone-misplaced-widening-cast,\
+  
+-bugprone-narrowing-conversions,\
+  
+-bugprone-string-integer-assignment,\
+  
+-bugprone-too-small-loop-variable,\
+  
+-bugprone-undefined-memory-manipulation,\
+  
+-bugprone-unused-return-value,\
+  
+-bugprone-use-after-move,\
+  
+-cert-dcl21-cpp,\
+  
+-cert-dcl50-cpp,\
+  
+-cert-dcl58-cpp,\
+  
+-cert-dcl59-cpp,\
+  
+-cert-env33-c,\
+  
+-cert-err34-c,\
+  
+-cert-flp30-c,\
+  
+-cert-msc30-c,\
+  
+-cert-msc32-c,\
+  
+-cert-msc50-cpp,\
+  
+-cert-msc51-cpp,\
+  
+-misc-definitions-in-headers,\
+  
+-misc-non-private-member-variables-in-classes,\
+  
+-misc-redundant-expression,\
+  
+-misc-unconventional-assign-operator,\
+  
+-modernize-avoid-c-arrays,\
+  
+-modernize-deprecated-headers,\
+  
+-modernize-make-unique,\
+  
+-modernize-pass-by-value,\
+  
+-modernize-raw-string-literal,\
+  
+-modernize-return-braced-init-list,\
+  
+-modernize-use-auto,\
+  
+-modernize-use-default-member-init,\
+  
+-modernize-use-emplace,\
+  
+-modernize-use-equals-default,\
+  
+-modernize-use-equals-delete,\
+  
+-modernize-use-nullptr,\
+  
+-modernize-use-override,\
+  
+-modernize-use-transparent-functors,\
+  
+-performance-for-range-copy,\
+  
+-performance-inefficient-vector-operation,\
+  
+-performance-move-const-arg,\
+  
+-performance-noexcept-move-constructor,\
+  
+-performance-implicit-conversion-in-loop,\
+  
+-performance-inefficient-algorithm,\
+  
+-performance-inefficient-string-concatenation,\
+  
+-performance-type-promotion-in-math-fn,\
+  
+-performance-unnecessary-copy-initialization,\
+  
+-performance-unnecessary-value-param,\
+  
+-readability-avoid-const-params-in-decls,\
+  
+-readability-braces-around-statements,\
+  
+-readability-const-return-type,\
+  
+-readability-else-after-return,\
+  
+-readability-function-size,\
+  
+-readability-implicit-bool-conversion,\
+  
+-readability-inconsistent-declaration-parameter-name,\
+  
+-readability-isolate-declaration,\
+  
+-readability-magic-numbers,\
+  
+-readability-named-parameter,\
+  
+-readability-non-const-parameter,\
+  
+-readability-container-size-empty,\
+  
+-readability-redundant-control-flow,\
+  
+-readability-redundant-declaration,\
+  
+-readability-redundant-member-init,\
+  
+-readability-redundant-preprocessor,\
+  
+-readability-redundant-string-init,\
+  
+-readability-simplify-boolean-expr,\
+  
+-readability-static-accessed-through-instance,\
+  
+"
+  
+WarningsAsErrors: '*'
+  
+HeaderFilterRegex: '(src|test).*'
+  
+FormatStyle:     none
+  
+CheckOptions:
+  
+  - key: readability-uppercase-literal-suffix.NewSuffixes
+  
+    value: 'L;UL;LL;ULL'
+  
+
+  
+# vim:tw=0
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,12 @@
+  
+# EditorConfig is awesome: http://EditorConfig.org
+  
+
+  
+# top-most EditorConfig file
+  
+root = true
+  
+
+  
+# Unix-style newlines with a newline ending every file
+  
+[*]
+  
+end_of_line = lf
+  
+insert_final_newline = true
+  
+# 4 space indentation
+  
+indent_style = space
+  
+indent_size = 4
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,39 @@
+  
+# Automatically normalise line endings for all files
+  
+# detected as text (Convert CRLF => LF).
+  
+*         text=auto
+  
+
+  
+# Explicitly normalise files with these extensions in
+  
+# case Git doesn't detect them as text for some reason.
+  
+*.c       text
+  
+*.cbp     text
+  
+*.cpp     text
+  
+*.h       text
+  
+*.json    text
+  
+*.md      text
+  
+*.py      text
+  
+*.rc      text
+  
+*.sh      text
+  
+*.txt     text
+  
+*.yml     text
+  
+
+  
+# Visual Studio project files, leave them alone.
+  
+*.cmd     -text
+  
+*.filters -text
+  
+*.sln     -text
+  
+*.user    -text
+  
+*.vcxproj -text
+  
+
+  
+# Generated translation text, don't mess with them.
+  
+*.mo      -text
+  
+*.po      -text
+  
+*.pot     -text
+  
+
+  
+# Treat images, archives, and font files as binary.
+  
+# (binary is a macro for -text -diff)
+  
+*.db      binary
+  
+*.fon     binary
+  
+*.gz      binary
+  
+*.ico     binary
+  
+*.png     binary
+  
+*.ttf     binary
+  
+