Tab cleanup pt2

This commit is contained in:
Antz 2021-03-06 08:10:49 +00:00
parent 4421496edd
commit 2a9c1867df
11 changed files with 212 additions and 212 deletions

24
.gitmodules vendored
View File

@ -1,18 +1,18 @@
[submodule "dep"]
path = dep
url = https://github.com/mangos/mangosDeps
path = dep
url = https://github.com/mangos/mangosDeps
[submodule "src/realmd"]
path = src/realmd
url = https://github.com/mangos/realmd
path = src/realmd
url = https://github.com/mangos/realmd
[submodule "src/modules/Eluna"]
path = src/modules/Eluna
url = https://github.com/MangosServer/Eluna.git
path = src/modules/Eluna
url = https://github.com/MangosServer/Eluna.git
[submodule "src/modules/SD3"]
path = src/modules/SD3
url = https://github.com/mangos/ScriptDev3.git
path = src/modules/SD3
url = https://github.com/mangos/ScriptDev3.git
[submodule "src/tools/Extractor_projects"]
path = src/tools/Extractor_projects
url = https://github.com/mangos/Extractor_projects.git
path = src/tools/Extractor_projects
url = https://github.com/mangos/Extractor_projects.git
[submodule "win"]
path = win
url = https://github.com/mangostools/EasyBuild
path = win
url = https://github.com/mangostools/EasyBuild

View File

@ -119,14 +119,14 @@ endif ()
# GCC compiler options
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
set(DEFAULT_COMPILE_OPTS ${DEFAULT_COMPILE_OPTS}
# Enhanced 32-bit check, now we can use the arch to specify flags
$<$<STREQUAL:${CMAKE_OSX_ARCHITECTURES},"i386">:
# Enhanced 32-bit check, now we can use the arch to specify flags
$<$<STREQUAL:${CMAKE_OSX_ARCHITECTURES},"i386">:
-msse2
-mfpmath=sse
>
$<$<STREQUAL:${CMAKE_OSX_ARCHITECTURES},"ARM32">:
# explicit space for compiler flags
>
$<$<STREQUAL:${CMAKE_OSX_ARCHITECTURES},"ARM32">:
# explicit space for compiler flags
>
$<$<STREQUAL:${CMAKE_OSX_ARCHITECTURES},"ARM64">:
# explicit space for compiler flags
>
@ -142,9 +142,9 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
$<$<CONFIG:Release>:
--no-warnings
# Suppress compiler note on parameter passing. See the following
# GCC BZ for more info: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77728
-Wno-psabi
# Suppress compiler note on parameter passing. See the following
# GCC BZ for more info: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77728
-Wno-psabi
>
)
endif ()

2
dep

@ -1 +1 @@
Subproject commit d00434acaab2a257f410079afcc6d600ca954557
Subproject commit b312aef454508d5ff9bbd3a3de6a93bc56dd3598

View File

@ -17,9 +17,9 @@ please split it. If it's just a little longer, so be it. The continuation text,
if you're splitting text inside the brackets, should be indented to the position
after the opening bracket:
printf("This is a example of how we split lines longer than %d characters\n"
"into several so that they won't exceed this limit.\n",
max_sourcecode_width);
printf("This is a example of how we split lines longer than %d characters\n"
"into several so that they won't exceed this limit.\n",
max_sourcecode_width);
If you have long strings, you can split them as shown above, just remember that
C/C++ compilers will glue together several strings that come without any special
@ -29,31 +29,31 @@ Brackets
--------
Now we use symmetric bracket placement, closing bracket under the opening bracket:
if (something)
{
...;
}
else
{
...;
}
if (something)
{
...;
}
else
{
...;
}
switch (x)
{
case 1:
printf("X is one!\n");
break;
case 2:
{
printf("X is two!\n");
break;
}
}
switch (x)
{
case 1:
printf("X is one!\n");
break;
case 2:
{
printf("X is two!\n");
break;
}
}
for (int i = 1; i < 3; ++i)
{
printf("I is %i!\n", i);
}
for (int i = 1; i < 3; ++i)
{
printf("I is %i!\n", i);
}
Every bracketed block moves its contents by one tab to right. Labels (but not case
selectors or 'public:/private:/protected' C++ keywords) are placed at the leftmost
@ -64,13 +64,13 @@ Also please don't use brackets around a single statement because it clutters the
code with unneeded stuff; use brackets only when using non-obvious constructs,
like:
if (...)
{
if (...)
...;
}
else
...;
if (...)
{
if (...)
...;
}
else
...;
Also, please place one space before opening parenthesis. Before, but not after
(the `if ( blah )` style is a no-no!).
@ -79,20 +79,20 @@ Class declaration and constructors
----------------------------------
Here is an example:
class Class : public Parent
{
public:
Class() : Parent(0),
m_field(1)
{
func();
}
class Class : public Parent
{
public:
Class() : Parent(0),
m_field(1)
{
func();
}
void func() {}
void func() {}
private:
int m_field;
};
private:
int m_field;
};
Please follow the following rules for classes:
@ -113,35 +113,35 @@ instead, multi-line comments should be put in a `/** ... */` block (slash-two-st
Here's a example that shows most useful keywords that you can use in a comment block:
/**
* This function does something very useful. If used with care, this function
* has the potential to make your programs really really useful.
*
* \arg \c x
* The x argument specifies a integer that is transformed into something useful.
* \arg \c y
* This argument, if not NULL, is a pointer to a free memory area where this
* function will put something really really useful.
* \return
* A useful value, or NULL if error.
*
* Here is a example that you can paste into your code so that it saves you a
* lot of typing:
*
* \verb atim (Remove the space)
* for (int x = 0; x < 100; ++x)
* printf("DoSomethingUseful%d = %s\n", i,
* DoSomethingUseful(i, &ScratchPad));
* \endve rbatim (Remove the space)
*
* Paragraphs are split from each other by inserting a empty line. Also some HTML
* tags are supported, like <ol> [<li>...] </ol> and <ul> [<li>...] </ul> for
* ordered (numbered) and unordered (dotted) lists respectively.
*/
char *DoSomethingUseful(int x, void *y);
/**
* This function does something very useful. If used with care, this function
* has the potential to make your programs really really useful.
*
* \arg \c x
* The x argument specifies a integer that is transformed into something useful.
* \arg \c y
* This argument, if not NULL, is a pointer to a free memory area where this
* function will put something really really useful.
* \return
* A useful value, or NULL if error.
*
* Here is a example that you can paste into your code so that it saves you a
* lot of typing:
*
* \verb atim (Remove the space)
* for (int x = 0; x < 100; ++x)
* printf("DoSomethingUseful%d = %s\n", i,
* DoSomethingUseful(i, &ScratchPad));
* \endve rbatim (Remove the space)
*
* Paragraphs are split from each other by inserting a empty line. Also some HTML
* tags are supported, like <ol> [<li>...] </ol> and <ul> [<li>...] </ul> for
* ordered (numbered) and unordered (dotted) lists respectively.
*/
char *DoSomethingUseful(int x, void *y);
/// This is a one-line comment
void Something();
/// This is a one-line comment
void Something();
Use normal comments like `//` and `/* ... */` only if you want to make a comment
that should not go into the automatically annotated code (like:

View File

@ -673,9 +673,9 @@ INPUT = @TOP_SRCDIR@/src/shared/ \
@TOP_SRCDIR@/src/realmd/ \
@TOP_SRCDIR@/src/mangosd/ \
@TOP_SRCDIR@/doc/DocStructure.dox \
@TOP_SRCDIR@/doc/CallForExamples.md \
@TOP_SRCDIR@/doc/Spell.md \
@TOP_SRCDIR@/doc/CodingStandard.md
@TOP_SRCDIR@/doc/CallForExamples.md \
@TOP_SRCDIR@/doc/Spell.md \
@TOP_SRCDIR@/doc/CodingStandard.md
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

View File

@ -42,11 +42,11 @@ CMAKE_CMD="cmake"
function UseCmake3()
{
# set the command to cmake3 if its there
which cmake3
if [ $? -eq 0 ]; then
CMAKE_CMD="cmake3"
fi
# set the command to cmake3 if its there
which cmake3
if [ $? -eq 0 ]; then
CMAKE_CMD="cmake3"
fi
}
# Function to test for dialog
@ -65,10 +65,10 @@ function UseDialog()
function CheckRoot()
{
if [ "$(id -u)" != "0" ]; then
Log "This script can only be used as root!" 1
exit 1
Log "This script can only be used as root!" 1
exit 1
else
Log "User is root, check passed" 0
Log "User is root, check passed" 0
fi
}
@ -140,7 +140,7 @@ function GetPrerequisites()
else
installer=1
# On a fresh OS boot (EC2) libace was not found without first updating
apt-get update -y && apt-get -y install git lsb-release curl
apt-get update -y && apt-get -y install git lsb-release curl
fi
which yum
@ -148,8 +148,8 @@ function GetPrerequisites()
if [ $? -ne 0 ]; then
Log "yum isn't the installer by default" 1
else
installer=1
yum -y install git redhat-lsb curl
installer=1
yum -y install git redhat-lsb curl
fi
which aptitude
@ -157,7 +157,7 @@ function GetPrerequisites()
Log "aptitude isn't the installer by default" 1
else
installer=1
aptitude -y install git lsb-release curl
aptitude -y install git lsb-release curl
fi
# Then, let's check that we have the necessary tools to define the OS version.
@ -247,22 +247,22 @@ function GetPrerequisites()
# Ubuntu 16.10
su -c "apt-get -y install build-essential curl autoconf automake cmake libbz2-dev libace-dev libssl-dev libmysqlclient-dev libtool" root
;;
"zesty")
# Ubuntu 17.04
su -c "apt-get -y install build-essential curl autoconf automake cmake libbz2-dev libace-dev libssl-dev libmysqlclient-dev libtool" root
;;
"artful")
# Ubuntu 17.10
su -c "apt-get -y install build-essential curl autoconf automake cmake libbz2-dev libace-dev libssl-dev libmysqlclient-dev libtool" root
;;
"zesty")
# Ubuntu 17.04
su -c "apt-get -y install build-essential curl autoconf automake cmake libbz2-dev libace-dev libssl-dev libmysqlclient-dev libtool" root
;;
"artful")
# Ubuntu 17.10
su -c "apt-get -y install build-essential curl autoconf automake cmake libbz2-dev libace-dev libssl-dev libmysqlclient-dev libtool" root
;;
"bionic")
# Ubuntu 18.04 LTS
su -c "apt-get -y install build-essential curl autoconf automake cmake libbz2-dev libace-dev libssl-dev libmysqlclient-dev libtool" root
;;
# Ubuntu 18.04 LTS
su -c "apt-get -y install build-essential curl autoconf automake cmake libbz2-dev libace-dev libssl-dev libmysqlclient-dev libtool" root
;;
"disco")
# Ubuntu 19.04
su -c "apt-get -y install build-essential curl autoconf automake cmake libbz2-dev libace-dev libssl-dev libmysqlclient-dev libtool" root
;;
# Ubuntu 19.04
su -c "apt-get -y install build-essential curl autoconf automake cmake libbz2-dev libace-dev libssl-dev libmysqlclient-dev libtool" root
;;
*)
OS_VER=0
;;
@ -298,16 +298,16 @@ function GetPrerequisites()
;;
esac
;;
"CentOS")
"CentOS")
case ${VER} in
"Core")
# Default CentOS - Adding necessary RPM third-party.
rpm -Uv ftp://ftp.pbone.net/mirror/ftp5.gwdg.de/pub/opensuse/repositories/devel:/libraries:/ACE:/micro/CentOS_7/x86_64/ace-6.3.3-55.1.x86_64.rpm
rpm -Uv ftp://rpmfind.net/linux/centos/7/os/x86_64/Packages/perl-Net-Telnet-3.03-19.el7.noarch.rpm
rpm -Uv ftp://ftp.pbone.net/mirror/ftp5.gwdg.de/pub/opensuse/repositories/devel:/libraries:/ACE:/micro:/versioned/CentOS_7/x86_64/mpc-6.3.3-42.1.x86_64.rpm
rpm -Uv ftp://rpmfind.net/linux/centos/7/os/x86_64/Packages/libtool-2.4.2-22.el7_3.x86_64.rpm
rpm -Uv ftp://ftp.pbone.net/mirror/ftp5.gwdg.de/pub/opensuse/repositories/devel:/libraries:/ACE:/micro/CentOS_7/x86_64/ace-devel-6.3.3-55.1.x86_64.rpm
su -c "yum -y install epel-release"
rpm -Uv ftp://ftp.pbone.net/mirror/ftp5.gwdg.de/pub/opensuse/repositories/devel:/libraries:/ACE:/micro/CentOS_7/x86_64/ace-6.3.3-55.1.x86_64.rpm
rpm -Uv ftp://rpmfind.net/linux/centos/7/os/x86_64/Packages/perl-Net-Telnet-3.03-19.el7.noarch.rpm
rpm -Uv ftp://ftp.pbone.net/mirror/ftp5.gwdg.de/pub/opensuse/repositories/devel:/libraries:/ACE:/micro:/versioned/CentOS_7/x86_64/mpc-6.3.3-42.1.x86_64.rpm
rpm -Uv ftp://rpmfind.net/linux/centos/7/os/x86_64/Packages/libtool-2.4.2-22.el7_3.x86_64.rpm
rpm -Uv ftp://ftp.pbone.net/mirror/ftp5.gwdg.de/pub/opensuse/repositories/devel:/libraries:/ACE:/micro/CentOS_7/x86_64/ace-devel-6.3.3-55.1.x86_64.rpm
su -c "yum -y install epel-release"
su -c "yum -y install curl autoconf automake cmake3 ace-devel ace-6.3.3 openssl-devel mysql-devel libtool gcc-c++" root
;;
*)
@ -319,22 +319,22 @@ function GetPrerequisites()
case ${VER} in
"TwentyFive")
# Fedora 25 - Adding necessary RPM third-party.
su -c "yum -y install autoconf automake libtool gcc-c++" root
# Getting and building ACE. Not provided in RPM for Fedora...
rm -rf ACE-6.3.3.tar.bz2
rm -rf ACE_wrappers
wget ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.3.3.tar.bz2
tar xjvf ACE-6.3.3.tar.bz2
export ACE_ROOT=/root/ACE_wrappers
echo '#include "ace/config-linux.h"' >> $ACE_ROOT/ace/config.h
echo 'include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU' >> $ACE_ROOT/include/makeinclude/platform_macros.GNU
echo 'INSTALL_PREFIX=/usr/local' >> $ACE_ROOT/include/makeinclude/platform_macros.GNU
export LD_LIBRARY_PATH=$ACE_ROOT/lib:$LD_LIBRARY_PATH
CD $ACE_ROOT
make
make install
cd ~
# Installing remaining dependencies..
su -c "yum -y install autoconf automake libtool gcc-c++" root
# Getting and building ACE. Not provided in RPM for Fedora...
rm -rf ACE-6.3.3.tar.bz2
rm -rf ACE_wrappers
wget ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.3.3.tar.bz2
tar xjvf ACE-6.3.3.tar.bz2
export ACE_ROOT=/root/ACE_wrappers
echo '#include "ace/config-linux.h"' >> $ACE_ROOT/ace/config.h
echo 'include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU' >> $ACE_ROOT/include/makeinclude/platform_macros.GNU
echo 'INSTALL_PREFIX=/usr/local' >> $ACE_ROOT/include/makeinclude/platform_macros.GNU
export LD_LIBRARY_PATH=$ACE_ROOT/lib:$LD_LIBRARY_PATH
CD $ACE_ROOT
make
make install
cd ~
# Installing remaining dependencies..
su -c "yum -y install cmake openssl-devel mariadb-devel" root
;;
*)
@ -342,7 +342,7 @@ function GetPrerequisites()
;;
esac
;;
*)
*)
OS_VER=0
;;
esac
@ -455,7 +455,7 @@ function GetUser()
exit 1
fi
usermod -L $USER > /dev/null 2>&1
usermod -L $USER > /dev/null 2>&1
else
# User already exist, asking to keep the user
$DLGAPP --backtitle "MaNGOS Linux Build Configuration" --title "User already exist" \
@ -473,7 +473,7 @@ function GetUser()
exit 1
fi
usermod -L $USER > /dev/null 2>&1
usermod -L $USER > /dev/null 2>&1
fi
fi
@ -952,10 +952,10 @@ function UpdateDatabases()
# Notify the user of which updates were and were not applied
if [ $? -ne 0 ]; then
Log "Database update \"$pFile\" was not applied!" 0
Log "Database update \"$pFile\" was not applied!" 1
Log "Database update \"$pFile\" was not applied!" 1
else
Log "Database update \"$pFile\" was successfully applied!" 0
Log "Database update \"$pFile\" was successfully applied!" 1
Log "Database update \"$pFile\" was successfully applied!" 1
fi
done
@ -970,10 +970,10 @@ function UpdateDatabases()
# Notify the user of which updates were and were not applied
if [ $? -ne 0 ]; then
Log "Database update \"$pFile\" was not applied!" 0
Log "Database update \"$pFile\" was not applied!" 1
Log "Database update \"$pFile\" was not applied!" 1
else
Log "Database update \"$pFile\" was successfully applied!" 0
Log "Database update \"$pFile\" was successfully applied!" 1
Log "Database update \"$pFile\" was successfully applied!" 1
fi
done
@ -988,10 +988,10 @@ function UpdateDatabases()
# Notify the user of which updates were and were not applied
if [ $? -ne 0 ]; then
Log "Database update \"$pFile\" was not applied!" 0
Log "Database update \"$pFile\" was not applied!" 1
Log "Database update \"$pFile\" was not applied!" 1
else
Log "Database update \"$pFile\" was successfully applied!" 0
Log "Database update \"$pFile\" was successfully applied!" 1
Log "Database update \"$pFile\" was successfully applied!" 1
fi
done
}
@ -1050,8 +1050,8 @@ function InstallDatabases()
if [ $? -ne 0 ]; then
Log "There was an error processing \"$fFile\" during database creation!" 1
return 1
else
Log "The file \"$fFile\" was processed properly" 1
else
Log "The file \"$fFile\" was processed properly" 1
fi
done
@ -1105,8 +1105,8 @@ function HandleDatabases()
# Exit if cancelled
if [ $? -ne 0 ]; then
Log "Database type selection cancelled. No modifications have been made to your databases." 1
return 0
Log "Database type selection cancelled. No modifications have been made to your databases." 1
return 0
fi
# Get the database hostname or IP address
@ -1170,18 +1170,18 @@ function HandleDatabases()
fi
case "${DB_TYPE}" in
"0")
DB_COMMAND="mysql -u ${DB_USER} -p${DB_UPW} "
;;
"1")
printf "Confirm your MySQL password\t, "
mysql_config_editor set --login-path=local --host=$DB_HOST --port=$DB_PORT --user=$DB_USER --password --skip-warn
DB_COMMAND="mysql --login-path=local -q -s "
;;
"2")
Log "Currently not supported." 1
return 0
;;
"0")
DB_COMMAND="mysql -u ${DB_USER} -p${DB_UPW} "
;;
"1")
printf "Confirm your MySQL password\t, "
mysql_config_editor set --login-path=local --host=$DB_HOST --port=$DB_PORT --user=$DB_USER --password --skip-warn
DB_COMMAND="mysql --login-path=local -q -s "
;;
"2")
Log "Currently not supported." 1
return 0
;;
esac
# Setup database names based on release
@ -1315,17 +1315,17 @@ function ExtractResources
cp -R "$GAMEPATH/maps" "$INSTPATH/bin"
fi
else
rm -rf "$GAMEPATH/map-extractor"
cp "$INSTPATH/bin/tools/map-extractor" "$GAMEPATH"
rm -rf "$GAMEPATH/map-extractor"
cp "$INSTPATH/bin/tools/map-extractor" "$GAMEPATH"
Log "Extracting DBC and Maps" 0
cd "$GAMEPATH"
./map-extractor
Log "Extracting DBC and Maps" 0
cd "$GAMEPATH"
./map-extractor
if [ $? -eq 0 ]; then
Log "DBC and Maps are extracted" 0
Log "Copying DBC and Maps files to installation directory" 0
cp -R "$GAMEPATH/dbc" "$INSTPATH/bin"
if [ $? -eq 0 ]; then
Log "DBC and Maps are extracted" 0
Log "Copying DBC and Maps files to installation directory" 0
cp -R "$GAMEPATH/dbc" "$INSTPATH/bin"
cp -R "$GAMEPATH/maps" "$INSTPATH/bin"
rm -rf "$GAMEPATH/map-extractor"
Log "Changing ownership of the extracted directories"
@ -1474,13 +1474,13 @@ function ExtractResources
cp -R "$GAMEPATH/mmaps" "$INSTPATH/bin"
fi
else
Log "Copying MMaps extractor" 0
Log "Copying MMaps extractor" 0
rm -f "$GAMEPATH/MoveMapGen.sh"
cp "$INSTPATH/bin/tools/MoveMapGen.sh" "$GAMEPATH"
cp "$INSTPATH/bin/tools/offmesh.txt" "$GAMEPATH"
cp "$INSTPATH/bin/tools/mmap_excluded.txt" "$GAMEPATH"
cp "$INSTPATH/bin/tools/mmap-extractor" "$GAMEPATH"
CPU=$($DLGAPP --backtitle "MaNGOS Linux Build Configuration" --title "Please provide the number of CPU to be used to generate MMaps (1-4)" \
CPU=$($DLGAPP --backtitle "MaNGOS Linux Build Configuration" --title "Please provide the number of CPU to be used to generate MMaps (1-4)" \
--inputbox "Default: 1" 8 80 3>&2 2>&1 1>&3)
# User cancelled his choice, set default to 1.
@ -1516,7 +1516,7 @@ function ExtractResources
Log "Changing ownership of the extracted directories"
chown -R $USER:$USER "$INSTPATH"
else
Log "There was an issue while extracting MMaps!" 1
Log "There was an issue while extracting MMaps!" 1
rm -rf "$GAMEPATH/MoveMapGen.sh"
rm -rf "$GAMEPATH/mmaps"
rm -rf "$GAMEPATH/offmesh.txt"

View File

@ -1163,10 +1163,10 @@ Channel.SilentlyGMJoin = 0
# A spell that will be cast when a gm uses ".gm visible off" (Must be aura spell)
# Default: 31748 (Spirit Particles, big)
# 0 (Disabled)
# GM.MaxSpeedFactor
# Set the max speed factor whend using commands .mod speed / .mod aspeed etc...
# Only Integer values
# Default: 10
# GM.MaxSpeedFactor
# Set the max speed factor whend using commands .mod speed / .mod aspeed etc...
# Only Integer values
# Default: 10
#
################################################################################
@ -1183,7 +1183,7 @@ GM.LogTrade = 1
GM.StartLevel = 1
GM.LowerSecurity = 0
GM.InvisibleAura = 31748
GM.MaxSpeedFactor = 10
GM.MaxSpeedFactor = 10
################################################################################
# VISIBILITY AND RADIUSES

View File

@ -590,13 +590,13 @@ add_library(Bots STATIC ${BOT_SRCS})
target_include_directories(BotsIntf
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/playerbot
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/playerbot
)
target_link_libraries(Bots
PUBLIC
game
game
)
# Install config files

@ -1 +1 @@
Subproject commit 05deb83411e8cf1b3c74ad08f25a4e9e717c07d9
Subproject commit d3a68a29ef30e18953223ad8bc6337a60a2b7bf7

View File

@ -214,23 +214,23 @@ createSummary()
"2" )
echo "2 CPUs selected:"
echo "==============="
echo " CPU 1: Maps: $MAP_Continent2 $MAP_Medium1 $MAP_Medium2 $MAP_Medium3 $MAP_Small1 $MAP_Small2 $MAP_Small3 $MAP_Small4 $MAP_Small5 $MAP_Small6 $MAP_Small7 $MAP_Small8 $MAP_Small9 $MAP_Small10"
echo " CPU 2: Maps: $MAP_Continent1 $MAP_Big1 $MAP_Big2 $MAP_Big3 $MAP_Big4 $MAP_Big5 $MAP_Big6 $MAP_Medium4 $MAP_Medium5 $MAP_Medium6 $MAP_Medium7 $MAP_Medium8 $MAP_Medium9 $MAP_Small11 $MAP_Small12 $MAP_Small13 $MAP_Small14 $MAP_Small15 $MAP_Small16 $MAP_Small17 $MAP_Small18 $MAP_Small19"
echo " CPU 1: Maps: $MAP_Continent2 $MAP_Medium1 $MAP_Medium2 $MAP_Medium3 $MAP_Small1 $MAP_Small2 $MAP_Small3 $MAP_Small4 $MAP_Small5 $MAP_Small6 $MAP_Small7 $MAP_Small8 $MAP_Small9 $MAP_Small10"
echo " CPU 2: Maps: $MAP_Continent1 $MAP_Big1 $MAP_Big2 $MAP_Big3 $MAP_Big4 $MAP_Big5 $MAP_Big6 $MAP_Medium4 $MAP_Medium5 $MAP_Medium6 $MAP_Medium7 $MAP_Medium8 $MAP_Medium9 $MAP_Small11 $MAP_Small12 $MAP_Small13 $MAP_Small14 $MAP_Small15 $MAP_Small16 $MAP_Small17 $MAP_Small18 $MAP_Small19"
;;
"3" )
echo "3 CPUs selected:"
echo "==============="
echo " CPU 1: Maps: $MAP_Continent1"
echo " CPU 2: Maps: $MAP_Continent2"
echo " CPU 3: Maps: $MAP_Big1 $MAP_Big2 $MAP_Big3 $MAP_Big4 $MAP_Big5 $MAP_Big6 $MAP_Medium1 $MAP_Medium2 $MAP_Medium3 $MAP_Medium4 $MAP_Medium5 $MAP_Medium6 $MAP_Medium7 $MAP_Medium8 $MAP_Medium9 $MAP_Small1 $MAP_Small2 $MAP_Small3 $MAP_Small4 $MAP_Small5 $MAP_Small6 $MAP_Small7 $MAP_Small8 $MAP_Small9 $MAP_Small10 $MAP_Small11 $MAP_Small12 $MAP_Small13 $MAP_Small14 $MAP_Small15 $MAP_Small16 $MAP_Small17 $MAP_Small18 $MAP_LIST_Junk1 $MAP_LIST_Junk2 $MAP_LIST_Junk3 $MAP_LIST_Junk4 $MAP_LIST_Junk5 $MAP_LIST_Junk6 $MAP_LIST_Junk7 $MAP_LIST_Junk8 $MAP_LIST_Junk9"
echo " CPU 1: Maps: $MAP_Continent1"
echo " CPU 2: Maps: $MAP_Continent2"
echo " CPU 3: Maps: $MAP_Big1 $MAP_Big2 $MAP_Big3 $MAP_Big4 $MAP_Big5 $MAP_Big6 $MAP_Medium1 $MAP_Medium2 $MAP_Medium3 $MAP_Medium4 $MAP_Medium5 $MAP_Medium6 $MAP_Medium7 $MAP_Medium8 $MAP_Medium9 $MAP_Small1 $MAP_Small2 $MAP_Small3 $MAP_Small4 $MAP_Small5 $MAP_Small6 $MAP_Small7 $MAP_Small8 $MAP_Small9 $MAP_Small10 $MAP_Small11 $MAP_Small12 $MAP_Small13 $MAP_Small14 $MAP_Small15 $MAP_Small16 $MAP_Small17 $MAP_Small18 $MAP_LIST_Junk1 $MAP_LIST_Junk2 $MAP_LIST_Junk3 $MAP_LIST_Junk4 $MAP_LIST_Junk5 $MAP_LIST_Junk6 $MAP_LIST_Junk7 $MAP_LIST_Junk8 $MAP_LIST_Junk9"
;;
"4" )
echo "4 CPUs selected:"
echo "==============="
echo " CPU 1: Maps: $MAP_Continent1"
echo " CPU 2: Maps: $MAP_Continent2"
echo " CPU 3: Maps: $MAP_Big1 $MAP_Big2 $MAP_Big3 $MAP_Big4 $MAP_Big5 $MAP_Big6 $MAP_Medium1 $MAP_Medium2 $MAP_Medium3 $MAP_Medium4 $MAP_Medium5 $MAP_Medium6 $MAP_Medium7 $MAP_Medium8 $MAP_Medium9 $MAP_Small1 $MAP_Small2 $MAP_Small3 $MAP_Small4 $MAP_Small5 $MAP_Small6 $MAP_Small7 $MAP_Small8 $MAP_Small9 $MAP_Small10 $MAP_Small11 $MAP_Small12 $MAP_Small13 $MAP_Small14 $MAP_Small15 $MAP_Small16 $MAP_Small17 $MAP_Small18 $MAP_LIST_Junk1 $MAP_LIST_Junk2 $MAP_LIST_Junk3 $MAP_LIST_Junk4 $MAP_LIST_Junk5 $MAP_LIST_Junk6 $MAP_LIST_Junk7 $MAP_LIST_Junk8 $MAP_LIST_Junk9"
echo " CPU 4: Maps: $MAP_Medium1 $MAP_Medium2 $MAP_Medium3 $MAP_Small1 $MAP_Small2 $MAP_Small3 $MAP_Small4 $MAP_Small5 $MAP_Small6 $MAP_Small7 $MAP_Small8 $MAP_Small9 $MAP_Big5 $MAP_Big6 $MAP_Medium4 $MAP_Medium5 $MAP_Medium7 $MAP_Medium8 $MAP_Medium9 $MAP_Small11 $MAP_LIST_Junk3 $MAP_LIST_Junk4 $MAP_LIST_Junk5 $MAP_LIST_Junk6 $MAP_Small12 $MAP_LIST_Junk7 $MAP_Small13 $MAP_Small14 $MAP_Small15 $MAP_Small16 $MAP_Small17 $MAP_Small18 $MAP_Small19 $MAP_LIST_Junk8 $MAP_LIST_Junk9"
echo " CPU 1: Maps: $MAP_Continent1"
echo " CPU 2: Maps: $MAP_Continent2"
echo " CPU 3: Maps: $MAP_Big1 $MAP_Big2 $MAP_Big3 $MAP_Big4 $MAP_Big5 $MAP_Big6 $MAP_Medium1 $MAP_Medium2 $MAP_Medium3 $MAP_Medium4 $MAP_Medium5 $MAP_Medium6 $MAP_Medium7 $MAP_Medium8 $MAP_Medium9 $MAP_Small1 $MAP_Small2 $MAP_Small3 $MAP_Small4 $MAP_Small5 $MAP_Small6 $MAP_Small7 $MAP_Small8 $MAP_Small9 $MAP_Small10 $MAP_Small11 $MAP_Small12 $MAP_Small13 $MAP_Small14 $MAP_Small15 $MAP_Small16 $MAP_Small17 $MAP_Small18 $MAP_LIST_Junk1 $MAP_LIST_Junk2 $MAP_LIST_Junk3 $MAP_LIST_Junk4 $MAP_LIST_Junk5 $MAP_LIST_Junk6 $MAP_LIST_Junk7 $MAP_LIST_Junk8 $MAP_LIST_Junk9"
echo " CPU 4: Maps: $MAP_Medium1 $MAP_Medium2 $MAP_Medium3 $MAP_Small1 $MAP_Small2 $MAP_Small3 $MAP_Small4 $MAP_Small5 $MAP_Small6 $MAP_Small7 $MAP_Small8 $MAP_Small9 $MAP_Big5 $MAP_Big6 $MAP_Medium4 $MAP_Medium5 $MAP_Medium7 $MAP_Medium8 $MAP_Medium9 $MAP_Small11 $MAP_LIST_Junk3 $MAP_LIST_Junk4 $MAP_LIST_Junk5 $MAP_LIST_Junk6 $MAP_Small12 $MAP_LIST_Junk7 $MAP_Small13 $MAP_Small14 $MAP_Small15 $MAP_Small16 $MAP_Small17 $MAP_Small18 $MAP_Small19 $MAP_LIST_Junk8 $MAP_LIST_Junk9"
;;
* )
badParam
@ -253,28 +253,28 @@ case "$1" in
"1" )
createHeader $1
createSummary $1
createMMaps $MAP_Continent1 $MAP_Continent2 $MAP_LIST_Junk1 $MAP_Big1 $MAP_Big2 $MAP_Big3 $MAP_Big4 $MAP_Medium6 $MAP_Big5 $MAP_Big6 $MAP_Medium1 $MAP_Medium2 $MAP_Medium3 $MAP_Medium4 $MAP_Medium6 $MAP_Medium7 $MAP_Medium8 $MAP_Medium9 $MAP_Small1 $MAP_Small2 $MAP_Small3 $MAP_Small4 $MAP_Small5 $MAP_Small6 $MAP_Small7 $MAP_Small8 $MAP_Small9 $MAP_Small10 $MAP_Small11 $MAP_Small12 $MAP_Small13 $MAP_Small14 $MAP_Small15 $MAP_Small16 $MAP_Small17 $MAP_Small18 $MAP_LIST_Junk1 $MAP_LIST_Junk2 $MAP_LIST_Junk3 $MAP_LIST_Junk4 $MAP_LIST_Junk5 $MAP_LIST_Junk6 $MAP_LIST_Junk7 $MAP_LIST_Junk8 $MAP_LIST_Junk9 &
createMMaps $MAP_Continent1 $MAP_Continent2 $MAP_LIST_Junk1 $MAP_Big1 $MAP_Big2 $MAP_Big3 $MAP_Big4 $MAP_Medium6 $MAP_Big5 $MAP_Big6 $MAP_Medium1 $MAP_Medium2 $MAP_Medium3 $MAP_Medium4 $MAP_Medium6 $MAP_Medium7 $MAP_Medium8 $MAP_Medium9 $MAP_Small1 $MAP_Small2 $MAP_Small3 $MAP_Small4 $MAP_Small5 $MAP_Small6 $MAP_Small7 $MAP_Small8 $MAP_Small9 $MAP_Small10 $MAP_Small11 $MAP_Small12 $MAP_Small13 $MAP_Small14 $MAP_Small15 $MAP_Small16 $MAP_Small17 $MAP_Small18 $MAP_LIST_Junk1 $MAP_LIST_Junk2 $MAP_LIST_Junk3 $MAP_LIST_Junk4 $MAP_LIST_Junk5 $MAP_LIST_Junk6 $MAP_LIST_Junk7 $MAP_LIST_Junk8 $MAP_LIST_Junk9 &
;;
"2" )
createHeader $1
createSummary $1
createMMaps $MAP_Continent2 $MAP_Medium1 $MAP_Medium2 $MAP_Medium3 $MAP_Small1 $MAP_Small2 $MAP_Small3 $MAP_Small4 $MAP_Small5 $MAP_Small6 $MAP_Small7 $MAP_Small8 $MAP_Small9 $MAP_Small10 &
createMMaps $MAP_Continent1 $MAP_Big1 $MAP_Big2 $MAP_Big3 $MAP_Big4 $MAP_Big5 $MAP_Big6 $MAP_Medium4 $MAP_Medium5 $MAP_Medium6 $MAP_Medium7 $MAP_Medium8 $MAP_Medium9 $MAP_Small11 $MAP_Small12 $MAP_Small13 $MAP_Small14 $MAP_Small15 $MAP_Small16 $MAP_Small17 $MAP_Small18 $MAP_Small19 &
createMMaps $MAP_Continent2 $MAP_Medium1 $MAP_Medium2 $MAP_Medium3 $MAP_Small1 $MAP_Small2 $MAP_Small3 $MAP_Small4 $MAP_Small5 $MAP_Small6 $MAP_Small7 $MAP_Small8 $MAP_Small9 $MAP_Small10 &
createMMaps $MAP_Continent1 $MAP_Big1 $MAP_Big2 $MAP_Big3 $MAP_Big4 $MAP_Big5 $MAP_Big6 $MAP_Medium4 $MAP_Medium5 $MAP_Medium6 $MAP_Medium7 $MAP_Medium8 $MAP_Medium9 $MAP_Small11 $MAP_Small12 $MAP_Small13 $MAP_Small14 $MAP_Small15 $MAP_Small16 $MAP_Small17 $MAP_Small18 $MAP_Small19 &
;;
"3" )
createHeader $1
createSummary $1
createMMaps $MAP_Continent1 &
createMMaps $MAP_Continent2 &
createMMaps $MAP_Big1 $MAP_Big2 $MAP_Big3 $MAP_Big4 $MAP_Big5 $MAP_Big6 $MAP_Medium1 $MAP_Medium2 $MAP_Medium3 $MAP_Medium4 $MAP_Medium5 $MAP_Medium6 $MAP_Medium7 $MAP_Medium8 $MAP_Medium9 $MAP_Small1 $MAP_Small2 $MAP_Small3 $MAP_Small4 $MAP_Small5 $MAP_Small6 $MAP_Small7 $MAP_Small8 $MAP_Small9 $MAP_Small10 $MAP_Small11 $MAP_Small12 $MAP_Small13 $MAP_Small14 $MAP_Small15 $MAP_Small16 $MAP_Small17 $MAP_Small18 $MAP_LIST_Junk1 $MAP_LIST_Junk2 $MAP_LIST_Junk3 $MAP_LIST_Junk4 $MAP_LIST_Junk5 $MAP_LIST_Junk6 $MAP_LIST_Junk7 $MAP_LIST_Junk8 $MAP_LIST_Junk9 &
createMMaps $MAP_Continent1 &
createMMaps $MAP_Continent2 &
createMMaps $MAP_Big1 $MAP_Big2 $MAP_Big3 $MAP_Big4 $MAP_Big5 $MAP_Big6 $MAP_Medium1 $MAP_Medium2 $MAP_Medium3 $MAP_Medium4 $MAP_Medium5 $MAP_Medium6 $MAP_Medium7 $MAP_Medium8 $MAP_Medium9 $MAP_Small1 $MAP_Small2 $MAP_Small3 $MAP_Small4 $MAP_Small5 $MAP_Small6 $MAP_Small7 $MAP_Small8 $MAP_Small9 $MAP_Small10 $MAP_Small11 $MAP_Small12 $MAP_Small13 $MAP_Small14 $MAP_Small15 $MAP_Small16 $MAP_Small17 $MAP_Small18 $MAP_LIST_Junk1 $MAP_LIST_Junk2 $MAP_LIST_Junk3 $MAP_LIST_Junk4 $MAP_LIST_Junk5 $MAP_LIST_Junk6 $MAP_LIST_Junk7 $MAP_LIST_Junk8 $MAP_LIST_Junk9 &
;;
"4" )
createHeader $1
createSummary $1
createMMaps $MAP_Continent1 &
createMMaps $MAP_Continent2 &
createMMaps $MAP_LIST_Junk1 $MAP_Big1 $MAP_Big2 $MAP_Big3 $MAP_Big4 $MAP_Medium6 &
createMMaps $MAP_Medium1 $MAP_Medium2 $MAP_Medium3 $MAP_Small1 $MAP_Small2 $MAP_Small3 $MAP_Small4 $MAP_Small5 $MAP_Small6 $MAP_Small7 $MAP_Small8 $MAP_Small9 $MAP_Big5 $MAP_Big6 $MAP_Medium4 $MAP_Medium5 $MAP_Medium7 $MAP_Medium8 $MAP_Medium9 $MAP_Small11 $MAP_LIST_Junk3 $MAP_LIST_Junk4 $MAP_LIST_Junk5 $MAP_LIST_Junk6 $MAP_Small12 $MAP_LIST_Junk7 $MAP_Small13 $MAP_Small14 $MAP_Small15 $MAP_Small16 $MAP_Small17 $MAP_Small18 $MAP_Small19 $MAP_LIST_Junk8 $MAP_LIST_Junk9 &
createMMaps $MAP_Continent1 &
createMMaps $MAP_Continent2 &
createMMaps $MAP_LIST_Junk1 $MAP_Big1 $MAP_Big2 $MAP_Big3 $MAP_Big4 $MAP_Medium6 &
createMMaps $MAP_Medium1 $MAP_Medium2 $MAP_Medium3 $MAP_Small1 $MAP_Small2 $MAP_Small3 $MAP_Small4 $MAP_Small5 $MAP_Small6 $MAP_Small7 $MAP_Small8 $MAP_Small9 $MAP_Big5 $MAP_Big6 $MAP_Medium4 $MAP_Medium5 $MAP_Medium7 $MAP_Medium8 $MAP_Medium9 $MAP_Small11 $MAP_LIST_Junk3 $MAP_LIST_Junk4 $MAP_LIST_Junk5 $MAP_LIST_Junk6 $MAP_Small12 $MAP_LIST_Junk7 $MAP_Small13 $MAP_Small14 $MAP_Small15 $MAP_Small16 $MAP_Small17 $MAP_Small18 $MAP_Small19 $MAP_LIST_Junk8 $MAP_LIST_Junk9 &
;;
"offmesh" )
echo "`date`: Recreate offmeshs from file $OFFMESH_FILE" | tee -a $LOG_FILE

@ -1 +1 @@
Subproject commit 8e7dfd8bb751c86aa6108b5a0dde8f565ba0c3a3
Subproject commit 5d81c3d6c36e7e7e00a9fbd73c0a56439703f9b6