From beeacf69d68f366cbbc9701bb7dabd23a898c8c7 Mon Sep 17 00:00:00 2001 From: Aki Date: Fri, 5 Apr 2024 20:50:15 +0200 Subject: dump_missions flag is in its own tu now --- StarsEx/CMakeLists.txt | 2 +- StarsEx/DumpMissions.cpp | 10 ++++++++++ StarsEx/DumpMissions.h | 10 ++++++++++ StarsEx/test/dump_missions.cpp | 1 - Starserver/Main.cpp | 3 --- Starshatter/Main.cpp | 2 +- 6 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 StarsEx/DumpMissions.cpp create mode 100644 StarsEx/DumpMissions.h delete mode 100644 StarsEx/test/dump_missions.cpp diff --git a/StarsEx/CMakeLists.txt b/StarsEx/CMakeLists.txt index 3e9dc83..2f66d84 100644 --- a/StarsEx/CMakeLists.txt +++ b/StarsEx/CMakeLists.txt @@ -70,6 +70,7 @@ add_library( DriveSprite.cpp Drone.cpp DropShipAI.cpp + DumpMissions.cpp EditBox.cpp Element.cpp Encrypt.cpp @@ -334,7 +335,6 @@ add_executable( test/AudioConfig.cpp test/ShipStats.cpp test/Stardate.cpp - test/dump_missions.cpp ) generate_emulator(${PROJECT_NAME}_test LIBS Opcode ArchiveEx) target_link_libraries(${PROJECT_NAME}_test PRIVATE ${PROJECT_NAME} GTest::gtest_main) diff --git a/StarsEx/DumpMissions.cpp b/StarsEx/DumpMissions.cpp new file mode 100644 index 0000000..d502d46 --- /dev/null +++ b/StarsEx/DumpMissions.cpp @@ -0,0 +1,10 @@ +/* Starshatter: The Open Source Project + Copyright (c) 2021-2024, Starshatter: The Open Source Project Contributors + Copyright (c) 2011-2012, Starshatter OpenSource Distribution Contributors + Copyright (c) 1997-2006, Destroyer Studios LLC. +*/ + +#include "DumpMissions.h" + + +int dump_missions = 0; diff --git a/StarsEx/DumpMissions.h b/StarsEx/DumpMissions.h new file mode 100644 index 0000000..41ad313 --- /dev/null +++ b/StarsEx/DumpMissions.h @@ -0,0 +1,10 @@ +/* Starshatter: The Open Source Project + Copyright (c) 2021-2024, Starshatter: The Open Source Project Contributors + Copyright (c) 2011-2012, Starshatter OpenSource Distribution Contributors + Copyright (c) 1997-2006, Destroyer Studios LLC. +*/ + +#pragma once + + +extern int dump_missions; diff --git a/StarsEx/test/dump_missions.cpp b/StarsEx/test/dump_missions.cpp deleted file mode 100644 index a0e5ffc..0000000 --- a/StarsEx/test/dump_missions.cpp +++ /dev/null @@ -1 +0,0 @@ -int dump_missions = 0; diff --git a/Starserver/Main.cpp b/Starserver/Main.cpp index 43a567e..d9d409c 100644 --- a/Starserver/Main.cpp +++ b/Starserver/Main.cpp @@ -14,9 +14,6 @@ #include "StarServer.h" -int dump_missions = 0; - - int main(int, char*[]) { diff --git a/Starshatter/Main.cpp b/Starshatter/Main.cpp index 58fb891..88f052a 100644 --- a/Starshatter/Main.cpp +++ b/Starshatter/Main.cpp @@ -21,6 +21,7 @@ #include "Color.h" #include "DataLoader.h" +#include "DumpMissions.h" #include "Pcx.h" #include "Encrypt.h" #include "FormatUtil.h" @@ -31,7 +32,6 @@ extern int VD3D_describe_things; -int dump_missions = 0; static void -- cgit v1.1