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

Revert "Added usage of plasma ammo by the charger cannon." 

This reverts commit 05e645aeff.
This commit is contained in:
onpon4 2016-01-07 05:36:49 -05:00
parent e405b6eb0f
commit f7aab48a56
3 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/game.cpp
View File

@ -1209,10 +1209,7 @@ static void game_doPlayer()
// With ammo cheat, cause the charge cannon to
// fire at full blast immediately.
if (engine.cheatAmmo)
{
player_chargerAlloc = 200;
player.ammo[1] = 200;
}
if (game.difficulty == DIFFICULTY_ORIGINAL)
{
@ -1220,32 +1217,20 @@ static void game_doPlayer()
}
else
{
player.ammo[1] += 1;
if (player.ammo[1] > player_chargerAlloc)
LIMIT_ADD(player.ammo[1], 1, 0, 150);
if (player.ammo[1] >= 150)
{
if ((player_chargerAlloc < 150) &&
(player.ammo[0] > 0))
{
player.ammo[0] -= 1;
player_chargerAlloc += 30;
}
else
{
player.ammo[1] = player_chargerAlloc;
ship_fireBullet(&player, 1);
player_chargerAlloc = 0;
player.ammo[1] = 0;
player_chargerFired = true;
}
}
}
}
}
else
{
if (player.ammo[1] > 0)
ship_fireBullet(&player, 1);
player_chargerAlloc = 0;
player.ammo[1] = 0;
player_chargerFired = false;
}

2
src/player.cpp
View File

@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "Starfighter.h"
object player;
int player_chargerAlloc = 0;
bool player_chargerFired = false;
/*
@ -96,7 +95,6 @@ void player_checkShockDamage(float x, float y)
void exitPlayer()
{
player_chargerAlloc = 0;
player_chargerFired = false;
if ((player.weaponType[1] == W_CHARGER) || (player.weaponType[1] == W_LASER))

1
src/player.h
View File

@ -21,7 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PLAYER_H
extern object player;
extern int player_chargerAlloc;
extern bool player_chargerFired;
extern void initPlayer();