From 67a0770b7f248213ef916b4d89c2842053c02f3f Mon Sep 17 00:00:00 2001 From: ErikasKontenis Date: Fri, 13 Sep 2019 21:01:25 +0300 Subject: [PATCH 1/2] ignore my local items --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e6e89e6..cc859aa 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ vc14/theforgottenserver.vcxproj.user vc14/.vs/ *.pdb *.dll +/.vs From 128789a2643e740fdf3a9d2a38a77217bf5e8bfd Mon Sep 17 00:00:00 2001 From: ErikasKontenis Date: Sat, 14 Sep 2019 21:59:01 +0300 Subject: [PATCH 2/2] fix issue with changed library of lua.hpp --- .gitignore | 2 ++ config.lua | 2 +- src/configmanager.h | 2 +- src/luascript.h | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cc859aa..f17fbb5 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ vc14/.vs/ *.pdb *.dll /.vs +/vc14/Debug +/vc14/UpgradeLog.htm diff --git a/config.lua b/config.lua index 2974f71..5bedf78 100644 --- a/config.lua +++ b/config.lua @@ -59,7 +59,7 @@ mapAuthor = "CipSoft" mysqlHost = "127.0.0.1" mysqlUser = "root" mysqlPass = "" -mysqlDatabase = "nostalrius" +mysqlDatabase = "sabrehaven" mysqlPort = 3306 mysqlSock = "" diff --git a/src/configmanager.h b/src/configmanager.h index 93fa8a2..f2105fe 100644 --- a/src/configmanager.h +++ b/src/configmanager.h @@ -20,7 +20,7 @@ #ifndef FS_CONFIGMANAGER_H_6BDD23BD0B8344F4B7C40E8BE6AF6F39 #define FS_CONFIGMANAGER_H_6BDD23BD0B8344F4B7C40E8BE6AF6F39 -#include +#include class ConfigManager { diff --git a/src/luascript.h b/src/luascript.h index 87a2df4..4e937e7 100644 --- a/src/luascript.h +++ b/src/luascript.h @@ -20,7 +20,7 @@ #ifndef FS_LUASCRIPT_H_5344B2BC907E46E3943EA78574A212D8 #define FS_LUASCRIPT_H_5344B2BC907E46E3943EA78574A212D8 -#include +#include #if LUA_VERSION_NUM >= 502 #ifndef LUA_COMPAT_ALL