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

Reconstructed player hit messages.

This commit is contained in:
onpon4 2016-11-19 08:24:12 -05:00
parent 7578f3814f
commit e9330907b7
3 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/game.cpp
View File

@ -31,6 +31,16 @@ static const char *klineInsult[] = {
static const char *klineVenusInsult[] = { static const char *klineVenusInsult[] = {
"Fool.", "And now you're nothing but a DEAD hero." "Fool.", "And now you're nothing but a DEAD hero."
}; };
static const char *phoebePlayerHitMessage[3] = {
"Oops! Sorry!",
"Whoops! Are you OK, Chris?",
"Oh, sorry! I didn't see you there!"
};
static const char *ursulaPlayerHitMessage[3] = {
"Get out of the way!",
"Don't fly into my missiles!",
"Dammit, Chris, you made me miss!"
};
void game_init() void game_init()
@ -699,9 +709,17 @@ static void game_doBullets()
player.hit = 5; player.hit = 5;
} }
if ((bullet->owner->classDef == CD_PHOEBE) || if (player.shield > 0)
(bullet->owner->classDef == CD_URSULA)) {
getPlayerHitMessage(bullet->owner); if (bullet->owner->classDef == CD_PHOEBE)
{
setRadioMessage(FS_PHOEBE, phoebePlayerHitMessage[rand() % 3], 0);
}
else if (bullet->owner->classDef == CD_URSULA)
{
setRadioMessage(FS_URSULA, ursulaPlayerHitMessage[rand() % 3], 0);
}
}
if (bullet->id == WT_CHARGER) if (bullet->id == WT_CHARGER)
{ {

18
src/messages.cpp
View File

@ -27,12 +27,6 @@ static const char *missFireMessage[5] = {
"Open your eyes!", "Open your eyes!",
}; };
static const char *playerHitMessage[3] = {
"Oops! Sorry!",
"Get out of the way!",
"Don't fly into my missiles!",
};
void getMissFireMessage(object *ally) void getMissFireMessage(object *ally)
{ {
int faceToUse = FS_PHOEBE; int faceToUse = FS_PHOEBE;
@ -44,15 +38,3 @@ void getMissFireMessage(object *ally)
setRadioMessage(faceToUse, missFireMessage[rand() % 5], 0); setRadioMessage(faceToUse, missFireMessage[rand() % 5], 0);
} }
void getPlayerHitMessage(object *ally)
{
int faceToUse = FS_PHOEBE;
if (ally == &aliens[ALIEN_PHOEBE])
faceToUse = FS_PHOEBE;
else
faceToUse = FS_URSULA;
setRadioMessage(faceToUse, playerHitMessage[rand() % 3], 0);
}

2
src/messages.h
View File

@ -20,8 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef MESSAGES_H #ifndef MESSAGES_H
#define MESSAGES_H #define MESSAGES_H
extern void getKillMessage(object *ally);
extern void getMissFireMessage(object *ally); extern void getMissFireMessage(object *ally);
extern void getPlayerHitMessage(object *ally);
#endif #endif