mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-13 15:44:36 +00:00
Merge remote-tracking branch 'upstream/development' into change-to-use-libsndfile
This commit is contained in:
commit
ee9ac81281
2 changed files with 2 additions and 1 deletions
|
|
@ -362,7 +362,6 @@ void Dictionary::remove(Dictionary::Entry *ent)
|
||||||
|
|
||||||
*walk = (ent->nextEntry);
|
*walk = (ent->nextEntry);
|
||||||
|
|
||||||
destructInPlace(ent);
|
|
||||||
hashTable->mChunker.free(ent);
|
hashTable->mChunker.free(ent);
|
||||||
|
|
||||||
hashTable->count--;
|
hashTable->count--;
|
||||||
|
|
|
||||||
|
|
@ -169,6 +169,8 @@ function createServer(%serverType, %levelAsset)
|
||||||
schedule(0,0,startHeartbeat);
|
schedule(0,0,startHeartbeat);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
new SimGroup(ServerGroup);
|
||||||
|
|
||||||
moduleExec("onCreateGameServer", "Core");
|
moduleExec("onCreateGameServer", "Core");
|
||||||
moduleExec("onCreateGameServer", "Game");
|
moduleExec("onCreateGameServer", "Game");
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue