From 93e6c1064ccde856abaa2c106d23231437c5d9db Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Wed, 24 Aug 2011 22:22:26 +0200 Subject: [PATCH] Remove unused parameters. --- code/bullets.cpp | 4 ++-- code/collectable.cpp | 2 +- code/collectable.h | 2 +- code/missions.cpp | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/bullets.cpp b/code/bullets.cpp index d410f51..c5f23f0 100644 --- a/code/bullets.cpp +++ b/code/bullets.cpp @@ -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 // 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); 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); } bullet->active = 0; diff --git a/code/collectable.cpp b/code/collectable.cpp index 6970dd1..ceb4763 100644 --- a/code/collectable.cpp +++ b/code/collectable.cpp @@ -169,7 +169,7 @@ void explodeMine(collectables *collectable) for (int i = 0 ; i < 10 ; i++) 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); } diff --git a/code/collectable.h b/code/collectable.h index aaf7fa4..d19ded0 100644 --- a/code/collectable.h +++ b/code/collectable.h @@ -34,7 +34,7 @@ extern void setInfoLine(const char *in, int color); extern object *addCargo(object *owner, int cargoType); extern void addExplosion(float x, float y, int type); 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 object player; diff --git a/code/missions.cpp b/code/missions.cpp index 472f58b..64c283d 100644 --- a/code/missions.cpp +++ b/code/missions.cpp @@ -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]; @@ -417,7 +417,7 @@ void updateMissionRequirements(int type, int id, int value) { matched = 1; currentMission.targetValue1[i] -= value; - evaluteRequirement(type, id, value, ¤tMission.completed1[i], ¤tMission.targetValue1[i], FONT_CYAN); + evaluteRequirement(type, id, ¤tMission.completed1[i], ¤tMission.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))) { currentMission.targetValue2[i] -= value; - evaluteRequirement(type, id, value, ¤tMission.completed2[i], ¤tMission.targetValue2[i], FONT_YELLOW); + evaluteRequirement(type, id, ¤tMission.completed2[i], ¤tMission.targetValue2[i], FONT_YELLOW); return; } }