Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer

This commit is contained in:
Dander7BD 2014-02-14 15:42:46 +01:00
commit 2de045524a
1 changed files with 3 additions and 3 deletions

View File

@ -108,11 +108,11 @@ Object* Level::createGameObj(ObjectHeader* obj, ICustomBody* rigidBody)
gameObj = new Portal(rigidBody, (ObjectSpecialType)obj->specialTypeID, objID++, destination); gameObj = new Portal(rigidBody, (ObjectSpecialType)obj->specialTypeID, objID++, destination);
} }
break; break;
case ObjectSpecialType_SpawnPoint: //case ObjectSpecialType_SpawnPoint:
{ //{
// save // save
} //}
break; break;
case ObjectSpecialType_Player: case ObjectSpecialType_Player:
{ {