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

Remove unused string copying code.

This commit is contained in:
Guus Sliepen 2012-03-11 14:09:04 +01:00
parent ad19fe2672
commit 1b1170a183
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
code/messages.cpp
View File

@ -61,14 +61,13 @@ static const char *playerHitMessage[3] = {
void getKillMessage(object *ally) void getKillMessage(object *ally)
{ {
char in[50], name[30], otherName[30]; char in[50], otherName[30];
int kills, difference; int kills, difference;
bool firstPlace = false; bool firstPlace = false;
int faceToUse = FACE_PHOEBE; int faceToUse = FACE_PHOEBE;
if (ally == &enemy[FR_PHOEBE]) if (ally == &enemy[FR_PHOEBE])
{ {
strcpy(name, "Phoebe");
strcpy(otherName, "Ursula"); strcpy(otherName, "Ursula");
kills = currentGame.wingMate1Kills; kills = currentGame.wingMate1Kills;
difference = currentGame.wingMate1Kills - currentGame.wingMate2Kills; difference = currentGame.wingMate1Kills - currentGame.wingMate2Kills;
@ -78,7 +77,6 @@ void getKillMessage(object *ally)
} }
else else
{ {
strcpy(name, "Ursula");
strcpy(otherName, "Phoebe"); strcpy(otherName, "Phoebe");
kills = currentGame.wingMate2Kills; kills = currentGame.wingMate2Kills;
difference = currentGame.wingMate2Kills - currentGame.wingMate1Kills; difference = currentGame.wingMate2Kills - currentGame.wingMate1Kills;
@ -136,7 +134,7 @@ void getKillMessage(object *ally)
const char *getKlineInsult() const char *getKlineInsult()
{ {
static const char insult[][40] = { static const char *insult[] = {
"Pathetic", "How very disappointing...", "Heroic. And stupid", "Fool", "And now you're nothing but a DEAD hero" "Pathetic", "How very disappointing...", "Heroic. And stupid", "Fool", "And now you're nothing but a DEAD hero"
}; };
@ -177,40 +175,24 @@ void getPlayerDeathMessage()
void getMissFireMessage(object *ally) void getMissFireMessage(object *ally)
{ {
char name[30], in[50];
int faceToUse = FACE_PHOEBE; int faceToUse = FACE_PHOEBE;
if (ally == &enemy[FR_PHOEBE]) if (ally == &enemy[FR_PHOEBE])
{
strcpy(name, "Phoebe");
faceToUse = FACE_PHOEBE; faceToUse = FACE_PHOEBE;
}
else else
{
strcpy(name, "Ursula");
faceToUse = FACE_URSULA; faceToUse = FACE_URSULA;
}
sprintf(in, missFireMessage[rand() % 5]); setRadioMessage(faceToUse, missFireMessage[rand() % 5], 0);
setRadioMessage(faceToUse, in, 0);
} }
void getPlayerHitMessage(object *ally) void getPlayerHitMessage(object *ally)
{ {
char name[30], in[50];
int faceToUse = FACE_PHOEBE; int faceToUse = FACE_PHOEBE;
if (ally == &enemy[FR_PHOEBE]) if (ally == &enemy[FR_PHOEBE])
{
strcpy(name, "Phoebe");
faceToUse = FACE_PHOEBE; faceToUse = FACE_PHOEBE;
}
else else
{
strcpy(name, "Ursula");
faceToUse = FACE_URSULA; faceToUse = FACE_URSULA;
}
sprintf(in, playerHitMessage[rand() % 3]); setRadioMessage(faceToUse, playerHitMessage[rand() % 3], 0);
setRadioMessage(faceToUse, in, 0);
} }