TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #413 from Azaezel/alpha40_ServerAssetValidator

Browse source 
add validation flagging for server objects
This commit is contained in:
Areloch 2020-12-28 00:14:46 -06:00 • committed by GitHub
commit baeabb4a51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Engine/source/T3D/shapeBase.cpp
View file

@ -68,6 +68,7 @@
#include "renderInstance/renderOcclusionMgr.h" #include "renderInstance/renderOcclusionMgr.h"
#include "core/stream/fileStream.h" #include "core/stream/fileStream.h"
#include "T3D/accumulationVolume.h" #include "T3D/accumulationVolume.h"
#include "console/persistenceManager.h"
IMPLEMENT_CO_DATABLOCK_V1(ShapeBaseData); IMPLEMENT_CO_DATABLOCK_V1(ShapeBaseData);
@ -359,6 +360,12 @@ bool ShapeBaseData::preload(bool server, String &errorStr)
} }
} }
} }
PersistenceManager *persistMgr;
if (!Sim::findObject("ServerAssetValidator", persistMgr)) Con::errorf("ServerAssetValidator not found!");
if (server && persistMgr && shapeAssetId == StringTable->EmptyString())
{
persistMgr->setDirty(this);
}
//Legacy catch //Legacy catch
if (shapeName != StringTable->EmptyString()) if (shapeName != StringTable->EmptyString())

2
Templates/BaseGame/game/core/clientServer/scripts/server/server.cs
View file

@ -185,6 +185,7 @@ function createServer(%serverType, %levelAsset)
function onServerCreated() function onServerCreated()
{ {
new PersistenceManager( ServerAssetValidator );
// Server::GameType is sent to the master server. // Server::GameType is sent to the master server.
// This variable should uniquely identify your game and/or mod. // This variable should uniquely identify your game and/or mod.
$Server::GameType = $appName; $Server::GameType = $appName;
@ -208,6 +209,7 @@ function onServerCreated()
// Keep track of when the game started // Keep track of when the game started
$Game::StartTime = $Sim::Time; $Game::StartTime = $Sim::Time;
ServerAssetValidator.saveDirty();
} }
/// Shut down the server /// Shut down the server