Merge pull request #2 from DarkflameUniverse/script-stuff

Script stuff
DarkflameUniverse · May 13, 2024 · 8e1b1c3 · 8e1b1c3
2 parents f8019b7 + 0e4e1de
commit 8e1b1c3
Show file tree

Hide file tree

Showing 7 changed files with 1,981 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -229,6 +229,7 @@ include_directories(
 	"tests/dCommonTests"
 	"tests/dGameTests"
 	"tests/dGameTests/dComponentsTests"
+	"tests/dGameTests/dScriptsTests"
 
 	SYSTEM "thirdparty/magic_enum/include/magic_enum"
 	SYSTEM "thirdparty/raknet/Source"

diff --git a/dGame/dGameMessages/GameMessages.cpp b/dGame/dGameMessages/GameMessages.cpp
@@ -5354,14 +5354,14 @@ void GameMessages::HandleRemoveItemFromInventory(RakNet::BitStream& inStream, En
 		if (eInvType == eInventoryType::MODELS) {
 			item->DisassembleModel(iStackCount);
 		}
-
+		auto lot = item->GetLot();
 		item->SetCount(item->GetCount() - iStackCount, true);
 		Game::entityManager->SerializeEntity(entity);
 
 		auto* missionComponent = entity->GetComponent<MissionComponent>();
 
 		if (missionComponent != nullptr) {
-			missionComponent->Progress(eMissionTaskType::GATHER, item->GetLot(), LWOOBJID_EMPTY, "", -iStackCount);
+			missionComponent->Progress(eMissionTaskType::GATHER, lot, LWOOBJID_EMPTY, "", -iStackCount);
 		}
 	}
 }

diff --git a/tests/dGameTests/CMakeLists.txt b/tests/dGameTests/CMakeLists.txt
@@ -8,18 +8,33 @@ list(APPEND DGAMETEST_SOURCES ${DCOMPONENTS_TESTS})
 add_subdirectory(dGameMessagesTests)
 list(APPEND DGAMETEST_SOURCES ${DGAMEMESSAGES_TESTS})
 
+add_subdirectory(dScriptsTests)
+list(APPEND DGAMETEST_SOURCES ${DSCRIPTS_TESTS})
+
+include_directories(${CMAKE_SOURCE_DIR}/dScripts)
+
 file(COPY ${GAMEMESSAGE_TESTBITSTREAMS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
 # Add the executable.  Remember to add all tests above this!
 add_executable(dGameTests ${DGAMETEST_SOURCES})
 add_dependencies(dGameTests conncpp_tests)
 
+target_include_directories(dGameTests PRIVATE
+	$<TARGET_PROPERTY:dScriptsBase,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsServer,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsAI,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsClient,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsEquipmentScripts,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsEquipmentTriggers,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsZone,INTERFACE_INCLUDE_DIRECTORIES>
+)
+
 # Apple needs some special linkage for the mariadb connector for tests.
 if(APPLE)
-add_custom_command(TARGET dGameTests POST_BUILD
-	COMMAND install_name_tool ARGS -change libmariadbcpp.dylib @rpath/libmariadbcpp.dylib dGameTests
-	COMMAND otool ARGS -L dGameTests
-	WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+	add_custom_command(TARGET dGameTests POST_BUILD
+		COMMAND install_name_tool ARGS -change libmariadbcpp.dylib @rpath/libmariadbcpp.dylib dGameTests
+		COMMAND otool ARGS -L dGameTests
+		WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 endif()
 
 target_link_libraries(dGameTests ${COMMON_LIBRARIES} GTest::gtest_main

diff --git a/tests/dGameTests/dScriptsTests/CMakeLists.txt b/tests/dGameTests/dScriptsTests/CMakeLists.txt
@@ -0,0 +1,11 @@
+set(DSCRIPTS_TESTS
+	"dScriptsTests.cpp"
+	"CppScriptsOld.cpp"
+)
+
+# Get the folder name and prepend it to the files above
+get_filename_component(thisFolderName ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+list(TRANSFORM DSCRIPTS_TESTS PREPEND "${thisFolderName}/")
+
+# Export to parent scope
+set(DSCRIPTS_TESTS ${DSCRIPTS_TESTS} PARENT_SCOPE)