Merge branch 'master' into feature/cart_config

.editorconfig

@@ -0,0 +1,24 @@
+# rAthena EditorConfig file
+# EditorConfig is awesome: https://EditorConfig.org
+# This file should be encoded in UTF-8 with CRLF or LF line endings.
+
+root = true
+
+# Add a blank newline to the end of every file after saving
+# Trim trailing whitespace
+[*]
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# YAML does not support hard tabs.
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 4
+
+# Use tabs in Makefiles
+[Makefile*]
+indent_style = tab
+
+# Scripts should use hard tabs to prevent script header goofs.
+[npc/**.txt]
+indent_style = tab

.gitattributes

@@ -1,5 +1,6 @@
 *        text=auto
-*.c      diff=cpp
+*.cpp diff=cpp
+*.yml diff
 *.sln    merge=union
 *.vcproj merge=union
 *.vcxproj merge=union

.gitignore

@@ -29,6 +29,7 @@ Thumbs.db
 *.a
 *.vcxproj.user
 /char-server
+/csv2yaml
 /config.log
 /config.status
 /core
@@ -46,10 +47,6 @@ Thumbs.db
 /3rdparty/libconfig/*.o
 /3rdparty/libconfig/obj
 
-# /3rdparty/mt19937ar/
-/3rdparty/mt19937ar/Makefile
-/3rdparty/mt19937ar/*.o
-
 # /3rdparty/yaml-cpp/
 /3rdparty/yaml-cpp/Makefile
 
@@ -60,6 +57,9 @@ Thumbs.db
 /conf/import
 /conf/msg_conf/import
 
+# /lib
+/lib
+
 # /log/
 /log/*.log
 /log/*.leaks
@@ -72,7 +72,7 @@ Thumbs.db
 /src/common/Makefile
 /src/common/obj_all
 /src/common/obj_sql
-/src/common/svnversion.h
+/src/common/version.hpp
 
 # /src/custom/
 /src/custom
@@ -84,11 +84,7 @@ Thumbs.db
 # /src/map/
 /src/map/Makefile
 /src/map/obj_sql
-/src/map/pcre.h
-
-# /src/test/
-/src/test/Makefile
-/src/test/obj
+/src/map/pcre.hpp
 
 # /src/tool/
 /src/tool/Makefile
@@ -117,6 +113,7 @@ Thumbs.db
 
 # bat tools
 /charserv.bat
+/csv2yaml.bat
 /logserv.bat
 /mapcache.bat
 /mapserv.bat

.mailmap

@@ -25,17 +25,20 @@ brianluau <[email protected]> <brianluau@54d463be-8e91-2dee-ded
 cydh <[email protected]> <cydh@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 Daegaladh <[email protected]> <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 Deadly Silence <[email protected]> <deadlysilence@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+Epoque1 <[email protected]> <epoque11@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 euphyy <[email protected]> <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 flaviojs <[email protected]> <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 flaviojs <[email protected]> <flaviojs2005@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 functor-x <[email protected]> <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 functor-x <[email protected]> <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 greenboxal <[email protected]> <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 jguy1987 <[email protected]> <jmanfffreak@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+jTynne <[email protected]> <jtynne@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 j-tkay <[email protected]> <j-tkay@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 Kenpachi2k13 <[email protected]> <kenpachi2k11@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 kisuka <[email protected]> <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 Lemongrass3110 <[email protected]> <lemongrass3110@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+lnkfish <[email protected]> <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 Locien <[email protected]> <MasterOfMuppets@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 lighta <[email protected]> <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 Masao87 <[email protected]> <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>
@@ -47,13 +50,15 @@ Playtester <[email protected]> <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 Playtester <[email protected]> <playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 rAthenaAPI <[email protected]> <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 rAthenaAPI <[email protected]> <rathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+SeoRoman <[email protected]> <script-Z3R0@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+SeoRoman <[email protected]> <script-z3r0@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 shennetsind <[email protected]> <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 theultramage <[email protected]> <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 trojal <[email protected]> <trojal@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+Valaris <[email protected]> <valaris@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+Valaris <[email protected]> <Valaris@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 wilkemeyer <[email protected]> <blacksirius@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 Yommy <[email protected]> <Yommy@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-SeoRoman <[email protected]> <script-Z3R0@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-SeoRoman <[email protected]> <script-z3r0@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 
 ##################################################################
 #                  Git Aliases                                   #
@@ -118,7 +123,6 @@ skotlex <[email protected]> <Skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # toms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # shadowlady <shadowlady@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # codemaster <codemaster@54d463be-8e91-2dee-dedb-b68131a5f0ec>
@@ -130,14 +134,12 @@ skotlex <[email protected]> <Skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # mc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # evera <evera@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # SinSloth <SinSloth@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# epoque11 <epoque11@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # DracoRPG <DracoRPG@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # littlewolf <littlewolf@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # eaac <eaac@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # ajarn <ajarn@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # wizputer <wizputer@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # Nasedo <Nasedo@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# valaris <valaris@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # blackhole89 <blackhole89@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # protimus <protimus@54d463be-8e91-2dee-dedb-b68131a5f0ec>							https://github.com/protimus
 # Komurka <Komurka@54d463be-8e91-2dee-dedb-b68131a5f0ec>
@@ -160,7 +162,6 @@ skotlex <[email protected]> <Skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # kobra_k88 <kobra_k88@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # shinomori <shinomori@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # LuzZza <LuzZza@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# Valaris <Valaris@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # spre123 <spre123@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # Chilly0123 <Chilly0123@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # ediejohnny <ediejohnny@54d463be-8e91-2dee-dedb-b68131a5f0ec>
@@ -173,7 +174,6 @@ skotlex <[email protected]> <Skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # Mass <Mass@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # Sara <Sara@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # nana <nana@54d463be-8e91-2dee-dedb-b68131a5f0ec>
-# jtynne <jtynne@54d463be-8e91-2dee-dedb-b68131a5f0ec>								https://github.com/jtynne
 # veider <veider@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # Shinigami <Shinigami@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 # mercurial123 <mercurial123@54d463be-8e91-2dee-dedb-b68131a5f0ec>

.travis.yml

@@ -73,6 +73,17 @@ matrix:
       env:
         - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
         - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=no --enable-buildbot=yes"
+#   Version 8
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-8
+      env:
+        - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
+        - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=no --enable-buildbot=yes"
 # Clang
 #   Version 3.9
     - os: linux
@@ -126,7 +137,7 @@ matrix:
 ##         MacOS default MySQL configuration does not like our card seller(only full group by)
 #        - ./tools/ci/npc.sh
 #        - make clean
-#        - make server
+#        - make all
 #        - ./login-server --run-once
 #        - ./char-server --run-once
 #        - ./map-server --run-once
@@ -144,7 +155,20 @@ matrix:
          - mkdir cbuild
          - cd cbuild
          - cmake -G "Unix Makefiles" ..
-         - make
+         - make || travis_terminate 1
+# MariaDB
+    - os: linux
+      addons:
+        mariadb: '10.0'
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-5
+            - libmariadbclient-dev
+      env:
+         - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
+         - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=no --enable-buildbot=yes"
 
 before_install:
     - eval "${MATRIX_EVAL}"
@@ -154,10 +178,10 @@ before_script:
   - ./tools/ci/sql.sh
 
 script:
-  - ./configure $CONFIGURE_FLAGS
+  - ./configure $CONFIGURE_FLAGS || travis_terminate 1
   - ./tools/ci/npc.sh
-  - make clean
-  - make server
+  - make clean || travis_terminate 1
+  - make all || travis_terminate 1
   - ./login-server --run-once
   - ./char-server --run-once
   - ./map-server --run-once

3rdparty/CMakeLists.txt

@@ -48,8 +48,6 @@ endmacro( CONFIGURE_WITH_LOCAL_OR_SYSTEM )
 
 
 add_subdirectory( libconfig )
-add_subdirectory( msinttypes )
-add_subdirectory( mt19937ar )
 add_subdirectory( mysql )
 add_subdirectory( pcre )
 add_subdirectory( zlib )

3rdparty/README.txt

@@ -2,8 +2,6 @@ This folder contains everything related to 3rdparty code or tools.
 
 cmake - scripts for the cmake build system (http://www.cmake.org)
 libconfig - library for processing structured configuration files (http://www.hyperrealm.com/libconfig/)
-msinttypes - standard headers missing from Microsoft Visual Studio (http://code.google.com/p/msinttypes)
-mt19937ar - code for Mersenne Twister pseudorandom number generator
 mysql - library for MySQL Community Server (http://www.mysql.com)
 pcre - library for Perl Compatible Regular Expressions (http://www.pcre.org)
 zlib - library for DEFLATE lossless compression algorithm (http://www.zlib.net)

3rdparty/libconfig/libconfig.vcxproj

@@ -106,7 +106,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>YY_USE_CONST;LIBCONFIG_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>YY_USE_CONST;LIBCONFIG_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -120,7 +120,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>YY_USE_CONST;LIBCONFIG_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>YY_USE_CONST;LIBCONFIG_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_LIB;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>