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

Removed more magic numbers.

This commit is contained in:
onpon4 2016-01-05 06:44:26 -05:00
parent 73af622c54
commit 97f1f441c2
5 changed files with 69 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/alien.cpp
View File

@ -1088,7 +1088,7 @@ bool alien_add()
alienArray[0] = CD_DUALFIGHTER;
alienArray[1] = CD_MISSILEBOAT;
alienArray[2] = CD_AIMFIGHTER;
if (game.system == 2)
if (game.system == SYSTEM_MORDOR)
{
numberOfAliens = 4;
alienArray[3] = CD_PROTOFIGHTER;
@ -1106,7 +1106,7 @@ bool alien_add()
(game.area != MISN_SIVEDI) &&
(game.area != MISN_MARS))
{
if ((game.system == 1) && (game.area == MISN_INTERCEPTION))
if ((game.system == SYSTEM_EYANANTH) && (game.area == MISN_INTERCEPTION))
{
if ((rand() % 5) == 0)
randEnemy = CD_SLAVETRANSPORT;

8
src/defs.h
View File

@ -577,6 +577,14 @@ enum {
SECTION_GAME
};
// Systems
enum {
SYSTEM_SPIRIT,
SYSTEM_EYANANTH,
SYSTEM_MORDOR,
SYSTEM_SOL
};
// Missions
enum {
MISN_START,

6
src/game.cpp
View File

@ -27,7 +27,7 @@ static int thirds = 0;
void game_init()
{
game.system = 0;
game.system = SYSTEM_SPIRIT;
game.area = MISN_START;
game.sfxVolume = 0;
game.musicVolume = 0;
@ -2027,7 +2027,7 @@ int game_mainLoop()
// Some specifics for interception missions
if (game.area == MISN_INTERCEPTION)
{
if ((game.system > 1) && ((rand() % 5) == 0))
if ((game.system > SYSTEM_EYANANTH) && ((rand() % 5) == 0))
{
aliens[ALIEN_KLINE] = alien_defs[CD_KLINE];
aliens[ALIEN_KLINE].owner = &aliens[ALIEN_KLINE];
@ -2038,7 +2038,7 @@ int game_mainLoop()
player_setTarget(ALIEN_KLINE);
}
if ((game.system == 2) && (game.experimentalShield > 0))
if ((game.system == SYSTEM_MORDOR) && (game.experimentalShield > 0))
{
if ((rand() % 5) > 0)
{

70
src/intermission.cpp
View File

@ -157,16 +157,16 @@ static void intermission_setSystemPlanets()
switch (game.system)
{
case 0:
case SYSTEM_SPIRIT:
strcpy(string, "data/planets_spirit.dat");
break;
case 1:
case SYSTEM_EYANANTH:
strcpy(string, "data/planets_eyananth.dat");
break;
case 2:
case SYSTEM_MORDOR:
strcpy(string, "data/planets_mordor.dat");
break;
case 3:
case SYSTEM_SOL:
strcpy(string, "data/planets_sol.dat");
break;
}
@ -256,7 +256,7 @@ static bool intermission_showSystem(float x, float y, bool selectable)
screen_renderString(systemPlanet[planet].name, -1, 545, FONT_WHITE);
if ((engine.keyState[KEY_FIRE]))
{
if (game.system == 0)
if (game.system == SYSTEM_SPIRIT)
{
game.stationedPlanet = planet;
game.destinationPlanet = planet;
@ -577,13 +577,33 @@ int intermission()
engine.cursor_y = screen->h / 2;
gfx_sprites[SP_CURSOR] = gfx_loadImage("gfx/cursor.png");
// Icons 1 - 29
for (int i = 0 ; i < 26 ; i++)
{
sprintf(string, "gfx/icon%d.png", (i + 1));
gfx_sprites[i + 1] = gfx_loadImage(string);
}
// Icons
gfx_sprites[SP_START_MISSION] = gfx_loadImage("gfx/icon1.png");
gfx_sprites[SP_MAP] = gfx_loadImage("gfx/icon2.png");
gfx_sprites[SP_STATUS] = gfx_loadImage("gfx/icon3.png");
gfx_sprites[SP_SAVE] = gfx_loadImage("gfx/icon4.png");
gfx_sprites[SP_SHOP] = gfx_loadImage("gfx/icon5.png");
gfx_sprites[SP_COMM] = gfx_loadImage("gfx/icon6.png");
gfx_sprites[SP_OPTIONS] = gfx_loadImage("gfx/icon7.png");
gfx_sprites[SP_EXIT] = gfx_loadImage("gfx/icon8.png");
gfx_sprites[SP_PLASMA_MAX_OUTPUT] = gfx_loadImage("gfx/icon9.png");
gfx_sprites[SP_PLASMA_MAX_POWER] = gfx_loadImage("gfx/icon10.png");
gfx_sprites[SP_PLASMA_MAX_RATE] = gfx_loadImage("gfx/icon11.png");
gfx_sprites[SP_PLASMA_AMMO] = gfx_loadImage("gfx/icon12.png");
gfx_sprites[SP_ROCKET_AMMO] = gfx_loadImage("gfx/icon13.png");
gfx_sprites[SP_PLASMA_MIN_OUTPUT] = gfx_loadImage("gfx/icon14.png");
gfx_sprites[SP_PLASMA_MIN_POWER] = gfx_loadImage("gfx/icon15.png");
gfx_sprites[SP_PLASMA_MIN_RATE] = gfx_loadImage("gfx/icon16.png");
gfx_sprites[SP_PLASMA_MAX_AMMO] = gfx_loadImage("gfx/icon17.png");
gfx_sprites[SP_ROCKET_MAX_AMMO] = gfx_loadImage("gfx/icon18.png");
gfx_sprites[SP_DOUBLE_ROCKETS] = gfx_loadImage("gfx/icon19.png");
gfx_sprites[SP_MICRO_ROCKETS] = gfx_loadImage("gfx/icon20.png");
gfx_sprites[SP_LASER] = gfx_loadImage("gfx/icon21.png");
gfx_sprites[SP_HOMING_MISSILE] = gfx_loadImage("gfx/icon22.png");
gfx_sprites[SP_CHARGER] = gfx_loadImage("gfx/icon23.png");
gfx_sprites[SP_DOUBLE_HOMING_MISSILES] = gfx_loadImage("gfx/icon24.png");
gfx_sprites[SP_MICRO_HOMING_MISSILES] = gfx_loadImage("gfx/icon25.png");
gfx_sprites[SP_GOTO] = gfx_loadImage("gfx/icon26.png");
gfx_sprites[SP_BUY] = gfx_loadImage("gfx/buyIcon.png");
gfx_sprites[SP_SELL] = gfx_loadImage("gfx/sellIcon.png");
gfx_sprites[SP_FIREFLY] = gfx_loadImage("gfx/firefly1.png");
@ -612,7 +632,7 @@ int intermission()
SDL_Rect r;
SDL_Rect destRect;
int distance = 0;
int interceptionChance = 0;
int interceptionChance;
intermission_setStatusLines();
initShop();
@ -647,12 +667,24 @@ int intermission()
game.maxPlasmaDamage);
}
if (game.system > 0)
interceptionChance = (300 / game.system);
switch (game.system)
{
case SYSTEM_EYANANTH:
interceptionChance = 300;
break;
case SYSTEM_MORDOR:
interceptionChance = 150;
break;
case SYSTEM_SOL:
// There is no chance of being interceptted after the final attack on Earth
if ((game.system == 3) && (systemPlanet[2].missionCompleted))
if ((game.system == SYSTEM_SOL) && (systemPlanet[2].missionCompleted))
interceptionChance = 0;
else
interceptionChance = 100;
break;
default:
interceptionChance = 0;
}
int rtn = 0;
@ -788,7 +820,7 @@ int intermission()
if (intermission_showSystem(sinX, cosY, true))
{
if (game.system == 0)
if (game.system == SYSTEM_SPIRIT)
{
sprintf(string, "Stationed At: %s", systemPlanet[game.stationedPlanet].name);
gfx_createTextObject(TS_CURRENT_PLANET, string, 90, 450, FONT_WHITE);
@ -802,7 +834,7 @@ int intermission()
}
screen_blitText(TS_CURRENT_PLANET);
if ((game.system > 0) && (game.stationedPlanet != game.destinationPlanet))
if ((game.system > SYSTEM_SPIRIT) && (game.stationedPlanet != game.destinationPlanet))
screen_blitText(TS_DEST_PLANET);
break;

10
src/shop.cpp
View File

@ -487,10 +487,6 @@ void initShop()
shopSelectedItem = -1;
player.image[0] = gfx_shipSprites[SS_FIREFLY];
player.x = 380;
player.y = 95;
drawShop();
}
@ -1029,11 +1025,11 @@ void showShop()
if (shopSelectedItem > -1)
{
screen_blit(gfx_sprites[27], 60, 350);
screen_blit(gfx_sprites[28], 710, 350);
screen_blit(gfx_sprites[SP_BUY], 60, 350);
screen_blit(gfx_sprites[SP_SELL], 710, 350);
}
screen_blit(gfx_sprites[29], (int)player.x, (int)player.y);
screen_blit(gfx_sprites[SP_FIREFLY], 380, 95);
signed char icons = SHOP_MAX;