sync base with whitengold team repo

This commit is contained in:
CodeCodon
2015-07-14 11:11:51 -05:00
parent 21cbf3ec98
commit 20aa133527
11001 changed files with 2196836 additions and 240 deletions
@@ -102,7 +102,7 @@ void CharacterCreationTracker::handleCreateNewCharacter(const ConnectionCreateCh
}
if (creationRecord == m_creations.end())
creationRecord = m_creations.insert(std::make_pair<StationId,CreationRecord*>(msg.getStationId(),new CreationRecord)).first;
creationRecord = m_creations.insert(std::pair<StationId,CreationRecord*>(msg.getStationId(),new CreationRecord)).first;
// - determine starting location
static std::string tutorialPlanetName("tutorial");