From fec0929f59c676b501c8ac4dc7cfb7bc472becfe Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Mon, 26 Aug 2002 06:46:37 +0000 Subject: [PATCH] fix bug w/mission filename --- main/mission.c | 12 ++++++------ main/mission.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/main/mission.c b/main/mission.c index dfcdbedf..326d044d 100644 --- a/main/mission.c +++ b/main/mission.c @@ -1,4 +1,4 @@ -/* $Id: mission.c,v 1.9 2002-08-23 10:43:11 btb Exp $ */ +/* $Id: mission.c,v 1.10 2002-08-26 06:46:37 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -60,7 +60,7 @@ char Secret_level_names[MAX_SECRET_LEVELS_PER_MISSION][FILENAME_LEN]; #define MISSION_DIR "./" #endif -char *Builtin_mission_filename; +char Builtin_mission_filename[9]; int Builtin_mission_hogsize; // @@ -308,14 +308,14 @@ void add_builtin_mission_to_list(int *count) Mission_list[*count].anarchy_only_flag = 0; break; default: - Warning("Unknown hogsize %d, trying %s\n", Builtin_mission_hogsize, FULL_MISSION_FILENAME); + Warning("Unknown hogsize %d, trying %s\n", Builtin_mission_hogsize, FULL_MISSION_FILENAME ".mn2"); Int3(); //fall through case FULL_MISSION_HOGSIZE: - if (!read_mission_file(FULL_MISSION_FILENAME,0,ML_CURDIR)) - Error("Could not find required mission file <%s>", FULL_MISSION_FILENAME); + if (!read_mission_file(FULL_MISSION_FILENAME ".mn2", 0, ML_CURDIR)) + Error("Could not find required mission file <%s>", FULL_MISSION_FILENAME ".mn2"); } - Builtin_mission_filename = strdup(Mission_list[*count].filename); + strcpy(Builtin_mission_filename, Mission_list[*count].filename); ++(*count); } diff --git a/main/mission.h b/main/mission.h index 453c98f2..f49d2329 100644 --- a/main/mission.h +++ b/main/mission.h @@ -1,4 +1,4 @@ -/* $Id: mission.h,v 1.3 2002-08-23 10:43:11 btb Exp $ */ +/* $Id: mission.h,v 1.4 2002-08-26 06:46:37 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -31,7 +31,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #define OEM_MISSION_NAME "D2 Destination:Quartzon" #define OEM_MISSION_HOGSIZE 6132957 -#define FULL_MISSION_FILENAME "d2.mn2" +#define FULL_MISSION_FILENAME "d2" #define FULL_MISSION_HOGSIZE 7595079 //mission list entry @@ -52,7 +52,7 @@ extern mle Mission_list[MAX_MISSIONS]; extern int Current_mission_num; extern char *Current_mission_filename,*Current_mission_longname; -extern char *Builtin_mission_filename; +extern char Builtin_mission_filename[9]; extern int Builtin_mission_hogsize; //arrays of name of the level files -- 2.39.2