Merge branch 'main' into tibia14

opentibiabr · Dec 9, 2024 · 011b203 · 011b203
2 parents 6e3f6a7 + e325965
commit 011b203
Show file tree

Hide file tree

Showing 15 changed files with 309 additions and 357 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,6 +37,11 @@ endif()
 # *****************************************************************************
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 
+# Configure build options for compatibility with commodity CPUs
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64 -mtune=generic -mno-avx -mno-sse4")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=x86-64 -mtune=generic -mno-avx -mno-sse4")
+
+
 # *****************************************************************************
 # Include cmake tools
 # *****************************************************************************

diff --git a/data-canary/scripts/creaturescripts/player_death.lua b/data-canary/scripts/creaturescripts/player_death.lua
diff --git a/data-otservbr-global/scripts/creaturescripts/others/player_death.lua b/data-otservbr-global/scripts/creaturescripts/others/player_death.lua
diff --git a/data-otservbr-global/scripts/quests/svargrond_arena/creaturescripts_player_death.lua b/data-otservbr-global/scripts/quests/svargrond_arena/creaturescripts_player_death.lua
@@ -0,0 +1,9 @@
+local svargrondArenaPlayerDeath = CreatureEvent("SvargrondArenaPlayerDeath")
+
+function svargrondArenaPlayerDeath.onDeath(player, corpse, killer, mostDamageKiller, unjustified, mostDamageUnjustified)
+	if player:getStorageValue(Storage.Quest.U8_0.BarbarianArena.PitDoor) > 0 then
+		player:setStorageValue(Storage.Quest.U8_0.BarbarianArena.PitDoor, 0)
+	end
+end
+
+svargrondArenaPlayerDeath:register()
diff --git a/...ripts/player/adventure_blessing_login.lua → ...turescripts/player/adventure_blessing.lua b/...ripts/player/adventure_blessing_login.lua → ...turescripts/player/adventure_blessing.lua