diff --git a/src/defs.h b/src/defs.h index c87af8b..09f33ef 100644 --- a/src/defs.h +++ b/src/defs.h @@ -487,7 +487,7 @@ enum { SHOP_S_MAX }; -// Text sprites (main menu) +// Text sprites enum { // Main menu TS_PRESENTS = MAX_INFOLINES, @@ -532,7 +532,6 @@ enum { // Status TS_STATUS_HEADER, - TS_MISSIONS_COMPLETED, TS_SHOTS_FIRED, TS_HITS_SCORED, TS_ACCURACY, @@ -546,7 +545,6 @@ enum { TS_CHRIS_POWERUP_PICKUPS, TS_CHRIS_MINES_KILLED, TS_CHRIS_SLAVES_RESCUED, - TS_CHRIS_CARGO_PICKUPS, TS_PHOEBE_HEADER, TS_PHOEBE_KILLS, TS_PHOEBE_DEATHS, diff --git a/src/intermission.cpp b/src/intermission.cpp index b8ffe06..690ba01 100644 --- a/src/intermission.cpp +++ b/src/intermission.cpp @@ -39,32 +39,9 @@ These are set only once. static void intermission_setStatusLines() { char string[50]; - int total = 0; - int completed = 0; int timeTaken = game.timeTaken; int y; - // XXX: Magic number - for (int i = 0 ; i < 10 ; i++) - { - if (systemPlanet[i].missionNumber > -1) - { - switch(systemPlanet[i].missionCompleted) - { - case 0: - total++; - break; - case 1: - total++; - completed++; - break; - } - } - } - - sprintf(string, "Missions Completed : %d/%d", completed, total); - gfx_createTextObject(TS_MISSIONS_COMPLETED, string, 0, 0, FONT_WHITE); - sprintf(string, "Shots Fired : %d", game.shots); gfx_createTextObject(TS_SHOTS_FIRED, string, 0, 0, FONT_WHITE); @@ -94,7 +71,7 @@ static void intermission_setStatusLines() sprintf(string, "Rockets Picked Up : %d", game.rocketPickups); gfx_createTextObject(TS_CHRIS_ROCKET_PICKUPS, string, 0, 0, FONT_WHITE); - sprintf(string, "Powerups Picked Up : %d", game.rocketPickups); + sprintf(string, "Powerups Picked Up : %d", game.powerups); gfx_createTextObject(TS_CHRIS_POWERUP_PICKUPS, string, 0, 0, FONT_WHITE); sprintf(string, "Mines Destroyed : %d", game.minesKilled); @@ -103,9 +80,6 @@ static void intermission_setStatusLines() sprintf(string, "Slaves Rescued : %d", game.slavesRescued); gfx_createTextObject(TS_CHRIS_SLAVES_RESCUED, string, 0, 0, FONT_WHITE); - sprintf(string, "Cargo Picked Up : %d", game.cargoPickups); - gfx_createTextObject(TS_CHRIS_CARGO_PICKUPS, string, 0, 0, FONT_WHITE); - if (game.hasWingMate1) { gfx_createTextObject(TS_PHOEBE_HEADER, "*** Phoebe ***", 0, 0, FONT_WHITE); @@ -116,6 +90,12 @@ static void intermission_setStatusLines() sprintf(string, "Ejections : %d", game.wingMate1Ejects); gfx_createTextObject(TS_PHOEBE_DEATHS, string, 0, 0, FONT_WHITE); } + else + { + gfx_createTextObject(TS_PHOEBE_HEADER, "", 0, 0, FONT_WHITE); + gfx_createTextObject(TS_PHOEBE_KILLS, "", 0, 0, FONT_WHITE); + gfx_createTextObject(TS_PHOEBE_DEATHS, "", 0, 0, FONT_WHITE); + } if (game.hasWingMate2) { @@ -127,6 +107,12 @@ static void intermission_setStatusLines() sprintf(string, "Ejections : %d", game.wingMate2Ejects); gfx_createTextObject(TS_URSULA_DEATHS, string, 0, 0, FONT_WHITE); } + else + { + gfx_createTextObject(TS_URSULA_HEADER, "", 0, 0, FONT_WHITE); + gfx_createTextObject(TS_URSULA_KILLS, "", 0, 0, FONT_WHITE); + gfx_createTextObject(TS_URSULA_DEATHS, "", 0, 0, FONT_WHITE); + } gfx_createTextObject(TS_STATUS_HEADER, "Current Status", -1, 83, FONT_WHITE);