diff --git a/gfx/battle/challengeComplete.png b/gfx/battle/challengeComplete.png new file mode 100644 index 0000000..f66e3b1 Binary files /dev/null and b/gfx/battle/challengeComplete.png differ diff --git a/gfx/battle/challengeFailed.png b/gfx/battle/challengeFailed.png new file mode 100644 index 0000000..7abc61e Binary files /dev/null and b/gfx/battle/challengeFailed.png differ diff --git a/gfx/battle/challengeInProgress.png b/gfx/battle/challengeInProgress.png new file mode 100644 index 0000000..489e8fa Binary files /dev/null and b/gfx/battle/challengeInProgress.png differ diff --git a/gfx/battle/challengeStart.png b/gfx/battle/challengeStart.png new file mode 100644 index 0000000..2227bcc Binary files /dev/null and b/gfx/battle/challengeStart.png differ diff --git a/src/battle/battle.c b/src/battle/battle.c index cd4048e..4cc7624 100644 --- a/src/battle/battle.c +++ b/src/battle/battle.c @@ -72,8 +72,6 @@ void initBattle(void) initMessageBox(); - initMissionInfo(); - initDebris(); resetWaypoints(); diff --git a/src/battle/battle.h b/src/battle/battle.h index e18d870..b2046be 100644 --- a/src/battle/battle.h +++ b/src/battle/battle.h @@ -52,7 +52,6 @@ extern void doWidgets(void); extern void loadMission(char *filename); extern void resetHud(void); extern void doHud(void); -extern void initMissionInfo(void); extern void drawMissionInfo(void); extern void drawBackground(SDL_Texture *texture); extern void initBackground(void); diff --git a/src/battle/missionInfo.c b/src/battle/missionInfo.c index 5a6d898..b0edd38 100644 --- a/src/battle/missionInfo.c +++ b/src/battle/missionInfo.c @@ -30,10 +30,10 @@ static const char *objectiveStatus[] = {"Incomplete", "Complete", "Failed", "Con void initMissionInfo(void) { - missionStartTexture = getTexture("gfx/battle/missionStart.png"); - missionInProgressTexture = getTexture("gfx/battle/missionInProgress.png"); - missionCompleteTexture = getTexture("gfx/battle/missionComplete.png"); - missionFailedTexture = getTexture("gfx/battle/missionFailed.png"); + missionStartTexture = !battle.isChallenge ? getTexture("gfx/battle/missionStart.png") : getTexture("gfx/battle/challengeStart.png"); + missionInProgressTexture = !battle.isChallenge ? getTexture("gfx/battle/missionInProgress.png") : getTexture("gfx/battle/challengeInProgress.png"); + missionCompleteTexture = !battle.isChallenge ? getTexture("gfx/battle/missionComplete.png") : getTexture("gfx/battle/challengeComplete.png"); + missionFailedTexture = !battle.isChallenge ? getTexture("gfx/battle/missionFailed.png") : getTexture("gfx/battle/challengeFailed.png"); } void drawMissionInfo(void) diff --git a/src/galaxy/mission.c b/src/galaxy/mission.c index bfbdde2..e757a3e 100644 --- a/src/galaxy/mission.c +++ b/src/galaxy/mission.c @@ -117,7 +117,7 @@ void loadMission(char *filename) battle.background = getTexture(cJSON_GetObjectItem(root, "background")->valuestring); - planetScale = 75 + (rand() % 125); + planetScale = 25 + (rand() % 100); planetScale *= 0.01; battle.planetTexture = getTexture(cJSON_GetObjectItem(root, "planet")->valuestring); battle.planet.x = (SCREEN_WIDTH / 2) - (rand() % SCREEN_WIDTH) + (rand() % SCREEN_WIDTH); @@ -183,6 +183,8 @@ void loadMission(char *filename) battle.isChallenge = game.currentMission->challengeHead.next != NULL; + initMissionInfo(); + playMusic(music); } diff --git a/src/galaxy/mission.h b/src/galaxy/mission.h index 34d61a9..1437de9 100644 --- a/src/galaxy/mission.h +++ b/src/galaxy/mission.h @@ -47,6 +47,7 @@ extern void initScript(cJSON *missionJSON); extern char *getFileLocation(char *filename); extern void updateCapitalShipComponentProperties(Entity *parent); extern void countNumEnemies(void); +extern void initMissionInfo(void); extern Battle battle; extern Entity *player;