Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Daveo 2001-05-25 19:04:29 +00:00
parent d6e06934d0
commit 68ca825123
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/level/level.cpp
View File

@ -284,6 +284,7 @@ void CLevel::initLayers()
{ {
sLayerHdr *Layer=(sLayerHdr*)MakePtr(LevelHdr,LevelHdr->CollisionLayer); sLayerHdr *Layer=(sLayerHdr*)MakePtr(LevelHdr,LevelHdr->CollisionLayer);
CollisionLayer=new ("Collision Layer") CLayerCollision(Layer); CollisionLayer=new ("Collision Layer") CLayerCollision(Layer);
CGameScene::setCollision(CollisionLayer);
} }
else else
{ {
@ -490,7 +491,6 @@ void CLevel::initThings(int _respawningLevel)
{ {
CNpcEnemy *enemy; CNpcEnemy *enemy;
enemy=CNpcEnemy::Create(ThisActor); enemy=CNpcEnemy::Create(ThisActor);
enemy->setLayerCollision( getCollisionLayer() );
enemy->setupWaypoints( ThisActor ); enemy->setupWaypoints( ThisActor );
enemy->postInit(); enemy->postInit();
@ -505,7 +505,6 @@ void CLevel::initThings(int _respawningLevel)
{ {
CNpcFriend *friendNpc; CNpcFriend *friendNpc;
friendNpc=CNpcFriend::Create(ThisActor); friendNpc=CNpcFriend::Create(ThisActor);
friendNpc->setLayerCollision( getCollisionLayer() );
friendNpc->postInit(); friendNpc->postInit();
} }
break; break;
@ -524,7 +523,6 @@ void CLevel::initThings(int _respawningLevel)
sThingPlatform *ThisPlatform = platformList[platformNum]; sThingPlatform *ThisPlatform = platformList[platformNum];
CNpcPlatform *platform; CNpcPlatform *platform;
platform = CNpcPlatform::Create( ThisPlatform ); platform = CNpcPlatform::Create( ThisPlatform );
platform->setLayerCollision( getCollisionLayer() );
platform->postInit(); platform->postInit();
if ( ThisPlatform->Speed ) if ( ThisPlatform->Speed )
@ -542,7 +540,6 @@ void CLevel::initThings(int _respawningLevel)
sThingHazard *ThisHazard = hazardList[hazardNum]; sThingHazard *ThisHazard = hazardList[hazardNum];
CNpcHazard *hazard; CNpcHazard *hazard;
hazard = CNpcHazard::Create( ThisHazard ); hazard = CNpcHazard::Create( ThisHazard );
hazard->setLayerCollision( getCollisionLayer() );
if ( ThisHazard->Respawn ) if ( ThisHazard->Respawn )
{ {
hazard->setRespawnRate( ThisHazard->Respawn ); hazard->setRespawnRate( ThisHazard->Respawn );

3
source/player/pmbloon.cpp
View File

@ -25,6 +25,7 @@
#include "level\level.h" #include "level\level.h"
#endif #endif
#include "game/game.h"
/* Std Lib /* Std Lib
------- */ ------- */
@ -120,7 +121,7 @@ void CPlayerModeBalloon::render(DVECTOR *_pos)
pos.vx=_pos->vx+balloonx; pos.vx=_pos->vx+balloonx;
pos.vy=_pos->vy+balloony; 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);
} }
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------