From b147aa2590024483644867c88b250b5196528f48 Mon Sep 17 00:00:00 2001
From: ErikasKontenis <e.kontenis@gmail.com>
Date: Sun, 5 Jan 2020 18:00:38 +0200
Subject: [PATCH] few fixes for <luajit/lua.hpp> and config.lua

---
 config.lua          |   4 +-
 config.prod.lua     | 109 ++++++++++++++++++++++++++++++++++++++++++++
 src/configmanager.h |   4 ++
 src/luascript.h     |   4 ++
 4 files changed, 119 insertions(+), 2 deletions(-)
 create mode 100644 config.prod.lua

diff --git a/config.lua b/config.lua
index 28d6887..acf80c1 100644
--- a/config.lua
+++ b/config.lua
@@ -28,10 +28,10 @@ loginProtocolPort = 7171
 gameProtocolPort = 7172
 statusProtocolPort = 7171
 maxPlayers = 1000
-motd = "Welcome to Nostalrius 4.5!"
+motd = "Welcome to Sabrehaven!"
 onePlayerOnlinePerAccount = true
 allowClones = false
-serverName = "RealOTS"
+serverName = "Sabrehaven"
 statusTimeout = 5000
 replaceKickOnLogin = true
 maxPacketsPerSecond = -1
diff --git a/config.prod.lua b/config.prod.lua
new file mode 100644
index 0000000..5a3c6a9
--- /dev/null
+++ b/config.prod.lua
@@ -0,0 +1,109 @@
+-- Combat settings
+-- NOTE: valid values for worldType are: "pvp", "no-pvp" and "pvp-enforced"
+worldType = "pvp"
+hotkeyAimbotEnabled = true
+protectionLevel = 1
+pzLocked = 60000
+removeChargesFromRunes = true
+stairJumpExhaustion = 0
+experienceByKillingPlayers = false
+expFromPlayersLevelRange = 75
+
+-- Skull System
+banLength = 30 * 24 * 60 * 60
+whiteSkullTime = 15 * 60
+redSkullTime = 30 * 24 * 60 * 60
+killsDayRedSkull = 3
+killsWeekRedSkull = 5
+killsMonthRedSkull = 10
+killsDayBanishment = 6
+killsWeekBanishment = 10
+killsMonthBanishment = 20
+
+-- Connection Config
+-- NOTE: maxPlayers set to 0 means no limit
+ip = "149.202.64.104"
+bindOnlyGlobalAddress = false
+loginProtocolPort = 7171
+gameProtocolPort = 7172
+statusProtocolPort = 7171
+maxPlayers = 1000
+motd = "Welcome to Sabrehaven!"
+onePlayerOnlinePerAccount = true
+allowClones = false
+serverName = "Sabrehaven"
+statusTimeout = 5000
+replaceKickOnLogin = true
+maxPacketsPerSecond = -1
+autoStackCumulatives = false
+moneyRate = 1
+
+-- Deaths
+-- NOTE: Leave deathLosePercent as -1 if you want to use the default
+-- death penalty formula. For the old formula, set it to 10. For
+-- no skill/experience loss, set it to 0.
+deathLosePercent = -1
+
+-- Houses
+houseRentPeriod = "monthly"
+
+-- Item Usage
+timeBetweenActions = 200
+timeBetweenExActions = 1000
+
+-- Map
+-- NOTE: set mapName WITHOUT .otbm at the end
+mapName = "map"
+mapAuthor = "CipSoft"
+
+-- MySQL
+mysqlHost = "127.0.0.1"
+mysqlUser = "forgottenserver"
+mysqlPass = "bMM0cQcFETKHc3CNY7ULrlBN"
+mysqlDatabase = "forgottenserver"
+mysqlPort = 3306
+mysqlSock = ""
+
+-- Misc.
+allowChangeOutfit = true
+freePremium = true
+kickIdlePlayerAfterMinutes = 15
+maxMessageBuffer = 4
+showMonsterLoot = false
+blockHeight = false
+dropItems = false
+
+
+-- Character Rooking
+-- Level threshold is the level requirement to teleport players back to newbie town
+teleportNewbies = true
+newbieTownId = 11
+newbieLevelThreshold = 5
+
+-- Rates
+-- NOTE: rateExp is not used if you have enabled stages in data/XML/stages.xml
+rateExp = 1
+rateSkill = 1
+rateLoot = 1
+rateMagic = 1
+rateSpawn = 0
+
+-- Monsters
+deSpawnRange = 2
+deSpawnRadius = 50
+
+-- Scripts
+warnUnsafeScripts = true
+convertUnsafeScripts = true
+
+-- Startup
+-- NOTE: defaultPriority only works on Windows and sets process
+-- priority, valid values are: "normal", "above-normal", "high"
+defaultPriority = "high"
+startupDatabaseOptimization = true
+
+-- Status server information
+ownerName = ""
+ownerEmail = ""
+url = "https://otland.net/"
+location = "Sweden"
diff --git a/src/configmanager.h b/src/configmanager.h
index 2d7b0db..c81e761 100644
--- a/src/configmanager.h
+++ b/src/configmanager.h
@@ -20,7 +20,11 @@
 #ifndef FS_CONFIGMANAGER_H_6BDD23BD0B8344F4B7C40E8BE6AF6F39
 #define FS_CONFIGMANAGER_H_6BDD23BD0B8344F4B7C40E8BE6AF6F39
 
+#if __has_include("luajit/lua.hpp")
 #include <luajit/lua.hpp>
+#else
+#include <lua.hpp>
+#endif
 
 class ConfigManager
 {
diff --git a/src/luascript.h b/src/luascript.h
index 8fd8a1e..22157a1 100644
--- a/src/luascript.h
+++ b/src/luascript.h
@@ -20,7 +20,11 @@
 #ifndef FS_LUASCRIPT_H_5344B2BC907E46E3943EA78574A212D8
 #define FS_LUASCRIPT_H_5344B2BC907E46E3943EA78574A212D8
 
+#if __has_include("luajit/lua.hpp")
 #include <luajit/lua.hpp>
+#else
+#include <lua.hpp>
+#endif
 
 #if LUA_VERSION_NUM >= 502
 #ifndef LUA_COMPAT_ALL