Release: OTX Server 3.2 - "PHANTOM" - (8.6 - 8.70/72 - 10.90)

Update all files from old protocols from 10.90

CHANGELOG

@@ -6,7 +6,7 @@
 		The Forgotten Server Version: 1.2
 
 	Codenamed
-		BOOM
+		PHANTOM
 
 	Forum and website
 		http://www.blacktibia.org/f19-otx-server-3
@@ -59,7 +59,7 @@
 			- Look Display
 ]
 
-[ OTX Server 3.2 Version - " "
+[ OTX Server 3.2 Version - "PHANTOM"
 	- Added Monster Spawn event
 	- Added DDoS protection (no complete)
 	- Added Advance Save

path_10_9/data/talkactions/talkactions.xml

@@ -40,17 +40,17 @@
 	<talkaction words="/gotopos" separator=" " script="teleport_to_pos.lua" />
 
 	<!-- player talkactions -->
+	<talkaction words="!buypremium" script="buyprem.lua" />
 	<talkaction words="!buyhouse" script="buyhouse.lua" />
 	<talkaction words="!leavehouse" script="leavehouse.lua" />
+	<talkaction words="!changesex" script="changesex.lua" />
 	<talkaction words="!uptime" script="uptime.lua" />
 	<talkaction words="!deathlist" script="deathlist.lua" />
 	<talkaction words="!kills" script="kills.lua" />
 	<talkaction words="!online" script="online.lua" />
 	<talkaction words="!serverinfo" script="serverinfo.lua" />
 
 	<!-- No workd
-		<talkaction words="!buypremium" script="buyprem.lua" />
-		<talkaction words="!changesex" script="changesex.lua" />
 		<talkaction words="!addon" script="addon.lua" />
 
 		<talkaction words="!z" separator=" " script="magiceffect.lua" />

path_10_9/src/definitions.h

@@ -23,8 +23,8 @@
 #define STATUS_SERVER_NAME "OTX Server"
 #define STATUS_SERVER_VERSION "3"
 #define MINOR_VERSION "2"
-#define REVISION_VERSION "-"
-#define SOFTWARE_CODENAME "The Second"
+#define REVISION_VERSION "408"
+#define SOFTWARE_CODENAME "PHANTOM"
 #define STATUS_SERVER_DEVELOPERS "Mattyx14 and TFS Developers"
 #define GIT_REPO "https://github.com/mattyx14/otxserver/"
 

path_8_6/.gitignore

@@ -52,6 +52,7 @@ ipch/
 *.aps
 *.ncb
 *.opensdf
+*.opendb
 *.sdf
 *.cachefile
 

path_8_6/.travis.yml

@@ -1,12 +1,22 @@
+sudo: required
+dist: trusty
 language: cpp
-compiler: gcc
+compiler:
+  - clang
+  - gcc
+env:
+  - LUAJIT=OFF
+  - LUAJIT=ON
 cache: apt
-before_install:
-  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-  - sudo add-apt-repository ppa:apokluda/boost1.53 -y
-  - sudo apt-get update -qq
-  - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; fi
-  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
-install: sudo apt-get install libboost1.53-dev libboost-system1.53-dev liblua5.2-dev libgmp3-dev libmysqlclient-dev
-before_script: mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release ..
-script: make
+addons:
+  apt:
+    packages:
+      - libboost-dev
+      - libboost-system-dev
+      - liblua5.2-dev
+      - libluajit-5.1-dev
+      - libmysqlclient-dev
+before_script:
+  - mkdir build && cd build
+  - cmake -DCMAKE_BUILD_TYPE=Release -DUSE_LUAJIT=${LUAJIT} ..
+script: make -j2

path_8_6/CMakeLists.txt

@@ -24,12 +24,14 @@ include(FindCXX11)
 
 # Find packages.
 find_package(GMP REQUIRED)
-find_package(MySQL)
 find_package(LuaJIT)
+find_package(MySQL)
 find_package(Threads)
 
-if (LUAJIT_FOUND)
-    add_definitions(-D__LUAJIT__)
+option(USE_LUAJIT "Use LuaJIT" ${LUAJIT_FOUND})
+
+if(USE_LUAJIT)
+    find_package(LuaJIT REQUIRED)
     if(APPLE)
       set(CMAKE_EXE_LINKER_FLAGS "-pagezero_size 10000 -image_base 100000000")
     endif()