Browse Source

Merge remote-tracking branch 'upstream/development' into change-to-use-libsndfile

marauder2k7 1 năm trước cách đây
mục cha
commit
ee9ac81281

+ 0 - 1
Engine/source/console/consoleInternal.cpp

@@ -362,7 +362,6 @@ void Dictionary::remove(Dictionary::Entry *ent)
 
    *walk = (ent->nextEntry);
 
-   destructInPlace(ent);
    hashTable->mChunker.free(ent);
 
    hashTable->count--;

+ 2 - 0
Templates/BaseGame/game/core/clientServer/scripts/server/server.tscript

@@ -169,6 +169,8 @@ function createServer(%serverType, %levelAsset)
          schedule(0,0,startHeartbeat);
    }
    
+   new SimGroup(ServerGroup);
+   
    moduleExec("onCreateGameServer", "Core");
    moduleExec("onCreateGameServer", "Game");