NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic

This commit is contained in:
Linda Andersson 2014-02-26 14:55:39 +01:00
parent 74456a4d80 4cd91fadad
commit c235c0309c
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Code/Game/GameLogic/Level.cpp
View File

@ -71,7 +71,7 @@ Object* Level::CreateGameObj(ObjectHeader* obj, ICustomBody* rigidBody)
Oyster::Math::Float dmg = 120; Oyster::Math::Float dmg = 120;
Oyster::Math::Float force = 500; Oyster::Math::Float force = 500;
Oyster::Math::Float radie = 3; Oyster::Math::Float radie = 3;
gameObj = new ExplosiveCrate(rigidBody, (ObjectSpecialType)obj->specialTypeID, objIDCounter++, dmg, force, radie); gameObj = new ExplosiveCrate(rigidBody, (ObjectSpecialType)obj->specialTypeID, objIDCounter, dmg, force, radie);
} }
break; break;
//case ObjectSpecialType_BlueExplosiveBox: //case ObjectSpecialType_BlueExplosiveBox:
@ -228,9 +228,6 @@ bool Level::InitiateLevel(std::wstring levelPath)
std::string levelName = LevelObjData->levelName; std::string levelName = LevelObjData->levelName;
// LevelObjData->worldSize; // LevelObjData->worldSize;
//LevelMetaData is not an object.
--this->objIDCounter;
} }
break; break;
case ObjectType::ObjectType_Static: case ObjectType::ObjectType_Static: