Merge branch 'DarkflameUniverse:main' into PetFixes

This commit is contained in:
jadebenn
2024-01-04 21:11:27 -06:00
committed by GitHub
140 changed files with 1576 additions and 1190 deletions

View File

@@ -7,7 +7,6 @@ set(DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL
"ForceVolumeServer.cpp"
"GrowingFlower.cpp"
"ImaginationBackpackHealServer.cpp"
"InvalidScript.cpp"
"MailBoxServer.cpp"
"NjRailSwitch.cpp"
"PetDigServer.cpp"
@@ -28,4 +27,6 @@ foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL_NINJAGO})
set(DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL ${DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL} "Ninjago/${file}")
endforeach()
set(DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL ${DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL} PARENT_SCOPE)
add_library(dScriptsServerMapGeneral ${DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL})
target_include_directories(dScriptsServerMapGeneral PUBLIC "." "Ninjago")
target_precompile_headers(dScriptsServerMapGeneral REUSE_FROM dScriptsBase)

View File

@@ -1 +0,0 @@
#include "InvalidScript.h"

View File

@@ -1,6 +0,0 @@
#pragma once
#include "CppScripts.h"
class InvalidScript : public CppScripts::Script
{
};