TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use unique_ptr for Current_mission

Browse source
This commit is contained in:
Kp 2014-07-20 22:13:25 +00:00
parent ce1729f23a
commit 6826e966a7
5 changed files with 36 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
common/main/mission.h
View file

@ -26,6 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#ifndef _MISSION_H
#define _MISSION_H
#include <memory>
#include "pstypes.h"
#include "inferno.h"
@ -95,7 +96,18 @@ struct Mission {
#endif
};
extern Mission *Current_mission; // current mission
void free_mission(std::unique_ptr<Mission>);
struct mission_delete
{
void operator()(Mission *p) const
{
free_mission(std::unique_ptr<Mission>(p));
}
};
typedef std::unique_ptr<Mission, mission_delete> Mission_ptr;
extern Mission_ptr Current_mission; // current mission
#define Current_mission_longname Current_mission->mission_name
#define Current_mission_filename Current_mission->filename
@ -146,8 +158,6 @@ int load_mission_by_name (const char *mission_name);
//Returns 1 if a mission was loaded.
int select_mission (int anarchy_mode, const char *message, int (*when_selected)(void));
void free_mission(void);
#ifdef EDITOR
void create_new_mission(void);
#endif

2
similar/main/credits.cpp
View file

@ -62,7 +62,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#define CREDITS_FILE "credits.tex"
#elif defined(DXX_BUILD_DESCENT_II)
#define CREDITS_FILE (PHYSFSX_exists("mcredits.tex",1)?"mcredits.tex":PHYSFSX_exists("ocredits.tex",1)?"ocredits.tex":"credits.tex")
#define ALLOWED_CHAR ( Current_mission==NULL ? 'R' : (is_SHAREWARE ? 'S' : 'R'))
#define ALLOWED_CHAR (!Current_mission ? 'R' : (is_SHAREWARE ? 'S' : 'R'))
#endif
struct credits

2
similar/main/inferno.cpp
View file

@ -559,7 +559,7 @@ int main(int argc, char *argv[])
free_text();
args_exit();
newmenu_free_background();
free_mission();
Current_mission.reset();
PHYSFSX_removeArchiveContent();
return(0); //presumably successful exit

47
similar/main/mission.cpp
View file

@ -74,7 +74,7 @@ struct mle
static int num_missions = -1;
Mission *Current_mission = NULL; // currently loaded mission
Mission_ptr Current_mission; // currently loaded mission
// Allocate the Level_names, Secret_level_names and Secret_level_table arrays
static int allocate_levels(void)
@ -118,7 +118,7 @@ static int load_mission_d1(void)
if (!allocate_levels())
{
free_mission();
Current_mission.reset();
return 0;
}
@ -138,7 +138,7 @@ static int load_mission_d1(void)
if (!allocate_levels())
{
free_mission();
Current_mission.reset();
return 0;
}
@ -159,7 +159,7 @@ static int load_mission_d1(void)
if (!allocate_levels())
{
free_mission();
Current_mission.reset();
return 0;
}
@ -188,7 +188,7 @@ static int load_mission_d1(void)
if (!allocate_levels())
{
free_mission();
Current_mission.reset();
return 0;
}
@ -232,7 +232,7 @@ static int load_mission_shareware(void)
if (!allocate_levels())
{
free_mission();
Current_mission.reset();
return 0;
}
@ -253,7 +253,7 @@ static int load_mission_shareware(void)
if (!allocate_levels())
{
free_mission();
Current_mission.reset();
return 0;
}
@ -283,7 +283,7 @@ static int load_mission_oem(void)
if (!allocate_levels())
{
free_mission();
Current_mission.reset();
return 0;
}
@ -608,7 +608,7 @@ static void promote (mle *mission_list, const char * mission_name, int * top_pla
}
}
void free_mission(void)
void free_mission(std::unique_ptr<Mission> Current_mission)
{
// May become more complex with the editor
if (Current_mission)
@ -634,8 +634,6 @@ void free_mission(void)
if (Current_mission->alternate_ham_file)
d_free(Current_mission->alternate_ham_file);
#endif
d_free(Current_mission);
}
}
@ -763,10 +761,7 @@ static int load_mission(mle *mission)
PHYSFS_file *mfile;
char buf[PATH_MAX], *v;
if (Current_mission)
free_mission();
MALLOC(Current_mission, Mission, 1);
if (!Current_mission) return 0;
Current_mission.reset(new Mission);
Current_mission->builtin_hogsize = mission->builtin_hogsize;
strcpy(Current_mission->mission_name, mission->mission_name);
#if defined(DXX_BUILD_DESCENT_II)
@ -855,7 +850,7 @@ static int load_mission(mle *mission)
mfile = PHYSFSX_openReadBuffered(buf);
if (mfile == NULL) {
free_mission();
Current_mission.reset();
return 0; //error!
}
@ -959,7 +954,7 @@ static int load_mission(mle *mission)
MALLOC(Level_names, d_fname, n_levels);
if (!Level_names)
{
free_mission();
Current_mission.reset();
return 0;
}
@ -988,14 +983,14 @@ static int load_mission(mle *mission)
MALLOC(Secret_level_names, d_fname, N_secret_levels);
if (!Secret_level_names)
{
free_mission();
Current_mission.reset();
return 0;
}
MALLOC(Secret_level_table, ubyte, N_secret_levels);
if (!Secret_level_table)
{
free_mission();
Current_mission.reset();
return 0;
}
@ -1054,7 +1049,7 @@ static int load_mission(mle *mission)
PHYSFS_close(mfile);
if (Last_level <= 0) {
free_mission(); //no valid mission loaded
Current_mission.reset(); //no valid mission loaded
return 0;
}
@ -1179,17 +1174,11 @@ int select_mission(int anarchy_mode, const char *message, int (*when_selected)(v
#ifdef EDITOR
void create_new_mission(void)
{
if (Current_mission)
free_mission();
CALLOC(Current_mission, Mission, 1);
if (!Current_mission)
return;
Current_mission.reset(new Mission{});
Current_mission->path = d_strdup("new_mission");
if (!Current_mission->path)
{
free_mission();
Current_mission.reset();
return;
}
@ -1198,7 +1187,7 @@ void create_new_mission(void)
MALLOC(Level_names, d_fname, 1);
if (!Level_names)
{
free_mission();
Current_mission.reset();
return;
}

6
similar/main/newdemo.cpp
View file

@ -2996,7 +2996,7 @@ static int newdemo_read_frame_information(int rewrite)
}
if ((loaded_level < Last_secret_level) || (loaded_level > Last_level)) {
nm_messagebox( NULL, 1, TXT_OK, "%s\n%s\n%s", TXT_CANT_PLAYBACK, TXT_LEVEL_CANT_LOAD, TXT_DEMO_OLD_CORRUPT );
free_mission();
Current_mission.reset();
return -1;
}
@ -3110,7 +3110,7 @@ static int newdemo_read_frame_information(int rewrite)
if (nd_playback_v_bad_read) {
nm_messagebox( NULL, 1, TXT_OK, "%s %s", TXT_DEMO_ERR_READING, TXT_DEMO_OLD_CORRUPT );
free_mission();
Current_mission.reset();
}
return done;
@ -3146,7 +3146,7 @@ void newdemo_goto_end(int to_rewrite)
{
if ((level < Last_secret_level) || (level > Last_level)) {
nm_messagebox( NULL, 1, TXT_OK, "%s\n%s\n%s", TXT_CANT_PLAYBACK, TXT_LEVEL_CANT_LOAD, TXT_DEMO_OLD_CORRUPT );
free_mission();
Current_mission.reset();
newdemo_stop_playback();
return;
}