diff options
| author | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-06-13 18:34:03 +0000 |
|---|---|---|
| committer | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-06-13 18:34:03 +0000 |
| commit | e21eac1a6c8e5b4fed2bc0ebd2e56ba9ea448b91 (patch) | |
| tree | 1250d8c3350537fb14a272fa78f1dea83281f154 | |
| parent | 9f82a198819854173c36baeea924ffefe69611f5 (diff) | |
| download | starshatter-e21eac1a6c8e5b4fed2bc0ebd2e56ba9ea448b91.zip starshatter-e21eac1a6c8e5b4fed2bc0ebd2e56ba9ea448b91.tar.gz starshatter-e21eac1a6c8e5b4fed2bc0ebd2e56ba9ea448b91.tar.bz2 | |
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)
| -rw-r--r-- | Stars45/Starshatter.cpp | 25 |
1 files 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");
|