Add win/lose BGAnimations
Clean up Attack data structures
This commit is contained in:
@@ -379,13 +379,13 @@ void GameState::RestoreSelectedOptions()
|
||||
}
|
||||
|
||||
|
||||
void GameState::LaunchAttack( PlayerNumber target, ActiveAttack aa )
|
||||
void GameState::LaunchAttack( PlayerNumber target, Attack a )
|
||||
{
|
||||
// search for an open slot
|
||||
for( unsigned s=0; s<NUM_INVENTORY_SLOTS; s++ )
|
||||
if( m_ActiveAttacks[target][s].fSecsRemaining <= 0 )
|
||||
{
|
||||
m_ActiveAttacks[target][s] = aa;
|
||||
m_ActiveAttacks[target][s] = a;
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -400,6 +400,16 @@ void GameState::RemoveAllActiveAttacks()
|
||||
}
|
||||
}
|
||||
|
||||
void GameState::RemoveAllInventory()
|
||||
{
|
||||
for( int p=0; p<NUM_PLAYERS; p++ )
|
||||
for( unsigned s=0; s<NUM_INVENTORY_SLOTS; s++ )
|
||||
{
|
||||
m_Inventory[p][s].fSecsRemaining = 0;
|
||||
m_Inventory[p][s].sModifier = "";
|
||||
}
|
||||
}
|
||||
|
||||
void GameState::RebuildPlayerOptionsFromActiveAttacks( PlayerNumber pn )
|
||||
{
|
||||
// rebuild player options
|
||||
|
||||
Reference in New Issue
Block a user