walkero
/
starfighter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed cash being made available on interceptions in Nightmare mode.

This commit is contained in:
onpon4 2015-03-13 19:11:14 -04:00
parent 645513cbf9
commit b44037f05a
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/collectable.cpp
View File

@ -77,17 +77,6 @@ void addCollectable(float x, float y, int type, int value, int life)
if (value == 0) if (value == 0)
return; // don't bother! return; // don't bother!
/*
No cash, powerups, or ammo on interceptions. Stops point leeching(!)
*/
if ((currentGame.area == MAX_MISSIONS - 1) &&
((type == P_CASH) || (type == P_PLASMA_AMMO) || (type == P_ROCKET) ||
(type == P_PLASMA_DAMAGE) || (type == P_PLASMA_SHOT) ||
(type == P_PLASMA_RATE) || (type == P_SUPER)))
{
return;
}
// If plasma rate is at max, convert plasma rate powerup to ammo. // If plasma rate is at max, convert plasma rate powerup to ammo.
if (type == P_PLASMA_RATE) if (type == P_PLASMA_RATE)
{ {
@ -146,6 +135,17 @@ void addCollectable(float x, float y, int type, int value, int life)
} }
} }
/*
No cash, powerups, or ammo on interceptions. Stops point leeching(!)
*/
if ((currentGame.area == MAX_MISSIONS - 1) &&
((type == P_CASH) || (type == P_PLASMA_AMMO) || (type == P_ROCKET) ||
(type == P_PLASMA_DAMAGE) || (type == P_PLASMA_SHOT) ||
(type == P_PLASMA_RATE) || (type == P_SUPER)))
{
return;
}
collectables *collectable = new collectables; collectables *collectable = new collectables;
collectable->next = NULL; collectable->next = NULL;