Squareville/wonderland-server
1
0
Fork 0
mirror of https://github.com/Squareville/wonderland-server.git synced 2025-12-16 20:34:54 -06:00
Code Issues Packages Projects Releases 1 Wiki Activity

update from main

Browse Source
This commit is contained in:
David Markowitz
2024-03-22 14:28:08 -07:00
parent 56b0e65eb7
commit f78c0d3b20
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dScripts/CMakeLists.txt
View File

@@ -46,6 +46,7 @@ add_library(dScripts STATIC
$<TARGET_OBJECTS:dScriptsClient>
$<TARGET_OBJECTS:dScriptsEquipmentScripts>
$<TARGET_OBJECTS:dScriptsEquipmentTriggers>
$<TARGET_OBJECTS:dScriptsNewContent>
$<TARGET_OBJECTS:dScriptsZone>
"CppScripts.cpp"
)
@@ -57,6 +58,7 @@ target_include_directories(dScripts PRIVATE
$<TARGET_PROPERTY:dScriptsClient,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:dScriptsEquipmentScripts,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:dScriptsEquipmentTriggers,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:dScriptsNewContent,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:dScriptsZone,INTERFACE_INCLUDE_DIRECTORIES>
)
target_precompile_headers(dScripts REUSE_FROM dScriptsBase)

2
dScripts/newcontent/CMakeLists.txt
View File

@@ -6,6 +6,6 @@ foreach(file ${DSCRIPTS_SOURCES_NEWCONTENT_SERVER})
set(DSCRIPTS_SOURCES_NEWCONTENT ${DSCRIPTS_SOURCES_NEWCONTENT} "server/${file}")
endforeach()
add_library(dScriptsNewContent STATIC ${DSCRIPTS_SOURCES_NEWCONTENT})
add_library(dScriptsNewContent OBJECT ${DSCRIPTS_SOURCES_NEWCONTENT})
target_include_directories(dScriptsNewContent PUBLIC "." "server")
target_precompile_headers(dScriptsNewContent REUSE_FROM dScriptsBase)

9
vanity/NPC.xml
View File

@@ -43,15 +43,6 @@
</locations>
</zone>
</npc>
<npc name="Pigeon - Cancer Butt-Kicker" lot="7752">
<equipment>37700, 37701, 37702, 37703, 37704, 7284</equipment>
<phrases> </phrases>
<zone id="1204">
<locations>
<location x="82.0" y="229.0" z="37.0" rw="0.698" rx="0.0" ry="-0.7155" rz="0.0"/>
</locations>
</zone>
</npc>
<npc name="averysumner - Destroyer of Worlds" lot="11235">
<equipment></equipment>
<phrases>