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

Renamed "FACE_" enum values to "FS_".

This commit is contained in:
onpon4 2016-01-04 09:07:30 -05:00
parent ab53fac4a8
commit aad7b550a9
10 changed files with 98 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/alien.cpp
View File

@ -1372,7 +1372,7 @@ void alien_setKlineAttackMethod(object *alien)
{ {
if (alien->shield <= 500) if (alien->shield <= 500)
{ {
setRadioMessage(FACE_KLINE, "ENOUGH!! THIS ENDS NOW!!!", 1); setRadioMessage(FS_KLINE, "ENOUGH!! THIS ENDS NOW!!!", 1);
alien->weaponType[0] = W_AIMED_SHOT; alien->weaponType[0] = W_AIMED_SHOT;
alien->weaponType[1] = W_MICRO_HOMING_MISSILES; alien->weaponType[1] = W_MICRO_HOMING_MISSILES;
alien->flags |= FL_CANCLOAK; alien->flags |= FL_CANCLOAK;
@ -1382,7 +1382,7 @@ void alien_setKlineAttackMethod(object *alien)
} }
else if (alien->shield <= 1000) else if (alien->shield <= 1000)
{ {
setRadioMessage(FACE_KLINE, "Your ability to stay alive irritates me!! Try dodging some of these!!", 1); setRadioMessage(FS_KLINE, "Your ability to stay alive irritates me!! Try dodging some of these!!", 1);
alien->weaponType[0] = W_DIRSHOCKMISSILE; alien->weaponType[0] = W_DIRSHOCKMISSILE;
alien->weaponType[1] = W_DIRSHOCKMISSILE; alien->weaponType[1] = W_DIRSHOCKMISSILE;
alien->chance[0] = 2; alien->chance[0] = 2;
@ -1391,7 +1391,7 @@ void alien_setKlineAttackMethod(object *alien)
} }
else else
{ {
setRadioMessage(FACE_KLINE, "Very good, Bainfield. Now let's get a little more serious...", 1); setRadioMessage(FS_KLINE, "Very good, Bainfield. Now let's get a little more serious...", 1);
alien->weaponType[0] = W_SPREADSHOT; alien->weaponType[0] = W_SPREADSHOT;
alien->chance[1] = 40; alien->chance[1] = 40;
} }
@ -1759,11 +1759,11 @@ void alien_destroy(object *alien, object *attacker)
} }
if ((alien->classDef == CD_KRASS) && (attacker == &player)) if ((alien->classDef == CD_KRASS) && (attacker == &player))
setRadioMessage(FACE_CHRIS, "The name's CHRIS, old-timer.", 1); setRadioMessage(FS_CHRIS, "The name's CHRIS, old-timer.", 1);
if (alien->classDef == CD_KLINE) if (alien->classDef == CD_KLINE)
{ {
setRadioMessage(FACE_KLINE, "It was an honor... to have fought you...", 1); setRadioMessage(FS_KLINE, "It was an honor... to have fought you...", 1);
alien->dx = alien->dy = 0; alien->dx = alien->dy = 0;
alien->shield = -150; alien->shield = -150;
} }
@ -1791,7 +1791,7 @@ void alien_hurt(object *alien, object *attacker, int damage, bool ion)
{ {
alien->flags |= FL_LEAVESECTOR; alien->flags |= FL_LEAVESECTOR;
alien->flags &= ~FL_CIRCLES; alien->flags &= ~FL_CIRCLES;
setRadioMessage(FACE_KLINE, "Seems I underestimated you, Bainfield. We'll meet again!", 1); setRadioMessage(FS_KLINE, "Seems I underestimated you, Bainfield. We'll meet again!", 1);
} }
} }
else if (game.area == MISN_EARTH) else if (game.area == MISN_EARTH)
@ -1801,7 +1801,7 @@ void alien_hurt(object *alien, object *attacker, int damage, bool ion)
{ {
alien->flags |= FL_LEAVESECTOR; alien->flags |= FL_LEAVESECTOR;
alien->flags &= ~FL_CIRCLES; alien->flags &= ~FL_CIRCLES;
setRadioMessage(FACE_SID, "Chris, Kethlan is getting away!", 1); setRadioMessage(FS_SID, "Chris, Kethlan is getting away!", 1);
} }
} }
else if (game.area == MISN_VENUS) else if (game.area == MISN_VENUS)

2
src/cargo.cpp
View File

@ -76,7 +76,7 @@ void cargo_becomeCollectable(int i)
aliens[ALIEN_PHOEBE].active = true; aliens[ALIEN_PHOEBE].active = true;
aliens[ALIEN_PHOEBE].x = cargo[i].x; aliens[ALIEN_PHOEBE].x = cargo[i].x;
aliens[ALIEN_PHOEBE].y = cargo[i].y; aliens[ALIEN_PHOEBE].y = cargo[i].y;
setRadioMessage(FACE_PHOEBE, "Thanks!! Watch out, WEAPCO! Phoebe's loose and she's ANGRY!!!", 1); setRadioMessage(FS_PHOEBE, "Thanks!! Watch out, WEAPCO! Phoebe's loose and she's ANGRY!!!", 1);
} }
cargo[i].active = false; cargo[i].active = false;

24
src/defs.h
View File

@ -283,6 +283,18 @@ enum {
CD_URSULA CD_URSULA
}; };
// Face sprites
enum {
FS_CHRIS = 90,
FS_SID,
FS_KRASS,
FS_KLINE,
FS_PHOEBE,
FS_URSULA,
FS_CREW,
FS_MAX
};
// Text sprites (main menu) // Text sprites (main menu)
enum { enum {
TS_PRESENTS, TS_PRESENTS,
@ -406,18 +418,6 @@ enum {
SECTION_GAME SECTION_GAME
}; };
// Faces
enum {
FACE_CHRIS = 90,
FACE_SID,
FACE_KRASS,
FACE_KLINE,
FACE_PHOEBE,
FACE_URSULA,
FACE_CREW,
FACE_MAX
};
// Missions // Missions
enum { enum {
MISN_START, MISN_START,

90
src/event.cpp
View File

@ -44,30 +44,30 @@ void events_init()
if ((aliens[ALIEN_KLINE].classDef == CD_KLINE) && if ((aliens[ALIEN_KLINE].classDef == CD_KLINE) &&
(aliens[ALIEN_KLINE].active)) (aliens[ALIEN_KLINE].active))
events[0].time = 2; events[0].time = 2;
events[0].face = FACE_KLINE; events[0].face = FS_KLINE;
strcpy(events[0].message, klineGreeting[rand() % 4]); strcpy(events[0].message, klineGreeting[rand() % 4]);
break; break;
case MISN_MOEBO: case MISN_MOEBO:
events[0].time = 2; events[0].time = 2;
events[0].face = FACE_SID; events[0].face = FS_SID;
strcpy(events[0].message, "You should try and destroy some of the frigate's weaponary, it'll help!"); strcpy(events[0].message, "You should try and destroy some of the frigate's weaponary, it'll help!");
events[1].time = 120; events[1].time = 120;
events[1].face = FACE_SID; events[1].face = FS_SID;
strcpy(events[1].message, "Chris, get a move on! The frigate is almost in range!"); strcpy(events[1].message, "Chris, get a move on! The frigate is almost in range!");
events[2].time = 150; events[2].time = 150;
events[2].face = FACE_SID; events[2].face = FS_SID;
strcpy(events[2].message, "The frigate is charging its cannon!"); strcpy(events[2].message, "The frigate is charging its cannon!");
events[3].time = 170; events[3].time = 170;
events[3].face = FACE_SID; events[3].face = FS_SID;
strcpy(events[3].message, "Chris, HURRY!!!"); strcpy(events[3].message, "Chris, HURRY!!!");
events[4].time = 180; events[4].time = 180;
events[4].face = FACE_SID; events[4].face = FS_SID;
strcpy(events[4].message, "Oh my god..."); strcpy(events[4].message, "Oh my god...");
events[4].entity = ALIEN_BOSS; events[4].entity = ALIEN_BOSS;
events[4].flag = FL_LEAVESECTOR | FL_IMMORTAL; events[4].flag = FL_LEAVESECTOR | FL_IMMORTAL;
@ -76,54 +76,54 @@ void events_init()
case MISN_NEROD: case MISN_NEROD:
events[0].time = 2; events[0].time = 2;
events[0].face = FACE_PHOEBE; events[0].face = FS_PHOEBE;
strcpy(events[0].message, "Hey, over here! Destroy this tug so I can break free!"); strcpy(events[0].message, "Hey, over here! Destroy this tug so I can break free!");
break; break;
case MISN_ALLEZ: case MISN_ALLEZ:
events[0].time = 2; events[0].time = 2;
events[0].face = FACE_CREW; events[0].face = FS_CREW;
strcpy(events[0].message, "Thank God! Please, help us! If they destroy this ship..."); strcpy(events[0].message, "Thank God! Please, help us! If they destroy this ship...");
events[1].time = 6; events[1].time = 6;
events[1].face = FACE_CHRIS; events[1].face = FS_CHRIS;
strcpy(events[1].message, "How long do you need?"); strcpy(events[1].message, "How long do you need?");
events[2].time = 10; events[2].time = 10;
events[2].face = FACE_CREW; events[2].face = FS_CREW;
strcpy(events[2].message, "Just a few minutes!"); strcpy(events[2].message, "Just a few minutes!");
events[3].time = 60; events[3].time = 60;
events[3].face = FACE_CREW; events[3].face = FS_CREW;
strcpy(events[3].message, "Alright! We've got the weapons working again! Now to look at the engines..."); strcpy(events[3].message, "Alright! We've got the weapons working again! Now to look at the engines...");
events[3].entity = ALIEN_FRIEND1; events[3].entity = ALIEN_FRIEND1;
events[3].flag = -FL_NOFIRE; events[3].flag = -FL_NOFIRE;
events[4].time = 80; events[4].time = 80;
events[4].face = FACE_CREW; events[4].face = FS_CREW;
strcpy(events[4].message, "DAMN! The guns are offline again! What you guys doing back there?!"); strcpy(events[4].message, "DAMN! The guns are offline again! What you guys doing back there?!");
events[4].entity = ALIEN_FRIEND1; events[4].entity = ALIEN_FRIEND1;
events[4].flag = FL_NOFIRE; events[4].flag = FL_NOFIRE;
events[5].time = 100; events[5].time = 100;
events[5].face = FACE_CREW; events[5].face = FS_CREW;
strcpy(events[5].message, "Chris, HELP!! We've lost all system power! We're a sitting duck out here!"); strcpy(events[5].message, "Chris, HELP!! We've lost all system power! We're a sitting duck out here!");
events[5].entity = ALIEN_FRIEND1; events[5].entity = ALIEN_FRIEND1;
events[5].flag = FL_DISABLED; events[5].flag = FL_DISABLED;
events[6].time = 120; events[6].time = 120;
events[6].face = FACE_CREW; events[6].face = FS_CREW;
strcpy(events[6].message, "Just a little longer..."); strcpy(events[6].message, "Just a little longer...");
events[7].time = 140; events[7].time = 140;
events[7].face = FACE_CREW; events[7].face = FS_CREW;
strcpy(events[7].message, "Okay! We've fixed that one. We think we've found the problem with the engines too..."); strcpy(events[7].message, "Okay! We've fixed that one. We think we've found the problem with the engines too...");
events[7].entity = ALIEN_FRIEND1; events[7].entity = ALIEN_FRIEND1;
events[7].flag = -FL_DISABLED; events[7].flag = -FL_DISABLED;
events[8].time = 177; events[8].time = 177;
events[8].face = FACE_CREW; events[8].face = FS_CREW;
strcpy(events[8].message, "Engines fixed! Let's move!"); strcpy(events[8].message, "Engines fixed! Let's move!");
events[9].time = 180; events[9].time = 180;
@ -134,11 +134,11 @@ void events_init()
case MISN_ELAMALE: case MISN_ELAMALE:
events[0].time = 5; events[0].time = 5;
events[0].face = FACE_PHOEBE; events[0].face = FS_PHOEBE;
strcpy(events[0].message, "Ummm... something about this doesn't look right! They should be offering more resistance than this!"); strcpy(events[0].message, "Ummm... something about this doesn't look right! They should be offering more resistance than this!");
events[1].time = -8; events[1].time = -8;
events[1].face = FACE_PHOEBE; events[1].face = FS_PHOEBE;
strcpy(events[1].message, "DAMMIT! It's a trap! Come on, Chris, we have to leave NOW!!"); strcpy(events[1].message, "DAMMIT! It's a trap! Come on, Chris, we have to leave NOW!!");
events[2].time = -9; events[2].time = -9;
@ -146,27 +146,27 @@ void events_init()
events[2].flag = FL_LEAVESECTOR; events[2].flag = FL_LEAVESECTOR;
events[3].time = -13; events[3].time = -13;
events[3].face = FACE_SID; events[3].face = FS_SID;
strcpy(events[3].message, "Chris, wh..."); strcpy(events[3].message, "Chris, wh...");
events[4].time = -15; events[4].time = -15;
events[4].face = FACE_KLINE; events[4].face = FS_KLINE;
strcpy(events[4].message, "So finally I meet the man who has been causing us so much trouble!"); strcpy(events[4].message, "So finally I meet the man who has been causing us so much trouble!");
events[5].time = -20; events[5].time = -20;
events[5].face = FACE_CHRIS; events[5].face = FS_CHRIS;
strcpy(events[5].message, "I see you've jammed up my warp drive. Who are you?"); strcpy(events[5].message, "I see you've jammed up my warp drive. Who are you?");
events[6].time = -25; events[6].time = -25;
events[6].face = FACE_KLINE; events[6].face = FS_KLINE;
strcpy(events[6].message, "I am Kline Kethlan. And I am here to put to a stop to your worthless little crusade!"); strcpy(events[6].message, "I am Kline Kethlan. And I am here to put to a stop to your worthless little crusade!");
events[7].time = -31; events[7].time = -31;
events[7].face = FACE_CHRIS; events[7].face = FS_CHRIS;
strcpy(events[7].message, "Kline Kethlan, huh? You sure sound confident."); strcpy(events[7].message, "Kline Kethlan, huh? You sure sound confident.");
events[8].time = -36; events[8].time = -36;
events[8].face = FACE_KLINE; events[8].face = FS_KLINE;
strcpy(events[8].message, "Nowhere to run, nowhere to hide, and no one to help you! This will certainly be interesting..."); strcpy(events[8].message, "Nowhere to run, nowhere to hide, and no one to help you! This will certainly be interesting...");
events[9].time = -42; events[9].time = -42;
@ -177,30 +177,30 @@ void events_init()
case MISN_ODEON: case MISN_ODEON:
events[0].time = 2; events[0].time = 2;
events[0].face = FACE_URSULA; events[0].face = FS_URSULA;
strcpy(events[0].message, "Unidentified craft sighted. Will proceed to destroy all targets."); strcpy(events[0].message, "Unidentified craft sighted. Will proceed to destroy all targets.");
events[1].time = 8; events[1].time = 8;
events[1].face = FACE_CHRIS; events[1].face = FS_CHRIS;
strcpy(events[1].message, "Looks like she's got one of those homing missile launchers too! Any advice, Phoebe?"); strcpy(events[1].message, "Looks like she's got one of those homing missile launchers too! Any advice, Phoebe?");
events[2].time = 14; events[2].time = 14;
events[2].face = FACE_PHOEBE; events[2].face = FS_PHOEBE;
strcpy(events[2].message, "Just try and dodge them!"); strcpy(events[2].message, "Just try and dodge them!");
break; break;
case MISN_ALMARTHA: case MISN_ALMARTHA:
events[0].time = 1; events[0].time = 1;
events[0].face = FACE_CHRIS; events[0].face = FS_CHRIS;
strcpy(events[0].message, "Nice ship!"); strcpy(events[0].message, "Nice ship!");
events[1].time = 7; events[1].time = 7;
events[1].face = FACE_KRASS; events[1].face = FS_KRASS;
strcpy(events[1].message, "Thanks, boy. Made it myself!"); strcpy(events[1].message, "Thanks, boy. Made it myself!");
events[2].time = 60; events[2].time = 60;
events[2].face = FACE_KRASS; events[2].face = FS_KRASS;
strcpy(events[2].message, "Hey, boy, we've got company! Looks like your friends didn't do a very good job after all!"); strcpy(events[2].message, "Hey, boy, we've got company! Looks like your friends didn't do a very good job after all!");
events[2].entity = ALIEN_BOSS_PART1; events[2].entity = ALIEN_BOSS_PART1;
events[2].flag = -FL_ACTIVATE; events[2].flag = -FL_ACTIVATE;
@ -210,7 +210,7 @@ void events_init()
events[3].flag = -FL_ACTIVATE; events[3].flag = -FL_ACTIVATE;
events[4].time = 93; events[4].time = 93;
events[4].face = FACE_KRASS; events[4].face = FS_KRASS;
strcpy(events[4].message, "Keep those things off my back or it'll cost you extra!!!"); strcpy(events[4].message, "Keep those things off my back or it'll cost you extra!!!");
events[5].time = 120; events[5].time = 120;
@ -218,7 +218,7 @@ void events_init()
events[5].flag = -FL_ACTIVATE; events[5].flag = -FL_ACTIVATE;
events[6].time = 140; events[6].time = 140;
events[6].face = FACE_PHOEBE; events[6].face = FS_PHOEBE;
strcpy(events[6].message, "Hey! Did we miss anything exciting?"); strcpy(events[6].message, "Hey! Did we miss anything exciting?");
events[6].entity = ALIEN_PHOEBE; events[6].entity = ALIEN_PHOEBE;
events[6].flag = -FL_ACTIVATE; events[6].flag = -FL_ACTIVATE;
@ -228,7 +228,7 @@ void events_init()
events[7].flag = -FL_ACTIVATE; events[7].flag = -FL_ACTIVATE;
events[8].time = 150; events[8].time = 150;
events[8].face = FACE_KRASS; events[8].face = FS_KRASS;
strcpy(events[8].message, "I've earned my fee. I'll see you around, boy!"); strcpy(events[8].message, "I've earned my fee. I'll see you around, boy!");
events[8].entity = ALIEN_FRIEND1; events[8].entity = ALIEN_FRIEND1;
events[8].flag = FL_LEAVESECTOR; events[8].flag = FL_LEAVESECTOR;
@ -237,7 +237,7 @@ void events_init()
case MISN_POSWIC: case MISN_POSWIC:
events[0].time = 90; events[0].time = 90;
events[0].face = FACE_SID; events[0].face = FS_SID;
strcpy(events[0].message, "DAMMIT! It's getting away! We've got to stop it!"); strcpy(events[0].message, "DAMMIT! It's getting away! We've got to stop it!");
events[0].entity = ALIEN_BOSS; events[0].entity = ALIEN_BOSS;
events[0].flag = FL_LEAVESECTOR; events[0].flag = FL_LEAVESECTOR;
@ -246,7 +246,7 @@ void events_init()
case MISN_SATURN: case MISN_SATURN:
events[0].time = 45; events[0].time = 45;
events[0].face = FACE_SID; events[0].face = FS_SID;
strcpy(events[0].message, "Chris! Another two of those ray cannons just arrived in your sector!"); strcpy(events[0].message, "Chris! Another two of those ray cannons just arrived in your sector!");
events[0].entity = ALIEN_BOSS_PART3; events[0].entity = ALIEN_BOSS_PART3;
events[0].flag = -FL_ACTIVATE; events[0].flag = -FL_ACTIVATE;
@ -256,7 +256,7 @@ void events_init()
events[1].flag = -FL_ACTIVATE; events[1].flag = -FL_ACTIVATE;
events[2].time = 90; events[2].time = 90;
events[2].face = FACE_SID; events[2].face = FS_SID;
strcpy(events[2].message, "Two more!"); strcpy(events[2].message, "Two more!");
events[2].entity = ALIEN_BOSS_PART5; events[2].entity = ALIEN_BOSS_PART5;
events[2].flag = -FL_ACTIVATE; events[2].flag = -FL_ACTIVATE;
@ -273,15 +273,15 @@ void events_init()
events[0].flag = -FL_ACTIVATE; events[0].flag = -FL_ACTIVATE;
events[1].time = 2; events[1].time = 2;
events[1].face = FACE_URSULA; events[1].face = FS_URSULA;
strcpy(events[1].message, "It's a trap! My God! It's Tyler!"); strcpy(events[1].message, "It's a trap! My God! It's Tyler!");
events[2].time = 8; events[2].time = 8;
events[2].face = FACE_KRASS; events[2].face = FS_KRASS;
strcpy(events[2].message, "I'm a mercenary, what do you expect?! WEAPCO hired me to do a job, just like you have been doing."); strcpy(events[2].message, "I'm a mercenary, what do you expect?! WEAPCO hired me to do a job, just like you have been doing.");
events[3].time = 14; events[3].time = 14;
events[3].face = FACE_CHRIS; events[3].face = FS_CHRIS;
strcpy(events[3].message, "Good point. It would be foolish to expect anything else."); strcpy(events[3].message, "Good point. It would be foolish to expect anything else.");
events[4].time = 15; events[4].time = 15;
@ -289,11 +289,11 @@ void events_init()
events[4].flag = -FL_ACTIVATE; events[4].flag = -FL_ACTIVATE;
events[5].time = 20; events[5].time = 20;
events[5].face = FACE_KRASS; events[5].face = FS_KRASS;
strcpy(events[5].message, "Now if you'll assist me in dying quickly, I have a cheque to earn, boy..."); strcpy(events[5].message, "Now if you'll assist me in dying quickly, I have a cheque to earn, boy...");
events[6].time = 25; events[6].time = 25;
events[6].face = FACE_CHRIS; events[6].face = FS_CHRIS;
strcpy(events[6].message, "I have a name, you know. Do you remember it?"); strcpy(events[6].message, "I have a name, you know. Do you remember it?");
events[7].time = 45; events[7].time = 45;
@ -308,22 +308,22 @@ void events_init()
case MISN_EARTH: case MISN_EARTH:
events[0].time = 2; events[0].time = 2;
events[0].face = FACE_KLINE; events[0].face = FS_KLINE;
strcpy(events[0].message, "That's far enough, Bainfield. You've been lucky so far, but your luck is about to run out!"); strcpy(events[0].message, "That's far enough, Bainfield. You've been lucky so far, but your luck is about to run out!");
events[1].time = 8; events[1].time = 8;
events[1].face = FACE_CHRIS; events[1].face = FS_CHRIS;
strcpy(events[1].message, "Yeah, right! Like I'd lose to you after coming this far!"); strcpy(events[1].message, "Yeah, right! Like I'd lose to you after coming this far!");
break; break;
case MISN_VENUS: case MISN_VENUS:
events[0].time = 2; events[0].time = 2;
events[0].face = FACE_CHRIS; events[0].face = FS_CHRIS;
strcpy(events[0].message, "WEAPCO is finished, Kethlan! You have nowhere to run, nowhere to hide, and no one to help you."); strcpy(events[0].message, "WEAPCO is finished, Kethlan! You have nowhere to run, nowhere to hide, and no one to help you.");
events[1].time = 8; events[1].time = 8;
events[1].face = FACE_KLINE; events[1].face = FS_KLINE;
strcpy(events[1].message, "You underestimate me, Bainfield."); strcpy(events[1].message, "You underestimate me, Bainfield.");
break; break;

2
src/gfx.cpp
View File

@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
SDL_Surface *gfx_background; SDL_Surface *gfx_background;
SDL_Surface *gfx_sprites[MAX_SPRITES]; SDL_Surface *gfx_sprites[MAX_SPRITES];
SDL_Surface *gfx_faceSprites[FACE_MAX]; SDL_Surface *gfx_faceSprites[FS_MAX];
SDL_Surface *gfx_shipSprites[MAX_SHIPSPRITES]; SDL_Surface *gfx_shipSprites[MAX_SHIPSPRITES];
SDL_Surface *gfx_fontSprites[MAX_FONTSPRITES]; SDL_Surface *gfx_fontSprites[MAX_FONTSPRITES];
SDL_Surface *gfx_shopSprites[MAX_SHOPSPRITES]; SDL_Surface *gfx_shopSprites[MAX_SHOPSPRITES];

2
src/gfx.h
View File

@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
extern SDL_Surface *gfx_background; extern SDL_Surface *gfx_background;
extern SDL_Surface *gfx_sprites[MAX_SPRITES]; extern SDL_Surface *gfx_sprites[MAX_SPRITES];
extern SDL_Surface *gfx_faceSprites[FACE_MAX]; extern SDL_Surface *gfx_faceSprites[FS_MAX];
extern SDL_Surface *gfx_shipSprites[MAX_SHIPSPRITES]; extern SDL_Surface *gfx_shipSprites[MAX_SHIPSPRITES];
extern SDL_Surface *gfx_fontSprites[MAX_FONTSPRITES]; extern SDL_Surface *gfx_fontSprites[MAX_FONTSPRITES];
extern SDL_Surface *gfx_shopSprites[MAX_SHOPSPRITES]; extern SDL_Surface *gfx_shopSprites[MAX_SHOPSPRITES];

14
src/intermission.cpp
View File

@ -353,7 +353,7 @@ static void intermission_updateCommsSurface(SDL_Surface *comms)
char string[255]; char string[255];
gfx_drawRect(comms, 0, 10, comms->w - 1, 55, 0x00, 0x22, 0x00); gfx_drawRect(comms, 0, 10, comms->w - 1, 55, 0x00, 0x22, 0x00);
gfx_blit(gfx_faceSprites[FACE_CHRIS], 20, 15, comms); gfx_blit(gfx_faceSprites[FS_CHRIS], 20, 15, comms);
gfx_renderString("Chris Bainfield", 80, 15, FONT_WHITE, 0, comms); gfx_renderString("Chris Bainfield", 80, 15, FONT_WHITE, 0, comms);
sprintf(string, "Current Location: %s", systemPlanet[game.stationedPlanet].name); sprintf(string, "Current Location: %s", systemPlanet[game.stationedPlanet].name);
gfx_renderString(string, 80, 35, FONT_WHITE, 0, comms); gfx_renderString(string, 80, 35, FONT_WHITE, 0, comms);
@ -608,12 +608,12 @@ int intermission()
gfx_sprites[34] = gfx_loadImage("gfx/planet_orange.png"); gfx_sprites[34] = gfx_loadImage("gfx/planet_orange.png");
// Faces (as defines) // Faces (as defines)
gfx_faceSprites[FACE_CHRIS] = gfx_loadImage("gfx/face_chris.png"); gfx_faceSprites[FS_CHRIS] = gfx_loadImage("gfx/face_chris.png");
gfx_faceSprites[FACE_SID] = gfx_loadImage("gfx/face_sid.png"); gfx_faceSprites[FS_SID] = gfx_loadImage("gfx/face_sid.png");
gfx_faceSprites[FACE_KRASS] = gfx_loadImage("gfx/face_krass.png"); gfx_faceSprites[FS_KRASS] = gfx_loadImage("gfx/face_krass.png");
gfx_faceSprites[FACE_PHOEBE] = gfx_loadImage("gfx/face_phoebe.png"); gfx_faceSprites[FS_PHOEBE] = gfx_loadImage("gfx/face_phoebe.png");
gfx_faceSprites[FACE_URSULA] = gfx_loadImage("gfx/face_ursula.png"); gfx_faceSprites[FS_URSULA] = gfx_loadImage("gfx/face_ursula.png");
gfx_faceSprites[FACE_KLINE] = gfx_loadImage("gfx/face_kline.png"); gfx_faceSprites[FS_KLINE] = gfx_loadImage("gfx/face_kline.png");
engine.done = 0; engine.done = 0;
engine.keyState[KEY_FIRE] = 0; engine.keyState[KEY_FIRE] = 0;

28
src/messages.cpp
View File

@ -63,7 +63,7 @@ void getKillMessage(object *ally)
char in[50], 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 = FS_PHOEBE;
if (ally == &aliens[ALIEN_PHOEBE]) if (ally == &aliens[ALIEN_PHOEBE])
{ {
@ -73,7 +73,7 @@ void getKillMessage(object *ally)
if ((game.wingMate1Kills > game.wingMate2Kills) && if ((game.wingMate1Kills > game.wingMate2Kills) &&
(game.wingMate1Kills > game.totalKills)) (game.wingMate1Kills > game.totalKills))
firstPlace = true; firstPlace = true;
faceToUse = FACE_PHOEBE; faceToUse = FS_PHOEBE;
} }
else else
{ {
@ -83,7 +83,7 @@ void getKillMessage(object *ally)
if ((game.wingMate2Kills > game.wingMate1Kills) && if ((game.wingMate2Kills > game.wingMate1Kills) &&
(game.wingMate2Kills > game.totalKills)) (game.wingMate2Kills > game.totalKills))
firstPlace = true; firstPlace = true;
faceToUse = FACE_URSULA; faceToUse = FS_URSULA;
} }
int r = rand() % 10; int r = rand() % 10;
@ -150,28 +150,28 @@ void getPlayerDeathMessage()
{ {
if (aliens[ALIEN_KLINE].active) if (aliens[ALIEN_KLINE].active)
{ {
setRadioMessage(FACE_KLINE, getKlineInsult(), 1); setRadioMessage(FS_KLINE, getKlineInsult(), 1);
return; return;
} }
if ((aliens[ALIEN_BOSS].active) && (aliens[ALIEN_BOSS].classDef == CD_KRASS)) if ((aliens[ALIEN_BOSS].active) && (aliens[ALIEN_BOSS].classDef == CD_KRASS))
{ {
setRadioMessage(FACE_KRASS, "That was the easiest $90,000,000 I've ever earned! Bwwah!! Ha!! Ha!! Ha!!", 1); setRadioMessage(FS_KRASS, "That was the easiest $90,000,000 I've ever earned! Bwwah!! Ha!! Ha!! Ha!!", 1);
return; return;
} }
int faceToUse = FACE_PHOEBE; int faceToUse = FS_PHOEBE;
if ((game.area == MISN_URUSOR) || (game.area == MISN_POSWIC) || if ((game.area == MISN_URUSOR) || (game.area == MISN_POSWIC) ||
(game.area == MISN_EARTH)) (game.area == MISN_EARTH))
{ {
faceToUse = FACE_SID; faceToUse = FS_SID;
} }
else if (game.hasWingMate2) else if (game.hasWingMate2)
{ {
if ((rand() % 2) == 0) if ((rand() % 2) == 0)
faceToUse = FACE_URSULA; faceToUse = FS_URSULA;
} }
setRadioMessage(faceToUse, deathMessage[rand() % 6], 1); setRadioMessage(faceToUse, deathMessage[rand() % 6], 1);
@ -179,24 +179,24 @@ void getPlayerDeathMessage()
void getMissFireMessage(object *ally) void getMissFireMessage(object *ally)
{ {
int faceToUse = FACE_PHOEBE; int faceToUse = FS_PHOEBE;
if (ally == &aliens[ALIEN_PHOEBE]) if (ally == &aliens[ALIEN_PHOEBE])
faceToUse = FACE_PHOEBE; faceToUse = FS_PHOEBE;
else else
faceToUse = FACE_URSULA; faceToUse = FS_URSULA;
setRadioMessage(faceToUse, missFireMessage[rand() % 5], 0); setRadioMessage(faceToUse, missFireMessage[rand() % 5], 0);
} }
void getPlayerHitMessage(object *ally) void getPlayerHitMessage(object *ally)
{ {
int faceToUse = FACE_PHOEBE; int faceToUse = FS_PHOEBE;
if (ally == &aliens[ALIEN_PHOEBE]) if (ally == &aliens[ALIEN_PHOEBE])
faceToUse = FACE_PHOEBE; faceToUse = FS_PHOEBE;
else else
faceToUse = FACE_URSULA; faceToUse = FS_URSULA;
setRadioMessage(faceToUse, playerHitMessage[rand() % 3], 0); setRadioMessage(faceToUse, playerHitMessage[rand() % 3], 0);
} }

2
src/misc.cpp
View File

@ -98,7 +98,7 @@ int getFace(const char *face)
for (int i = 0 ; i < 7 ; i++) for (int i = 0 ; i < 7 ; i++)
{ {
if (strcmp(faces[i], face) == 0) if (strcmp(faces[i], face) == 0)
return FACE_CHRIS + i; return FS_CHRIS + i;
} }
return -1; return -1;

18
src/missions.cpp
View File

@ -339,7 +339,7 @@ static void evaluateRequirement(int type, int id, int *completed, int *targetVal
*completed = 2; *completed = 2;
checkTimer(); checkTimer();
if ((game.area == MISN_URUSOR) && (type == M_DISABLE_TARGET)) if ((game.area == MISN_URUSOR) && (type == M_DISABLE_TARGET))
setRadioMessage(FACE_SID, "All vessels disabled!", 1); setRadioMessage(FS_SID, "All vessels disabled!", 1);
} }
else else
{ {
@ -373,12 +373,12 @@ static void evaluateRequirement(int type, int id, int *completed, int *targetVal
case P_CARGO: case P_CARGO:
sprintf(message, "Cargo pod destroyed!"); sprintf(message, "Cargo pod destroyed!");
if (game.area == MISN_CERADSE) // Get lectured by Sid if (game.area == MISN_CERADSE) // Get lectured by Sid
setRadioMessage(FACE_SID, "Chris, we needed that pod!! I warned you that we couldn't afford to lose a single one!!", 1); setRadioMessage(FS_SID, "Chris, we needed that pod!! I warned you that we couldn't afford to lose a single one!!", 1);
break; break;
case P_ESCAPEPOD: case P_ESCAPEPOD:
sprintf(message, "Escape Pod lost!"); sprintf(message, "Escape Pod lost!");
if (game.area == MISN_ODEON) // Get lectured by Phoebe if (game.area == MISN_ODEON) // Get lectured by Phoebe
setRadioMessage(FACE_PHOEBE, "No... Ursula...", 1); setRadioMessage(FS_PHOEBE, "No... Ursula...", 1);
break; break;
} }
break; break;
@ -389,13 +389,13 @@ static void evaluateRequirement(int type, int id, int *completed, int *targetVal
switch (game.area) switch (game.area)
{ {
case MISN_NEROD: case MISN_NEROD:
setRadioMessage(FACE_SID, "Dammit, Chris! We just lost her!", 1); setRadioMessage(FS_SID, "Dammit, Chris! We just lost her!", 1);
break; break;
case MISN_ALLEZ: case MISN_ALLEZ:
setRadioMessage(FACE_CREW, "Noooo!! Hull bre...", 1); setRadioMessage(FS_CREW, "Noooo!! Hull bre...", 1);
break; break;
case MISN_URUSOR: case MISN_URUSOR:
setRadioMessage(FACE_SID, "Chris, we've got to disable them, not destroy them!!", 1); setRadioMessage(FS_SID, "Chris, we've got to disable them, not destroy them!!", 1);
break; break;
} }
} }
@ -433,7 +433,7 @@ void updateMissionRequirements(int type, int id, int value)
if ((type == M_DESTROY_TARGET_TYPE) && (id == CD_SID)) if ((type == M_DESTROY_TARGET_TYPE) && (id == CD_SID))
{ {
setInfoLine("Sid has been killed!!", FONT_RED); setInfoLine("Sid has been killed!!", FONT_RED);
setRadioMessage(FACE_CHRIS, "Sid... I... I'm sorry...", 1); setRadioMessage(FS_CHRIS, "Sid... I... I'm sorry...", 1);
currentMission.completed1[0] = -2; currentMission.completed1[0] = -2;
} }
@ -495,7 +495,7 @@ void updateMissionRequirements(int type, int id, int value)
{ {
setInfoLine("*** Experimental Fighter Destroyed - Mission Completed ***", FONT_GREEN); setInfoLine("*** Experimental Fighter Destroyed - Mission Completed ***", FONT_GREEN);
systemPlanet[9].missionCompleted = 1; systemPlanet[9].missionCompleted = 1;
setRadioMessage(FACE_CHRIS, "That's one less suprise that WEAPCO can spring on us!", 1); setRadioMessage(FS_CHRIS, "That's one less suprise that WEAPCO can spring on us!", 1);
game.experimentalShield = 0; game.experimentalShield = 0;
} }
} }
@ -600,7 +600,7 @@ bool allMissionsCompleted()
} }
if (game.area == MISN_EARTH) if (game.area == MISN_EARTH)
setRadioMessage(FACE_CHRIS, "You guys stay here and keep things under control. I'm going after Kethlan!", 1); setRadioMessage(FS_CHRIS, "You guys stay here and keep things under control. I'm going after Kethlan!", 1);
} }
} }