mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-15 12:54:01 +02:00
Code Issues Projects Releases Wiki Activity

cleanup of show message code for headless mode

Browse Source
This commit is contained in:
Mark Vejvoda
2013-10-28 18:58:15 +00:00
parent 8bbcdfbdb3
commit 957fe2d09b
4 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/shared_lib/sources/platform/sdl/platform_util.cpp
View File

@@ -78,24 +78,17 @@ bool showMessage(const std::string & warning) {
return guiMessage;
}
void message(string message) {
showMessage(message);
void message(string message, bool isNonGraphicalModeEnabled) {
std::cerr << "******************************************************\n";
std::cerr << " " << message << "\n";
std::cerr << "******************************************************\n";
}
bool ask(string message) {
std::cerr << "Confirmation: " << message << "\n";
int res;
std::cin >> res;
return res != 0;
if(isNonGraphicalModeEnabled == false) {
showMessage(message);
}
}
void exceptionMessage(const exception &excp) {
//showMessage(excp.what());
std::cerr << "Exception: " << excp.what() << std::endl;
}

17
source/shared_lib/sources/platform/win32/platform_util.cpp
View File

@@ -325,21 +325,16 @@ megaglest_runtime_error::megaglest_runtime_error(const string& __arg,bool noStac
// assert(dispChangeErr==DISP_CHANGE_SUCCESSFUL);
//}
void message(string message){
void message(string message, bool isNonGraphicalModeEnabled) {
std::cerr << "******************************************************\n";
std::cerr << " " << message << "\n";
std::cerr << "******************************************************\n";
LPWSTR wstr = Ansi2WideString(message.c_str());
MessageBox(NULL, wstr, L"Message", MB_OK | MB_SYSTEMMODAL);
if(wstr) delete [] wstr;
}
bool ask(string message){
LPWSTR wstr = Ansi2WideString(message.c_str());
bool result = MessageBox(NULL, wstr, L"Confirmation", MB_YESNO | MB_SYSTEMMODAL) == IDYES;
if(wstr) delete [] wstr;
return result;
if(isNonGraphicalModeEnabled == false) {
LPWSTR wstr = Ansi2WideString(message.c_str());
MessageBox(NULL, wstr, L"Message", MB_OK | MB_SYSTEMMODAL);
if(wstr) delete [] wstr;
}
}
void exceptionMessage(const exception &excp){