diff --git a/music/space_dimensions.ogg b/music/space_dimensions.ogg index dcd8f8c..351313f 100644 Binary files a/music/space_dimensions.ogg and b/music/space_dimensions.ogg differ diff --git a/src/aliens.cpp b/src/aliens.cpp index 9ed5423..c769e66 100644 --- a/src/aliens.cpp +++ b/src/aliens.cpp @@ -592,8 +592,8 @@ void initAliens() { enemy[WC_KLINE].flags |= FL_IMMORTAL | FL_NOFIRE | FL_NOMOVE; - enemy[WC_KLINE].x = (screen->w * 2) / 3; - enemy[WC_KLINE].y = screen->h / 2; + enemy[WC_KLINE].x = screen->w * 2 / 3; + enemy[WC_KLINE].y = screen->h * 2 / 3; enemy[WC_KLINE].deathCounter = -250; enemy[WC_KLINE].maxShield = 1500; diff --git a/src/collectable.cpp b/src/collectable.cpp index 22e7cb9..51314b4 100644 --- a/src/collectable.cpp +++ b/src/collectable.cpp @@ -75,6 +75,18 @@ void addCollectable(float x, float y, int type, int value, int life) return; } + // No point in giving the player plasma ammo if the weapons aren't + // upgraded! Give them money instead. + if (type == P_PLASMA_AMMO) + { + if ((weapon[W_PLAYER_WEAPON].reload[0] == rate2reload[currentGame.minPlasmaRate]) && + (weapon[W_PLAYER_WEAPON].ammo[0] == currentGame.minPlasmaOutput) && + (weapon[W_PLAYER_WEAPON].damage == currentGame.minPlasmaDamage)) + { + type = P_CASH; + } + } + // If the player has a charge cannon or a laser cannon, don't give them // rockets. Causes problems otherwise :) if (type == P_ROCKET)