Spaces Removal

.astylerc

@@ -48,4 +48,3 @@
 
 # insert space padding around parentheses on the inside only
 --pad-paren-in
-

.github/CODEOWNERS

@@ -11,7 +11,7 @@
 /data/mods/blazemod/ @SouP
 /data/mods/classic_zombies/ @I-am-Erk
 /data/mods/crt_expansion/ @Soupster89
-/data/mods/desertpack/ @davidpwbrown 
+/data/mods/desertpack/ @davidpwbrown
 /data/mods/generic_guns/ @tenmillimaster
 /data/mods/Magiclysm/ @KorGgenT
 /data/mods/my_sweet_cataclysm/ @Fris0uman

.github/CONTRIBUTING.md

@@ -138,7 +138,6 @@ For further details about commit message guidelines please visit:
         $ git push origin new_feature
         # origin was automatically set to point to your fork when you cloned it
 
-
 3. Once you're finished working on your branch, and have committed and pushed all your changes, submit a pull request from your `new_feature` branch to this repository's `master` branch.
 
  * Note: any new commits to the `new_feature` branch on GitHub will automatically be included in the pull request, so make sure to only commit related changes to the same branch.
@@ -231,10 +230,10 @@ You can also set the tracking information at the same time as creating the branc
 
 ## Unit tests
 
-There is a suite of tests built into the source tree at tests/  
-You should run the test suite after ANY change to the game source.  
+There is a suite of tests built into the source tree at tests/
+You should run the test suite after ANY change to the game source.
 An ordinary invocation of ``make`` will build the test executable at tests/cata_test, and it can be invoked like any ordinary executable, or via `make check`.
-With no arguments it will run the entire test suite.  
+With no arguments it will run the entire test suite.
 With ``--help`` it will print a number of invocation options you can use to adjust its operation.
 
     $ make

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,21 +9,18 @@ about: Create a report to help us improve
 
 <!-- A clear and concise description of what the bug is. -->
 
-
 # Steps To Reproduce
 
 <!-- Steps to reproduce the behavior:
 1. Make a player with a gun, magazine, and some ammo.
 2. Try to aim at a wall.
 3. There's no way to increase aim level. -->
 
-
 # Expected behavior
 
 <!-- A clear and concise description of what you expected to happen.
 Ideally also describe *why* you expect it to happen. -->
 
-
 # Screenshots
 
 <!-- **If applicable**, add screenshots to help explain your problem.

.github/workflows/ccpp.yml

@@ -12,7 +12,7 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
-    
+
     steps:
     - name: checkout repository
       uses: actions/checkout@v1

.github/workflows/json.yml

@@ -6,9 +6,9 @@ on:
 jobs:
   style-json:
     name: JSON style check
- 
+
     runs-on: ubuntu-latest
-    
+
     steps:
     - uses: actions/checkout@v1
       with:

CMakeLists.txt

@@ -145,7 +145,6 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES Windows)
     ENDIF(NOT BIN_PREFIX)
 ENDIF (${CMAKE_SYSTEM_NAME} MATCHES Windows)
 
-
 MESSAGE(STATUS "${PROJECT_NAME} build options --\n")
 
 # Preset variables
@@ -270,7 +269,7 @@ IF(TILES)
     FIND_PACKAGE(SDL2)
     IF(NOT SDL2_FOUND)
       MESSAGE(FATAL_ERROR
-          "This project requires SDL2 to be installed to be compiled in graphical mode. Please install the SDL2 development libraries, or try compiling 
+          "This project requires SDL2 to be installed to be compiled in graphical mode. Please install the SDL2 development libraries, or try compiling
            without the -DTILES=1 for a text only compilation.\nSee INSTALL file for details and more info\n"
       )
     ENDIF(NOT SDL2_FOUND)

CMakeModules/CMakeParseArguments.cmake

@@ -95,13 +95,11 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-
 if(__CMAKE_PARSE_ARGUMENTS_INCLUDED)
   return()
 endif()
 set(__CMAKE_PARSE_ARGUMENTS_INCLUDED TRUE)
 
-
 function(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgNames)
   # first set all result variables to empty/FALSE
   foreach(arg_name ${_singleArgNames} ${_multiArgNames})

CMakeModules/CheckLibraryExists.cmake

@@ -37,8 +37,6 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-
-
 macro(CHECK_LIBRARY_EXISTS LIBRARY FUNCTION LOCATION VARIABLE)
   if(${VARIABLE} MATCHES "^${VARIABLE}$")
     set(MACRO_CHECK_LIBRARY_EXISTS_DEFINITION

CMakeModules/FindCurses.cmake

@@ -53,7 +53,6 @@ if(CYGWIN)
   endif()
 endif()
 
-
 # Not sure the logic is correct here.
 # If NCurses is required, use the function wsyncup() to check if the library
 # has NCurses functionality (at least this is where it breaks on NetBSD).
@@ -80,7 +79,6 @@ if(CURSES_CURSES_LIBRARY  AND  CURSES_NEED_NCURSES)
 
 endif()
 
-
 if(NOT CURSES_USE_NCURSES)
   find_file(CURSES_HAVE_CURSES_H curses.h )
   find_path(CURSES_CURSES_H_PATH curses.h )

CMakeModules/FindIconv.cmake

@@ -1,22 +1,22 @@
-# - Try to find Iconv 
-# Once done this will define 
-# 
-#  ICONV_FOUND - system has Iconv 
-#  ICONV_INCLUDE_DIR - the Iconv include directory 
-#  ICONV_LIBRARIES - Link these to use Iconv 
+# - Try to find Iconv
+# Once done this will define
+#
+#  ICONV_FOUND - system has Iconv
+#  ICONV_INCLUDE_DIR - the Iconv include directory
+#  ICONV_LIBRARIES - Link these to use Iconv
 #  ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const
-# 
+#
 include(CheckCXXSourceCompiles)
 
 IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
 	# Already in cache, be silent
 	SET(ICONV_FIND_QUIETLY TRUE)
 ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
 
-FIND_PATH(ICONV_INCLUDE_DIR iconv.h) 
- 
+FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
+
 FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
- 
+
 IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
 	SET(ICONV_FOUND TRUE)
 ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
@@ -40,7 +40,7 @@ ENDIF(ICONV_FOUND)
 set(CMAKE_REQUIRED_INCLUDES)
 set(CMAKE_REQUIRED_LIBRARIES)
 
-# handle the QUIETLY and REQUIRED arguments and set CURSES_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set CURSES_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Iconv DEFAULT_MSG

CMakeModules/FindLibintl.cmake

@@ -9,7 +9,7 @@
 # present in libc. Must have more robust system for release, where Gettext
 # functionality can also reside in standalone Gettext library, or the one
 # embedded within kdelibs (cf. gettext.m4 from Gettext source).
- 
+
 # Copyright (c) 2006, Chusslove Illich, <[email protected]>
 # Copyright (c) 2007, Alexander Neundorf, <[email protected]>
 #
@@ -19,11 +19,11 @@
 if(LIBINTL_INCLUDE_DIR AND LIBINTL_LIB_FOUND)
 	set(Libintl_FIND_QUIETLY TRUE)
 endif(LIBINTL_INCLUDE_DIR AND LIBINTL_LIB_FOUND)
- 
+
 find_path(LIBINTL_INCLUDE_DIR libintl.h)
- 
+
 set(LIBINTL_LIB_FOUND FALSE)
- 
+
 if(LIBINTL_INCLUDE_DIR)
 	include(CheckFunctionExists)
 	check_function_exists(dgettext LIBINTL_LIBC_HAS_DGETTEXT)

CMakeModules/FindPackageHandleStandardArgs.cmake

@@ -141,7 +141,6 @@ macro(_FPHSA_FAILURE_MESSAGE _msg)
   endif ()
 endmacro()
 
-
 # internal helper macro to generate the failure message when used in CONFIG_MODE:
 macro(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
   # <name>_CONFIG is set, but FOUND is false, this means that some other of the REQUIRED_VARS was not found:
@@ -171,7 +170,6 @@ macro(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
   endif()
 endmacro()
 
-
 function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
 
 # set up the arguments for CMAKE_PARSE_ARGUMENTS and check whether we are in
@@ -328,7 +326,6 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
     set(${_FOUND_VAR} FALSE)
   endif()
 
-
   # print the result:
   if (${_FOUND_VAR})
     FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG} ${COMPONENT_MSG}" "${DETAILS}")

CODE_OF_CONDUCT.md

@@ -19,7 +19,6 @@ In the interest of fostering an open and welcoming environment, we as contributo
 
 This Code of Conduct is adapted from the [Contributor Covenant][CoC homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][CoC version] and the [GNU Kind Communications Guidelines][GKCG homepage].
 
-
 [CoC homepage]: http://contributor-covenant.org
 [CoC version]: http://contributor-covenant.org/version/1/4/
 [GKCG homepage]: https://www.gnu.org/philosophy/kind-communication.html

LICENSE-OFL-Terminus-Font.txt

@@ -5,7 +5,6 @@ This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at:
 http://scripts.sil.org/OFL
 
-
 -----------------------------------------------------------
 SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
 -----------------------------------------------------------

Makefile

@@ -333,7 +333,7 @@ ifeq ($(RELEASE), 1)
 
   # OTHERS += -mmmx -m3dnow -msse -msse2 -msse3 -mfpmath=sse -mtune=native
   # OTHERS += -march=native # Uncomment this to build an optimized binary for your machine only
-  
+
   # Strip symbols, generates smaller executable.
   OTHERS += $(RELEASE_FLAGS)
   DEBUG =
@@ -386,7 +386,6 @@ W32BINDIST = $(BUILD_PREFIX)cataclysmdda-$(VERSION).zip
 BINDIST_CMD    = tar --transform=s@^$(BINDIST_DIR)@cataclysmdda-$(VERSION)@ -czvf $(BINDIST) $(BINDIST_DIR)
 W32BINDIST_CMD = cd $(BINDIST_DIR) && zip -r ../$(W32BINDIST) * && cd $(BUILD_DIR)
 
-
 # Check if called without a special build target
 ifeq ($(NATIVE),)
   ifeq ($(CROSS),)
@@ -960,7 +959,6 @@ ifdef LANGUAGES
 endif
 endif
 
-
 ifeq ($(NATIVE), osx)
 APPTARGETDIR=Cataclysm.app
 APPRESOURCESDIR=$(APPTARGETDIR)/Contents/Resources

android/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java

@@ -429,7 +429,7 @@ public void run() {
                     }
                 });
             }
-        } 
+        }
         else if (newState == 0) {
             mIsConnected = false;
         }

android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java

@@ -121,7 +121,7 @@ public void onClick(DialogInterface dialog, int which) {
                         // If our context is an activity, exit rather than crashing when we can't
                         // call our native functions.
                         Activity activity = (Activity)context;
-        
+
                         activity.finish();
                     }
                     catch (ClassCastException cce) {
@@ -133,7 +133,7 @@ public void onClick(DialogInterface dialog, int which) {
 
             return;
         }
-        
+
         HIDDeviceRegisterCallback();
 
         mSharedPreferences = mContext.getSharedPreferences("hidapi", Context.MODE_PRIVATE);
@@ -199,7 +199,7 @@ private void initializeUSB() {
                 Log.i(TAG,"  Interface protocol: " + mUsbInterface.getInterfaceProtocol());
                 Log.i(TAG,"  Endpoint count: " + mUsbInterface.getEndpointCount());
 
-                // Get endpoint details 
+                // Get endpoint details
                 for (int epi = 0; epi < mUsbInterface.getEndpointCount(); epi++)
                 {
                     UsbEndpoint mEndpoint = mUsbInterface.getEndpoint(epi);
@@ -533,7 +533,7 @@ public void setFrozen(boolean frozen) {
             for (HIDDevice device : mDevicesById.values()) {
                 device.setFrozen(frozen);
             }
-        }        
+        }
     }
 
     //////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -651,7 +651,6 @@ public void closeDevice(int deviceID) {
         }
     }
 
-
     //////////////////////////////////////////////////////////////////////////////////////////////////////
     /////////////// Native methods
     //////////////////////////////////////////////////////////////////////////////////////////////////////

android/app/src/main/java/org/libsdl/app/SDL.java

@@ -42,21 +42,21 @@ public static void loadLibrary(String libraryName) throws UnsatisfiedLinkError,
         }
 
         try {
-            // Let's see if we have ReLinker available in the project.  This is necessary for 
-            // some projects that have huge numbers of local libraries bundled, and thus may 
+            // Let's see if we have ReLinker available in the project.  This is necessary for
+            // some projects that have huge numbers of local libraries bundled, and thus may
             // trip a bug in Android's native library loader which ReLinker works around.  (If
             // loadLibrary works properly, ReLinker will simply use the normal Android method
             // internally.)
             //
-            // To use ReLinker, just add it as a dependency.  For more information, see 
+            // To use ReLinker, just add it as a dependency.  For more information, see
             // https://github.com/KeepSafe/ReLinker for ReLinker's repository.
             //
             Class relinkClass = mContext.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker");
             Class relinkListenerClass = mContext.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker$LoadListener");
             Class contextClass = mContext.getClassLoader().loadClass("android.content.Context");
             Class stringClass = mContext.getClassLoader().loadClass("java.lang.String");
 
-            // Get a 'force' instance of the ReLinker, so we can ensure libraries are reinstalled if 
+            // Get a 'force' instance of the ReLinker, so we can ensure libraries are reinstalled if
             // they've changed during updates.
             Method forceMethod = relinkClass.getDeclaredMethod("force");
             Object relinkInstance = forceMethod.invoke(null);
@@ -77,7 +77,7 @@ public static void loadLibrary(String libraryName) throws UnsatisfiedLinkError,
             catch (final SecurityException se) {
                 throw se;
             }
-        }        
+        }
     }
 
     protected static Context mContext;

android/app/src/main/java/org/libsdl/app/SDLActivity.java

@@ -1687,7 +1687,6 @@ public void run() {
     }
 }
 
-
 /**
     SDLSurface. This is what we draw on, so we need to know when it's created
     in order to do anything useful.
@@ -2101,7 +2100,6 @@ public void onSensorChanged(SensorEvent event) {
                                       y / SensorManager.GRAVITY_EARTH,
                                       event.values[2] / SensorManager.GRAVITY_EARTH);
 
-
         }
     }
 
@@ -2242,7 +2240,6 @@ public boolean sendKeyEvent(KeyEvent event) {
             }
         }
 
-
         return super.sendKeyEvent(event);
     }
 
@@ -2305,7 +2302,6 @@ interface SDLClipboardHandler {
 
 }
 
-
 class SDLClipboardHandler_API11 implements
     SDLClipboardHandler,
     android.content.ClipboardManager.OnPrimaryClipChangedListener {