0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allow starting up at PDA resolutions in USE_TINY_GUI mode;

Browse source 
made messages consistent
This commit is contained in:
Yann Dirson 2004-10-21 23:05:55 +00:00
parent 9541493bd2
commit 796a63de98
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/game.cpp
View file

@ -474,16 +474,17 @@ bool game_controller::init_video()
std::pair<int,int> resolution = preferences::resolution();
std::cerr << "checking mode possible...\n";
std::cerr << "Checking video mode: " << resolution.first
<< "x" << resolution.second << "x16...\n";
int bpp = video_.modePossible(resolution.first,resolution.second,16,video_flags);
std::cerr << bpp << "\n";
if(bpp == 0) {
//Video mode not supported, maybe from bad prefs.
std::cerr << "The video mode, " << resolution.first
std::cerr << "Video mode " << resolution.first
<< "x" << resolution.second << "x16 "
<< "is not supported\nAttempting 1024x768x16...\n";
<< "is not supported - attempting 1024x768x16...\n";
//Attempt 1024x768.
resolution.first = 1024;
@ -492,10 +493,7 @@ bool game_controller::init_video()
bpp = video_.modePossible(resolution.first,resolution.second,16,video_flags);
if(bpp == 0) {
//Attempt 1024x768.
resolution.first = 1024;
resolution.second = 768;
std::cerr << "1024x768x16 is not possible.\nAttempting 800x600x16...\n";
std::cerr << "1024x768x16 not available - attempting 800x600x16...\n";
resolution.first = 800;
resolution.second = 600;
@ -503,6 +501,26 @@ bool game_controller::init_video()
bpp = video_.modePossible(resolution.first,resolution.second,16,video_flags);
}
#ifdef USE_TINY_GUI
if(bpp == 0) {
std::cerr << "800x600x16 not available - attempting 640x480x16...\n";
resolution.first = 640;
resolution.second = 480;
bpp = video_.modePossible(resolution.first,resolution.second,16,video_flags);
}
if(bpp == 0) {
std::cerr << "640x480x16 not available - attempting 320x240x16...\n";
resolution.first = 320;
resolution.second = 240;
bpp = video_.modePossible(resolution.first,resolution.second,16,video_flags);
}
#endif
if(bpp == 0) {
//couldn't do 1024x768 or 800x600