From 040a7dd7e232fc719d8ca9a3a8dad6717d55bd12 Mon Sep 17 00:00:00 2001 From: Sandu Liviu Catalin Date: Fri, 17 Apr 2020 15:25:58 +0300 Subject: [PATCH] Miscellaneous changes. --- CMakeLists.txt | 2 +- module/Core/Funcs.inc | 2 +- module/Misc/Register.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 974229c9..e1b95443 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ option(ENABLE_MYSQL "Enable the MySQL library." OFF) # Default to c++14 standard if(CMAKE_VERSION VERSION_LESS "3.1") if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") endif() else() # Apparently the above does not work with cmake from on debian 8 diff --git a/module/Core/Funcs.inc b/module/Core/Funcs.inc index 11c1a405..44eb240b 100644 --- a/module/Core/Funcs.inc +++ b/module/Core/Funcs.inc @@ -359,7 +359,7 @@ void Register_Core(HSQUIRRELVM vm) .Func(_SC("OnPostLoad"), &SqGetPostLoadEvent) .Func(_SC("OnUnload"), &SqGetUnloadEvent) .SquirrelFunc(_SC("ForceEnableNullEntities"), &SqForceEnableNullEntities) - .SquirrelFunc(_SC("LoadScript"), &SqLoadScript) + .SquirrelFunc(_SC("LoadScript"), &SqLoadScript, -3, ".b.") .SquirrelFunc(_SC("On"), &SqGetEvents); RootTable(vm).Bind(_SC("SqCore"), corens); diff --git a/module/Misc/Register.cpp b/module/Misc/Register.cpp index 497765c6..9b9a1834 100644 --- a/module/Misc/Register.cpp +++ b/module/Misc/Register.cpp @@ -129,8 +129,8 @@ void Register_Misc(HSQUIRRELVM vm) RootTable(vm).Bind(_SC("SqServer"), srvns); RootTable(vm) - .SquirrelFunc(_SC("FindPlayer"), &Player_FindAuto) - .SquirrelFunc(_SC("PlayerExists"), &Player_ExistsAuto) + .SquirrelFunc(_SC("FindPlayer"), &Player_FindAuto, -2, ".i|f|s") + .SquirrelFunc(_SC("PlayerExists"), &Player_ExistsAuto, -2, ".i|f|s") .Func(_SC("GetKeyCodeName"), &GetKeyCodeName) .FmtFunc(_SC("SetKeyCodeName"), &SetKeyCodeName) .Func(_SC("GetModelName"), &GetModelName)