From 77c655739124f6db20dbfc7b2fecc51e66980893 Mon Sep 17 00:00:00 2001 From: GokuWeedLord Date: Sat, 16 Dec 2017 19:05:14 +1100 Subject: [PATCH] fix compile warning --- scripts/native/CMakeLists.txt | 2 +- scripts/native/opening/OpeningLimsa.cpp | 2 +- scripts/native/quest/ManWil001.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/native/CMakeLists.txt b/scripts/native/CMakeLists.txt index 334c9f01..b7b5de1e 100644 --- a/scripts/native/CMakeLists.txt +++ b/scripts/native/CMakeLists.txt @@ -24,7 +24,7 @@ foreach(_sourcefile ${SCRIPT_FILES}) if(MSVC) set_source_files_properties("${_file}" PROPERTIES - COMPILE_FLAGS "/Yc${CMAKE_CURRENT_SOURCE_DIR}/ScriptObject.h" + COMPILE_FLAGS "/YuScriptObject.h" ) set_target_properties(${_file} PROPERTIES CXX_STANDARD 14 diff --git a/scripts/native/opening/OpeningLimsa.cpp b/scripts/native/opening/OpeningLimsa.cpp index 09144097..17ec1170 100644 --- a/scripts/native/opening/OpeningLimsa.cpp +++ b/scripts/native/opening/OpeningLimsa.cpp @@ -6,7 +6,7 @@ class OpeningLimsa : public EventScript { -private:; +private: static constexpr auto ERANGE_HOWTO_ANN_AND_QUEST = 4101831; static constexpr auto ERANGE_HOWTO_QUEST_REWARD = 4102066; static constexpr auto ERANGE_SEQ_1_CLOSED_1 = 4101785; diff --git a/scripts/native/quest/ManWil001.cpp b/scripts/native/quest/ManWil001.cpp index a2ce36dd..e19b08b6 100644 --- a/scripts/native/quest/ManWil001.cpp +++ b/scripts/native/quest/ManWil001.cpp @@ -133,7 +133,7 @@ public: void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( actorId ); + auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); if( actor == ACTOR0 ) Scene00000( player );