From e21eac1a6c8e5b4fed2bc0ebd2e56ba9ea448b91 Mon Sep 17 00:00:00 2001 From: "FWoltermann@gmail.com" Date: Wed, 13 Jun 2012 18:34:03 +0000 Subject: Remove dependency on content.dat (The file is still required, since it was part of the last patch, but the exe will no longer fail if it isn't present) --- Stars45/Starshatter.cpp | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/Stars45/Starshatter.cpp b/Stars45/Starshatter.cpp index 13404bc..7641227 100644 --- a/Stars45/Starshatter.cpp +++ b/Stars45/Starshatter.cpp @@ -190,18 +190,19 @@ chat_mode(0), exit_time(1.2), cutscene(0) if (loader->FindFile("start.dat")) loader->EnableDatafile("start.dat"); - loadstat = loader->EnableDatafile("content.dat"); - - if (loadstat != DataLoader::DATAFILE_OK) { - const char* err_msg = loadstat == DataLoader::DATAFILE_INVALID ? - "The file 'content.dat' appears to have been damaged. Please re-install the latest Starshatter update." : - "Starshatter cannot open the file 'content.dat'. Please re-install the latest Starshatter update."; - - ::MessageBox(hwnd, err_msg, "Starshatter - Error", MB_OK); - ::Print(err_msg); - ::Print("\n\nFATAL ERROR: EXIT."); - exit(-1); - } + if (loader->FindFile("content.dat")) + loader->EnableDatafile("content.dat"); + + //if (loadstat != DataLoader::DATAFILE_OK) { + // const char* err_msg = loadstat == DataLoader::DATAFILE_INVALID ? + // "The file 'content.dat' appears to have been damaged. Please re-install the latest Starshatter update." : + // "Starshatter cannot open the file 'content.dat'. Please re-install the latest Starshatter update."; + + // ::MessageBox(hwnd, err_msg, "Starshatter - Error", MB_OK); + // ::Print(err_msg); + // ::Print("\n\nFATAL ERROR: EXIT."); + // exit(-1); + //} LoadVideoConfig("video.cfg"); -- cgit v1.1