diff --git a/source/enemy/nanemone.cpp b/source/enemy/nanemone.cpp index 663b7ffe4..90ea36307 100644 --- a/source/enemy/nanemone.cpp +++ b/source/enemy/nanemone.cpp @@ -44,14 +44,14 @@ void CNpc::processCloseAnemone1Attack( int _frames ) s16 headingToPlayer = ratan2( yDist, xDist ); - decDir = m_baseHeading - headingToPlayer; + decDir = m_fireHeading - headingToPlayer; if ( decDir < 0 ) { decDir += ONE; } - incDir = headingToPlayer - m_baseHeading; + incDir = headingToPlayer - m_fireHeading; if ( incDir < 0 ) { @@ -136,7 +136,7 @@ void CNpc::processCloseAnemone2Attack( int _frames ) for ( fireLoop = 0 ; fireLoop < 5 ; fireLoop++ ) { - heading = m_baseHeading - 1024 + ( fireLoop * 512 ); + heading = m_heading - 1024 + ( fireLoop * 512 ); heading %= 4096; projectile = new( "test projectile" ) CProjectile; diff --git a/source/enemy/npc.cpp b/source/enemy/npc.cpp index 6cd550c06..7113f11cd 100644 --- a/source/enemy/npc.cpp +++ b/source/enemy/npc.cpp @@ -385,7 +385,7 @@ void CNpc::init() { m_type = NPC_ANEMONE_1; - m_heading = m_baseHeading = 0; + m_heading = m_fireHeading = 0; m_movementTimer = 0; m_timerTimer = 0; m_velocity = 0; diff --git a/source/enemy/npc.h b/source/enemy/npc.h index aa87a8126..32441e592 100644 --- a/source/enemy/npc.h +++ b/source/enemy/npc.h @@ -208,7 +208,7 @@ protected: NPC_SENSOR_FUNC m_sensorFunc; CNpcPath m_npcPath; s32 m_heading; - s32 m_baseHeading; + s32 m_fireHeading; s32 m_movementTimer; s32 m_velocity; bool m_evadeClockwise;