Digitalstack/SabrehavenServer
2
0
Fork 0
mirror of https://github.com/ErikasKontenis/SabrehavenServer.git synced 2025-05-01 18:19:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix crash on doMonsterSay

Browse Source
This commit is contained in:
ErikasKontenis 2019-12-29 11:03:26 +02:00
parent cc98f76906
commit d9d6bc5819
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/actions/scripts/misc/chests.lua
View File

@ -46,8 +46,6 @@ function onUse(player, item, fromPosition, target, toPosition)
player:sendTextMessage(MESSAGE_INFO_DESCR, "You have found " .. rewardName .. ".") player:sendTextMessage(MESSAGE_INFO_DESCR, "You have found " .. rewardName .. ".")
player:addItemEx(reward:clone(), true) player:addItemEx(reward:clone(), true)
if not getPlayerFlagValue(player, PlayerFlag_HasInfiniteCapacity) then player:setStorageValue(chestQuestNumber, 1)
player:setStorageValue(chestQuestNumber, 1)
end
return true return true
end end

2
src/game.cpp
View File

@ -3739,7 +3739,7 @@ void Game::addMonsterSayText(const Position& pos, const std::string& text)
for (Creature* spectator : list) { for (Creature* spectator : list) {
if (Player* tmpPlayer = spectator->getPlayer()) { if (Player* tmpPlayer = spectator->getPlayer()) {
tmpPlayer->sendCreatureSay(nullptr, TALKTYPE_MONSTER_SAY, text, &pos); tmpPlayer->sendCreatureSay(tmpPlayer, TALKTYPE_MONSTER_SAY, text, &pos);
} }
} }
} }

16
vc14/theforgottenserver.vcxproj
View File

@ -92,7 +92,7 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>
<PreprocessorDefinitions>_CONSOLE;$(PREPROCESSOR_DEFS);%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_CONSOLE;__EXCEPTION_TRACER__;$(PREPROCESSOR_DEFS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories> <AdditionalIncludeDirectories>
</AdditionalIncludeDirectories> </AdditionalIncludeDirectories>
@ -124,7 +124,7 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile> <ClCompile>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;$(PREPROCESSOR_DEFS);%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;_CONSOLE;__EXCEPTION_TRACER__;$(PREPROCESSOR_DEFS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<WarningLevel>Level4</WarningLevel> <WarningLevel>Level4</WarningLevel>
@ -160,7 +160,7 @@
<ClCompile Include="..\src\databasemanager.cpp" /> <ClCompile Include="..\src\databasemanager.cpp" />
<ClCompile Include="..\src\databasetasks.cpp" /> <ClCompile Include="..\src\databasetasks.cpp" />
<ClCompile Include="..\src\depotlocker.cpp" /> <ClCompile Include="..\src\depotlocker.cpp" />
<ClCompile Include="..\src\events.cpp" /> <ClCompile Include="..\src\events.cpp" />
<ClCompile Include="..\src\fileloader.cpp" /> <ClCompile Include="..\src\fileloader.cpp" />
<ClCompile Include="..\src\game.cpp" /> <ClCompile Include="..\src\game.cpp" />
<ClCompile Include="..\src\globalevent.cpp" /> <ClCompile Include="..\src\globalevent.cpp" />
@ -190,7 +190,7 @@
<PrecompiledHeaderFile>otpch.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>otpch.h</PrecompiledHeaderFile>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\otserv.cpp" /> <ClCompile Include="..\src\otserv.cpp" />
<ClCompile Include="..\src\outfit.cpp" /> <ClCompile Include="..\src\outfit.cpp" />
<ClCompile Include="..\src\outputmessage.cpp" /> <ClCompile Include="..\src\outputmessage.cpp" />
<ClCompile Include="..\src\party.cpp" /> <ClCompile Include="..\src\party.cpp" />
<ClCompile Include="..\src\player.cpp" /> <ClCompile Include="..\src\player.cpp" />
@ -216,7 +216,7 @@
<ClCompile Include="..\src\vocation.cpp" /> <ClCompile Include="..\src\vocation.cpp" />
<ClCompile Include="..\src\waitlist.cpp" /> <ClCompile Include="..\src\waitlist.cpp" />
<ClCompile Include="..\src\wildcardtree.cpp" /> <ClCompile Include="..\src\wildcardtree.cpp" />
<ClCompile Include="..\src\xtea.cpp" /> <ClCompile Include="..\src\xtea.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\src\account.h" /> <ClInclude Include="..\src\account.h" />
@ -240,7 +240,7 @@
<ClInclude Include="..\src\databasetasks.h" /> <ClInclude Include="..\src\databasetasks.h" />
<ClInclude Include="..\src\definitions.h" /> <ClInclude Include="..\src\definitions.h" />
<ClInclude Include="..\src\depotlocker.h" /> <ClInclude Include="..\src\depotlocker.h" />
<ClInclude Include="..\src\events.h" /> <ClInclude Include="..\src\events.h" />
<ClInclude Include="..\src\enums.h" /> <ClInclude Include="..\src\enums.h" />
<ClInclude Include="..\src\fileloader.h" /> <ClInclude Include="..\src\fileloader.h" />
<ClInclude Include="..\src\game.h" /> <ClInclude Include="..\src\game.h" />
@ -265,7 +265,7 @@
<ClInclude Include="..\src\networkmessage.h" /> <ClInclude Include="..\src\networkmessage.h" />
<ClInclude Include="..\src\npc.h" /> <ClInclude Include="..\src\npc.h" />
<ClInclude Include="..\src\otpch.h" /> <ClInclude Include="..\src\otpch.h" />
<ClInclude Include="..\src\outfit.h" /> <ClInclude Include="..\src\outfit.h" />
<ClInclude Include="..\src\outputmessage.h" /> <ClInclude Include="..\src\outputmessage.h" />
<ClInclude Include="..\src\party.h" /> <ClInclude Include="..\src\party.h" />
<ClInclude Include="..\src\player.h" /> <ClInclude Include="..\src\player.h" />
@ -294,7 +294,7 @@
<ClInclude Include="..\src\vocation.h" /> <ClInclude Include="..\src\vocation.h" />
<ClInclude Include="..\src\waitlist.h" /> <ClInclude Include="..\src\waitlist.h" />
<ClInclude Include="..\src\wildcardtree.h" /> <ClInclude Include="..\src\wildcardtree.h" />
<ClInclude Include="..\src\xtea.h" /> <ClInclude Include="..\src\xtea.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">