source/enemy/nanemone.cpp

@@ -133,6 +133,7 @@ void CNpcEnemy::processCloseAnemone1Attack( int _frames )
 					CProjectile *projectile;
 					projectile = new( "test projectile" ) CProjectile;
 					projectile->init( Pos, m_heading );
+					projectile->setLayerCollision( m_layerCollision );
 
 					m_controlFunc = NPC_CONTROL_MOVEMENT;
 					m_timerTimer = GameState::getOneSecondInFrames();
@@ -200,6 +201,7 @@ void CNpcEnemy::processCloseAnemone2Attack( int _frames )
 
 			projectile = new( "anemone lev2 projectile" ) CProjectile;
 			projectile->init( spikePos, heading, CProjectile::PROJECTILE_FIXED, CProjectile::PROJECTILE_INFINITE_LIFE );
+			projectile->setLayerCollision( m_layerCollision );
 
 			addChild( projectile );
 		}
@@ -230,6 +232,7 @@ void CNpcEnemy::processCloseAnemone3Attack( int _frames )
 							CProjectile::PROJECTILE_GAS_CLOUD,
 							CProjectile::PROJECTILE_FINITE_LIFE,
 							lifetime * GameState::getOneSecondInFrames() );
+		projectile->setLayerCollision( m_layerCollision );
 
 		m_controlFunc = NPC_CONTROL_MOVEMENT;
 		m_timerFunc = NPC_TIMER_ATTACK_DONE;

source/enemy/ndogfish.cpp

@@ -136,6 +136,7 @@ void CNpcEnemy::processStandardIronDogfishAttack( int _frames )
 			CProjectile *projectile;
 			projectile = new( "test projectile" ) CProjectile;
 			projectile->init( Pos, headingToPlayer );
+			projectile->setLayerCollision( m_layerCollision );
 
 			m_state++;
 

source/enemy/nfdutch.cpp

@@ -151,6 +151,7 @@ void CNpcEnemy::processCloseFlyingDutchmanAttack( int _frames )
 					CProjectile *projectile;
 					projectile = new( "test projectile" ) CProjectile;
 					projectile->init( Pos, heading );
+					projectile->setLayerCollision( m_layerCollision );
 
 					m_controlFunc = NPC_CONTROL_MOVEMENT;
 					m_movementTimer = GameState::getOneSecondInFrames() * 3;

source/enemy/ngpirate.cpp

@@ -68,6 +68,7 @@ void CNpcEnemy::processCloseGhostPirateAttack( int _frames )
 
 			projectile = new( "test projectile" ) CProjectile;
 			projectile->init( Pos, heading );
+			projectile->setLayerCollision( m_layerCollision );
 		}
 	}
 	else if ( m_extendDir == EXTEND_DOWN )

source/enemy/npc.cpp

@@ -437,6 +437,7 @@ void CNpcEnemy::postInit()
 			CProjectile *projectile;
 			projectile = new ( "eyeball projectile" ) CProjectile;
 			projectile->init( Pos, m_fireHeading, CProjectile::PROJECTILE_FIXED, CProjectile::PROJECTILE_INFINITE_LIFE );
+			projectile->setLayerCollision( m_layerCollision );
 
 			addChild( projectile );
 
@@ -461,6 +462,7 @@ void CNpcEnemy::postInit()
 
 				projectile = new( "anemone lev2 projectile" ) CProjectile;
 				projectile->init( spikePos, heading, CProjectile::PROJECTILE_FIXED, CProjectile::PROJECTILE_INFINITE_LIFE );
+				projectile->setLayerCollision( m_layerCollision );
 
 				addChild( projectile );
 			}

source/enemy/nsshark.cpp

@@ -59,6 +59,7 @@ void CNpcEnemy::processSubSharkMovement( int _frames )
 			CProjectile *projectile;
 			projectile = new( "test projectile" ) CProjectile;
 			projectile->init( Pos, 1024 );
+			projectile->setLayerCollision( m_layerCollision );
 
 			m_salvoCount--;
 

source/projectl/projectl.cpp

@@ -229,6 +229,13 @@ void CProjectile::think(int _frames)
 		}
 
 		case PROJECTILE_USER_SEEK:
+		{
+			if ( m_layerCollision->Get( Pos.vx >> 4, Pos.vy >> 4 ) )
+			{
+				shutdown();
+				delete this;
+			}
+			else
 			{
 				switch( m_state )
 				{
@@ -256,6 +263,7 @@ void CProjectile::think(int _frames)
 						break;
 					}
 				}
+			}
 
 			break;
 		}
@@ -282,9 +290,17 @@ void CProjectile::think(int _frames)
 
 		case PROJECTILE_DUMBFIRE:
 		default:
+		{
+			if ( m_layerCollision->Get( Pos.vx >> 4, Pos.vy >> 4 ) )
+			{
+				shutdown();
+				delete this;
+			}
+			else
 			{
 				Pos.vx += ( _frames * 3 * rcos( m_heading ) ) >> 12;
 				Pos.vy += ( _frames * 3 * rsin( m_heading ) ) >> 12;
+			}
 
 			break;
 		}
@@ -415,9 +431,17 @@ void CPlayerProjectile::think(int _frames)
 	{
 		case PLAYER_PROJECTILE_DUMBFIRE:
 		default:
+		{
+			if ( m_layerCollision->Get( Pos.vx >> 4, Pos.vy >> 4 ) )
+			{
+				shutdown();
+				delete this;
+			}
+			else
 			{
 				Pos.vx += ( _frames * 3 * rcos( m_heading ) ) >> 12;
 				Pos.vy += ( _frames * 3 * rsin( m_heading ) ) >> 12;
+			}
 
 			break;
 		}

source/projectl/projectl.h

@@ -56,6 +56,10 @@ public:
 	void				setState( PROJECTILE_STATE newState );
 	void				setLifeTime( PROJECTILE_LIFETIME_TYPE lifeType );
 	void				setPosition( DVECTOR newPos );
+	void				setLayerCollision( class CLayerCollision *_layer )		{m_layerCollision=_layer;}
+
+private:
+	class CLayerCollision	*m_layerCollision;
 
 protected:
 	DVECTOR				getScreenOffset();
@@ -100,6 +104,10 @@ public:
 	PLAYER_PROJECTILE_MOVEMENT_TYPE		getMovementType();
 	void				setLifeTime( PLAYER_PROJECTILE_LIFETIME_TYPE lifeType );
 	void				setPosition( DVECTOR newPos );
+	void				setLayerCollision( class CLayerCollision *_layer )		{m_layerCollision=_layer;}
+
+private:
+	class CLayerCollision	*m_layerCollision;
 
 protected:
 	DVECTOR				getScreenOffset();