thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AGS: Get game filename from detection entry

Browse source
This commit is contained in:
Paul Gilbert 2020-11-29 16:44:56 -08:00
parent 1b86461eda
commit bb23db380f
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
engines/ags/ags.cpp
View file

@ -61,7 +61,7 @@ using namespace Engine;
String appDirectory; // Needed for library loading String appDirectory; // Needed for library loading
String cmdGameDataPath; String cmdGameDataPath;
char **global_argv = nullptr; const char **global_argv = nullptr;
int global_argc = 0; int global_argc = 0;
extern GameSetup usetup; extern GameSetup usetup;
@ -135,7 +135,7 @@ void main_create_platform_driver() {
platform = AGSPlatformDriver::GetDriver(); platform = AGSPlatformDriver::GetDriver();
} }
void main_init(int argc, char *argv[]) { void main_init(int argc, const char *argv[]) {
EngineVersion = Version(ACI_VERSION_STR " " SPECIAL_VERSION); EngineVersion = Version(ACI_VERSION_STR " " SPECIAL_VERSION);
SavedgameLowestBackwardCompatVersion = Version(SVG_VERSION_BWCOMPAT_MAJOR, SVG_VERSION_BWCOMPAT_MINOR, SVG_VERSION_BWCOMPAT_RELEASE, SVG_VERSION_BWCOMPAT_REVISION); SavedgameLowestBackwardCompatVersion = Version(SVG_VERSION_BWCOMPAT_MAJOR, SVG_VERSION_BWCOMPAT_MINOR, SVG_VERSION_BWCOMPAT_RELEASE, SVG_VERSION_BWCOMPAT_REVISION);
@ -159,7 +159,7 @@ void main_print_help() {
// No implementation // No implementation
} }
static int main_process_cmdline(ConfigTree &cfg, int argc, char *argv[]) { static int main_process_cmdline(ConfigTree &cfg, int argc, const char *argv[]) {
int datafile_argv = 0; int datafile_argv = 0;
for (int ee = 1; ee < argc; ++ee) { for (int ee = 1; ee < argc; ++ee) {
const char *arg = argv[ee]; const char *arg = argv[ee];
@ -267,7 +267,7 @@ static int main_process_cmdline(ConfigTree &cfg, int argc, char *argv[]) {
return 0; return 0;
} }
void main_set_gamedir(int argc, char *argv[]) { void main_set_gamedir(int argc, const char *argv[]) {
appDirectory = Path::GetDirectoryPath(GetPathFromCmdArg(0)); appDirectory = Path::GetDirectoryPath(GetPathFromCmdArg(0));
if ((loadSaveGameOnStartup != nullptr) && (argv[0] != nullptr)) { if ((loadSaveGameOnStartup != nullptr) && (argv[0] != nullptr)) {
@ -339,16 +339,14 @@ uint32 AGSEngine::getFeatures() const {
} }
Common::Error AGSEngine::run() { Common::Error AGSEngine::run() {
char exeName[16], gameName[16]; const char *filename = _gameDescription->desc.filesDescriptions[0].fileName;
strcpy(exeName, "scummvm.exe"); const char *ARGV[] = { nullptr, filename };
strcpy(gameName, "bc.exe"); const int ARGC = 2;
int argc = 3;
char *argv[] = { exeName, gameName };
#ifdef AGS_RUN_TESTS #ifdef AGS_RUN_TESTS
Test_DoAllTests(); Test_DoAllTests();
#endif #endif
AGS3::main_init(argc, argv); AGS3::main_init(ARGC, ARGV);
#if AGS_PLATFORM_OS_WINDOWS #if AGS_PLATFORM_OS_WINDOWS
setup_malloc_handling(); setup_malloc_handling();
@ -356,7 +354,7 @@ Common::Error AGSEngine::run() {
AGS3::debug_flags = 0; AGS3::debug_flags = 0;
AGS3::ConfigTree startup_opts; AGS3::ConfigTree startup_opts;
int res = AGS3::main_process_cmdline(startup_opts, argc, argv); int res = AGS3::main_process_cmdline(startup_opts, ARGC, ARGV);
if (res != 0) if (res != 0)
return Common::kUnknownError; return Common::kUnknownError;
@ -375,7 +373,7 @@ Common::Error AGSEngine::run() {
AGS3::init_debug(startup_opts, AGS3::justTellInfo); AGS3::init_debug(startup_opts, AGS3::justTellInfo);
AGS3::Debug::Printf("%s", AGS3::get_engine_string().GetNullableCStr()); AGS3::Debug::Printf("%s", AGS3::get_engine_string().GetNullableCStr());
AGS3::main_set_gamedir(argc, argv); AGS3::main_set_gamedir(ARGC, ARGV);
// Update shell associations and exit // Update shell associations and exit
if (AGS3::debug_flags & DBG_REGONLY) if (AGS3::debug_flags & DBG_REGONLY)

2
engines/ags/engine/main/main.h
View file

@ -37,7 +37,7 @@ extern AGS::Shared::Version SavedgameLowestForwardCompatVersion;
//============================================================================= //=============================================================================
extern char **global_argv; extern const char **global_argv;
// Location of the engine executable // Location of the engine executable
extern AGS::Shared::String appDirectory; extern AGS::Shared::String appDirectory;