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

Remove unused parameters.

This commit is contained in:
Guus Sliepen 2011-08-24 22:22:26 +02:00
parent d87a0fcc31
commit 93e6c1064c
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/bullets.cpp
View File

@ -385,7 +385,7 @@ void destroyAlien(object *bullet, object *theEnemy)
} }
} }
char checkPlayerShockDamage(float x, float y, int radius) char checkPlayerShockDamage(float x, float y)
{ {
// Don't let the player be hurt by an explosion after they have completed // Don't let the player be hurt by an explosion after they have completed
// all the mission objectives. That would be *really* annoying! // all the mission objectives. That would be *really* annoying!
@ -775,7 +775,7 @@ void doBullets()
addExplosion(bullet->x + Math::rrand(-35, 35), bullet->y + Math::rrand(-35, 35), E_BIG_EXPLOSION); addExplosion(bullet->x + Math::rrand(-35, 35), bullet->y + Math::rrand(-35, 35), E_BIG_EXPLOSION);
if (bullet->flags & WF_TIMEDEXPLOSION) if (bullet->flags & WF_TIMEDEXPLOSION)
if (checkPlayerShockDamage(bullet->x, bullet->y, 75)) if (checkPlayerShockDamage(bullet->x, bullet->y))
setInfoLine("Warning: Missile Shockwave Damage!!", FONT_RED); setInfoLine("Warning: Missile Shockwave Damage!!", FONT_RED);
} }
bullet->active = 0; bullet->active = 0;

2
code/collectable.cpp
View File

@ -169,7 +169,7 @@ void explodeMine(collectables *collectable)
for (int i = 0 ; i < 10 ; i++) for (int i = 0 ; i < 10 ; i++)
addExplosion(collectable->x + rand() % 25 - rand() % 25, collectable->y + rand() % 25 - rand() % 25, E_BIG_EXPLOSION); addExplosion(collectable->x + rand() % 25 - rand() % 25, collectable->y + rand() % 25 - rand() % 25, E_BIG_EXPLOSION);
if (checkPlayerShockDamage(collectable->x, collectable->y, 50)) if (checkPlayerShockDamage(collectable->x, collectable->y))
setInfoLine("Warning: Mine damage to shield!!", FONT_RED); setInfoLine("Warning: Mine damage to shield!!", FONT_RED);
} }

2
code/collectable.h
View File

@ -34,7 +34,7 @@ extern void setInfoLine(const char *in, int color);
extern object *addCargo(object *owner, int cargoType); extern object *addCargo(object *owner, int cargoType);
extern void addExplosion(float x, float y, int type); extern void addExplosion(float x, float y, int type);
extern void playSound(int sid); extern void playSound(int sid);
extern char checkPlayerShockDamage(float x, float y, int radius); extern char checkPlayerShockDamage(float x, float y);
extern globalEngineVariables engine; extern globalEngineVariables engine;
extern object player; extern object player;

6
code/missions.cpp
View File

@ -303,7 +303,7 @@ void checkTimer()
} }
} }
void evaluteRequirement(int type, int id, int value, int *completed, int *targetValue, int fontColor) void evaluteRequirement(int type, int id, int *completed, int *targetValue, int fontColor)
{ {
char message[25]; char message[25];
@ -417,7 +417,7 @@ void updateMissionRequirements(int type, int id, int value)
{ {
matched = 1; matched = 1;
currentMission.targetValue1[i] -= value; currentMission.targetValue1[i] -= value;
evaluteRequirement(type, id, value, &currentMission.completed1[i], &currentMission.targetValue1[i], FONT_CYAN); evaluteRequirement(type, id, &currentMission.completed1[i], &currentMission.targetValue1[i], FONT_CYAN);
} }
} }
} }
@ -433,7 +433,7 @@ void updateMissionRequirements(int type, int id, int value)
if ((currentMission.secondaryType[i] == type) && ((currentMission.target2[i] == id) || (currentMission.target2[i] == CD_ANY))) if ((currentMission.secondaryType[i] == type) && ((currentMission.target2[i] == id) || (currentMission.target2[i] == CD_ANY)))
{ {
currentMission.targetValue2[i] -= value; currentMission.targetValue2[i] -= value;
evaluteRequirement(type, id, value, &currentMission.completed2[i], &currentMission.targetValue2[i], FONT_YELLOW); evaluteRequirement(type, id, &currentMission.completed2[i], &currentMission.targetValue2[i], FONT_YELLOW);
return; return;
} }
} }