revert(world): the edit mode world

This reverts commit f6914940. The client's level editor builds a zone's objects
itself from its own files, so a world server that constructs none of them has no use.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-11-10 18:37:23 -06:00
parent a4c4c24a5c
commit 3526ee2eb0
14 changed files with 14 additions and 219 deletions

View File

@@ -98,11 +98,6 @@ CppScripts::Script* const ScriptComponent::GetScript() {
void ScriptComponent::SetScript(const std::string& scriptName) {
// Scripts are managed by the CppScripts class and are effecitvely singletons
// and they may also be used by other script components so DON'T delete them.
// Edit mode (docs/EditMode.md): the zone control object stays, its zone script does not run
if (Game::zoneManager && Game::zoneManager->GetEditMode() && m_Parent->GetObjectID() == dZoneManager::ZONE_CONTROL_OBJECT_ID) {
m_Script = CppScripts::GetInvalidScript();
return;
}
m_Script = CppScripts::GetScript(m_Parent, scriptName);
}

View File

@@ -118,8 +118,7 @@ namespace GameMessages {
std::vector<Entity*> racingControllers = Game::entityManager->GetEntitiesByComponent(eReplicaComponentType::RACING_CONTROL);
for (Entity* racingController : racingControllers) {
auto* racingComponent = racingController->GetComponent<RacingControlComponent>();
// Edit mode: a race track's zone control doesn't take the GM into a race (or send them out for having no car)
if (racingComponent != nullptr && !Game::zoneManager->GetEditMode()) {
if (racingComponent != nullptr) {
racingComponent->OnPlayerLoaded(entity);
}
}

View File

@@ -5,7 +5,6 @@ set(DGAME_DUTILITIES_SOURCES "BrickDatabase.cpp"
"CheatDetection.cpp"
"DashboardActions.cpp"
"EconomyLedger.cpp"
"EditMode.cpp"
"DashboardNotify.cpp"
"GUID.cpp"
"LiveEvents.cpp"

View File

@@ -1,13 +0,0 @@
#include "EditMode.h"
#include <algorithm>
#include "CharacterComponent.h"
#include "Game.h"
#include "GeneralUtils.h"
#include "dConfig.h"
eGameMasterLevel EditMode::RequiredLevel() {
const auto level = GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("editor_gm_level")).value_or(CharacterComponent::DEFAULT_EDITOR_GM_LEVEL);
return static_cast<eGameMasterLevel>(std::clamp<uint32_t>(level, 1, 9));
}

View File

@@ -1,18 +0,0 @@
#pragma once
#include "eGameMasterLevel.h"
/**
* Edit mode (docs/EditMode.md): a private instance of a zone whose world server constructs none of the zone's level
* objects, spawners or triggers, for editing the zone in the game client. Only the plumbing is here; nothing starts
* such an instance yet.
*/
namespace EditMode {
// Whether an account may be in an edit mode instance
inline bool MayEnter(const eGameMasterLevel accountLevel, const eGameMasterLevel requiredLevel) {
return accountLevel != eGameMasterLevel::CIVILIAN && accountLevel >= requiredLevel;
}
// The account GM level an edit mode instance lets in: editor_gm_level (9 unless set)
eGameMasterLevel RequiredLevel();
}