diff --git a/source/level/level.cpp b/source/level/level.cpp index d89cd4717..07879fd98 100644 --- a/source/level/level.cpp +++ b/source/level/level.cpp @@ -284,6 +284,7 @@ void CLevel::initLayers() { sLayerHdr *Layer=(sLayerHdr*)MakePtr(LevelHdr,LevelHdr->CollisionLayer); CollisionLayer=new ("Collision Layer") CLayerCollision(Layer); + CGameScene::setCollision(CollisionLayer); } else { @@ -490,7 +491,6 @@ void CLevel::initThings(int _respawningLevel) { CNpcEnemy *enemy; enemy=CNpcEnemy::Create(ThisActor); - enemy->setLayerCollision( getCollisionLayer() ); enemy->setupWaypoints( ThisActor ); enemy->postInit(); @@ -505,7 +505,6 @@ void CLevel::initThings(int _respawningLevel) { CNpcFriend *friendNpc; friendNpc=CNpcFriend::Create(ThisActor); - friendNpc->setLayerCollision( getCollisionLayer() ); friendNpc->postInit(); } break; @@ -524,7 +523,6 @@ void CLevel::initThings(int _respawningLevel) sThingPlatform *ThisPlatform = platformList[platformNum]; CNpcPlatform *platform; platform = CNpcPlatform::Create( ThisPlatform ); - platform->setLayerCollision( getCollisionLayer() ); platform->postInit(); if ( ThisPlatform->Speed ) @@ -542,7 +540,6 @@ void CLevel::initThings(int _respawningLevel) sThingHazard *ThisHazard = hazardList[hazardNum]; CNpcHazard *hazard; hazard = CNpcHazard::Create( ThisHazard ); - hazard->setLayerCollision( getCollisionLayer() ); if ( ThisHazard->Respawn ) { hazard->setRespawnRate( ThisHazard->Respawn ); diff --git a/source/player/pmbloon.cpp b/source/player/pmbloon.cpp index fc9f716cc..07ff08897 100644 --- a/source/player/pmbloon.cpp +++ b/source/player/pmbloon.cpp @@ -25,6 +25,7 @@ #include "level\level.h" #endif +#include "game/game.h" /* Std Lib ------- */ @@ -120,7 +121,7 @@ void CPlayerModeBalloon::render(DVECTOR *_pos) pos.vx=_pos->vx+balloonx; pos.vy=_pos->vy+balloony; - m_player->getSpriteBank()->printFT4Scaled(FRM__BALLOON,pos.vx,pos.vy,0,0,5,balloonsize); + CGameScene::getSpriteBank()->printFT4Scaled(FRM__BALLOON,pos.vx,pos.vy,0,0,5,balloonsize); } /*----------------------------------------------------------------------