diff --git a/music/RE.ogg b/music/RE.ogg index fa26b27..59092d2 100644 Binary files a/music/RE.ogg and b/music/RE.ogg differ diff --git a/music/rise_of_spirit.ogg b/music/rise_of_spirit.ogg new file mode 100644 index 0000000..c31277c Binary files /dev/null and b/music/rise_of_spirit.ogg differ diff --git a/music/walking_among_androids.ogg b/music/walking_among_androids.ogg new file mode 100644 index 0000000..2a19135 Binary files /dev/null and b/music/walking_among_androids.ogg differ diff --git a/sources.music b/sources.music index 50076ed..6e18e19 100644 --- a/sources.music +++ b/sources.music @@ -1,3 +1,6 @@ +http://opengameart.org/content/walking-among-androids-20 +walking_among_androids.ogg + http://opengameart.org/content/through-space through_space.ogg @@ -20,4 +23,7 @@ http://opengameart.org/content/fast-high-music RE.ogg http://opengameart.org/content/stereotypical-90s-space-shooter-music -death.ogg \ No newline at end of file +death.ogg + +http://opengameart.org/content/rise-of-spirit +rise_of_spirit.ogg \ No newline at end of file diff --git a/src/aliens.cpp b/src/aliens.cpp index 589898b..f1083b1 100644 --- a/src/aliens.cpp +++ b/src/aliens.cpp @@ -489,10 +489,6 @@ void setTarget(int index) engine.targetIndex = index; engine.targetShield = 85; engine.targetShield /= enemy[index].shield; - - engine.targetArrowTimer = -1; - if (currentGame.area == 10) - engine.targetArrowTimer = 0; } void initAliens() diff --git a/src/bullets.cpp b/src/bullets.cpp index 31297eb..fb43b63 100644 --- a/src/bullets.cpp +++ b/src/bullets.cpp @@ -349,8 +349,6 @@ static void destroyAlien(object *bullet, object *theEnemy) if (theEnemy->classDef == CD_ASTEROID) { theEnemy->shield = -999; - if ((currentGame.area == 10) && (theEnemy != &enemy[0]) && (currentMission.completed1[0] == 0) && (currentMission.targetValue1[1] == 1)) - engine.targetArrowTimer = 120; } if ((theEnemy->classDef == CD_KRASS) && (bullet->owner == &player)) diff --git a/src/globals.cpp b/src/globals.cpp index f26622e..e00d8d9 100644 --- a/src/globals.cpp +++ b/src/globals.cpp @@ -60,8 +60,6 @@ void defineGlobals() engine.minutes = 0; engine.paused = false; engine.gameSection = SECTION_TITLE; - - engine.targetArrowTimer = 0; engine.cheat = false; engine.cheatShield = false; diff --git a/src/init.cpp b/src/init.cpp index efb63b9..1cb7e70 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -42,7 +42,7 @@ void initVars() if (engine.useAudio) { - Mix_Volume(-1, 25); + Mix_Volume(-1, 50); Mix_VolumeMusic((int)engine.musicVolume); } } diff --git a/src/misc.cpp b/src/misc.cpp index 1d50175..7824775 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -117,15 +117,12 @@ static void doArrow(int i) blit(shape[arrow], x, y); - if(i != engine.targetIndex) + if (i != engine.targetIndex) return; - if(engine.targetArrowTimer == 0 || textShape[3].life > 0) + if (textShape[3].life > 0) return; - if (engine.targetArrowTimer > 0) - engine.targetArrowTimer--; - if (sxy == sx) { x -= x > screen->w / 2 ? 5 + shape[44]->w : -5 - shape[arrow]->w; y -= (shape[44]->h - shape[arrow]->h) / 2; @@ -177,12 +174,8 @@ void doInfo() textSurface(38, text, 90, 21, FONT_WHITE); blitText(38); - if (engine.targetArrowTimer < -1) { - for (int i = 0; i < MAX_ALIENS; i++) - doArrow(i); - } else if (engine.targetArrowTimer != 0) { - doArrow(engine.targetIndex); - } + for (int i = 0; i < MAX_ALIENS; i++) + doArrow(i); fontColor = FONT_WHITE; if (player.ammo[0] > 0) diff --git a/src/player.cpp b/src/player.cpp index 1d7efe3..1718400 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -186,35 +186,6 @@ void doPlayer() engine.keyState[KEY_PAUSE] = 0; } - if ((engine.keyState[KEY_TARGET]) && (currentGame.area != 10)) - { - if (engine.targetArrowTimer == -1 && currentGame.difficulty < DIFFICULTY_HARD) { - engine.targetArrowTimer = -2; - setInfoLine("Showing all targets", FONT_WHITE); - } else if (engine.targetArrowTimer < 0) { - engine.targetArrowTimer = 0; - setInfoLine("Disabled target arrows", FONT_WHITE); - } else { - engine.targetArrowTimer = -1; - setInfoLine("Showing mission target", FONT_WHITE); - } - - engine.keyState[KEY_TARGET] = 0; - } - - if ((engine.missionCompleteTimer == 0) && (engine.targetArrowTimer == -1)) - { - if ((enemy[engine.targetIndex].shield < 1) && (currentGame.area != 10)) - { - engine.targetIndex = rand() % MAX_ALIENS; - - if (enemy[engine.targetIndex].flags & FL_FRIEND) - engine.targetIndex = 0; - else - setTarget(engine.targetIndex); - } - } - if (((currentGame.area == 18) && (enemy[WC_BOSS].shield > 0)) || (currentGame.area == 24)) player.face = 0; @@ -309,8 +280,6 @@ static enum keys mapkey(uint32_t code) { return KEY_FIRE; case SDLK_SPACE: return KEY_ALTFIRE; - case SDLK_t: - return KEY_TARGET; case SDLK_LSHIFT: case SDLK_RSHIFT: return KEY_SWITCH; @@ -373,9 +342,6 @@ void getPlayerInput() case 2: engine.keyState[KEY_SWITCH] = engine.event.jbutton.state; break; - case 3: - engine.keyState[KEY_TARGET] = engine.event.jbutton.state; - break; } break; diff --git a/src/structs.h b/src/structs.h index c2cadee..21fc4db 100644 --- a/src/structs.h +++ b/src/structs.h @@ -211,7 +211,6 @@ enum keys { KEY_RIGHT, KEY_FIRE, KEY_ALTFIRE, - KEY_TARGET, KEY_SWITCH, KEY_PAUSE, KEY_ESCAPE, @@ -256,7 +255,6 @@ struct globalEngineVariables { float targetShield; signed char targetIndex; - int targetArrowTimer; // Mission completion timer (allows for 4 seconds before leaving sector) unsigned long missionCompleteTimer; diff --git a/src/title.cpp b/src/title.cpp index 61a9ceb..2ddd4bd 100644 --- a/src/title.cpp +++ b/src/title.cpp @@ -189,7 +189,7 @@ int doTitle() signed char continueSaveSlot = initSaveSlots(); - loadMusic("music/Platinum.mod"); + loadMusic("music/walking_among_androids.ogg"); loadBackground("gfx/spirit.jpg"); @@ -656,7 +656,7 @@ void doCredits() freeGraphics(); if ((engine.useMusic) && (engine.useAudio)) - loadMusic("music/Solace.s3m"); + loadMusic("music/rise_of_spirit.ogg"); FILE *fp; int numberOfCredits = 0;