From 2f55036986a784392f184981bae472f131b0be80 Mon Sep 17 00:00:00 2001 From: pelupessy Date: Mon, 6 Jul 2020 16:37:47 +0900 Subject: [PATCH 1/2] Update ScriptInterface.cpp Required space between literal and string macro added. --- Aquaria/ScriptInterface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Aquaria/ScriptInterface.cpp b/Aquaria/ScriptInterface.cpp index d847a50..c2b6c04 100644 --- a/Aquaria/ScriptInterface.cpp +++ b/Aquaria/ScriptInterface.cpp @@ -10409,7 +10409,7 @@ static const struct { #undef MK_ALIAS #define MK_FUNC(base, getter, prefix, suffix) luaRegister(prefix##_##suffix), #define MK_STR(s) #s -#define MK_ALIAS(prefix, suffix, alias) {MK_STR(prefix)"_"MK_STR(alias), l_##prefix##_##suffix}, +#define MK_ALIAS(prefix, suffix, alias) {MK_STR(prefix) "_" MK_STR(alias), l_##prefix##_##suffix}, EXPAND_FUNC_PROTOTYPES From 470a89510da22bfa4b77774ba71843a0b32debfa Mon Sep 17 00:00:00 2001 From: pelupessy Date: Mon, 6 Jul 2020 17:03:34 +0900 Subject: [PATCH 2/2] Update SceneEditor.cpp Use of operand of type #bool# in #operator++# is depreciated. --- Aquaria/SceneEditor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Aquaria/SceneEditor.cpp b/Aquaria/SceneEditor.cpp index ca6aea6..962638a 100644 --- a/Aquaria/SceneEditor.cpp +++ b/Aquaria/SceneEditor.cpp @@ -3386,7 +3386,7 @@ void SceneEditor::update(float dt) else if (cursorOffset.x < oldPosition.x-10) right = false; else - noSide++; + noSide = 1; if (cursorOffset.y > oldPosition.y+10) down = true; else if (cursorOffset.y < oldPosition.y-10)