This commit is contained in:
Charles 2001-06-26 16:00:36 +00:00
parent fa4c0687eb
commit 96d913c874
3 changed files with 5 additions and 4 deletions

View file

@ -31,13 +31,14 @@ CEnemyAsSpriteProjectile *CEnemyAsSpriteProjectile::Create()
{ {
CEnemyAsSpriteProjectile *projectile; CEnemyAsSpriteProjectile *projectile;
projectile = (CEnemyAsSpriteProjectile*)CThingManager::GetThing(TYPE_PLAYERPROJECTILE,0); projectile = (CEnemyAsSpriteProjectile*)CThingManager::GetThing(TYPE_PLAYERPROJECTILE,1);
if ( !projectile ) if ( !projectile )
{ {
projectile = new ("player projectile") CEnemyAsSpriteProjectile; projectile = new ("player projectile") CEnemyAsSpriteProjectile;
} }
ASSERT(projectile); ASSERT(projectile);
projectile->setThingSubType(1);
return( projectile ); return( projectile );
} }

View file

@ -64,6 +64,7 @@ CProjectile *CProjectile::Create()
} }
ASSERT(projectile); ASSERT(projectile);
projectile->setThingSubType(0);
return( projectile ); return( projectile );
} }
@ -76,7 +77,6 @@ void CProjectile::init()
m_spriteFrame = FRM__SPIKE; m_spriteFrame = FRM__SPIKE;
setThingSubType(0);
m_initHeading = m_heading = 0; m_initHeading = m_heading = 0;
m_lifetime = GameState::getOneSecondInFrames() * 2; m_lifetime = GameState::getOneSecondInFrames() * 2;
m_movementType = PROJECTILE_DUMBFIRE; m_movementType = PROJECTILE_DUMBFIRE;
@ -484,6 +484,7 @@ CPlayerProjectile *CPlayerProjectile::Create()
} }
ASSERT(projectile); ASSERT(projectile);
projectile->setThingSubType(0);
return( projectile ); return( projectile );
} }
@ -493,7 +494,6 @@ CPlayerProjectile *CPlayerProjectile::Create()
void CPlayerProjectile::init() void CPlayerProjectile::init()
{ {
CPlayerProjectileThing::init(); CPlayerProjectileThing::init();
setThingSubType(0);
m_heading = 0; m_heading = 0;
m_lifetime = GameState::getOneSecondInFrames() * 2; m_lifetime = GameState::getOneSecondInFrames() * 2;
m_movementType = PLAYER_PROJECTILE_DUMBFIRE; m_movementType = PLAYER_PROJECTILE_DUMBFIRE;

View file

@ -104,7 +104,7 @@ public:
}; };
enum enum
{ // For Dynamic ThingCache { // For Dynamic ThingCache
MAX_SUBTYPE =1, MAX_SUBTYPE =2,
}; };
static CPlayerProjectile *Create(); static CPlayerProjectile *Create();