r122 - in trunk: . src

[DONOTREPLY at icculus.org]

Author: jonas
Date: 2005-07-10 06:01:26 -0400 (Sun, 10 Jul 2005)
New Revision: 122

Modified:
   trunk/lost_penguins.conf
   trunk/src/common.h
   trunk/src/gfxeng.cpp
   trunk/src/lost_penguins.cpp
   trunk/src/menu.cpp
Log:
support automatically selected bpp

Modified: trunk/lost_penguins.conf
===================================================================
--- trunk/lost_penguins.conf	2005-07-10 09:41:56 UTC (rev 121)
+++ trunk/lost_penguins.conf	2005-07-10 10:01:26 UTC (rev 122)
@@ -4,4 +4,3 @@
 full 0
 width 1024
 height 768
-bpp 16

Modified: trunk/src/common.h
===================================================================
--- trunk/src/common.h	2005-07-10 09:41:56 UTC (rev 121)
+++ trunk/src/common.h	2005-07-10 10:01:26 UTC (rev 122)
@@ -100,7 +100,6 @@
 struct Config {
     Uint16 width;
     Uint16 height;
-    Uint8 bpp;
     bool full;
     Uint16 audio_format;
     int audio_rate;

Modified: trunk/src/gfxeng.cpp
===================================================================
--- trunk/src/gfxeng.cpp	2005-07-10 09:41:56 UTC (rev 121)
+++ trunk/src/gfxeng.cpp	2005-07-10 10:01:26 UTC (rev 122)
@@ -95,7 +95,7 @@
     if (fullscreen) vflags|=SDL_FULLSCREEN;
     else vflags&=~SDL_FULLSCREEN;
 
-    if ((screen=SDL_SetVideoMode(width,height,config.bpp,vflags)) != NULL) {
+    if ((screen=SDL_SetVideoMode(width,height,0,vflags)) != NULL) {
     } else {
         cout << "Couldn't set VideoMode: " << SDL_GetError() << endl;
         quitGame(-1);

Modified: trunk/src/lost_penguins.cpp
===================================================================
--- trunk/src/lost_penguins.cpp	2005-07-10 09:41:56 UTC (rev 121)
+++ trunk/src/lost_penguins.cpp	2005-07-10 10:01:26 UTC (rev 122)
@@ -89,7 +89,6 @@
     //default values
     config.width=640;
     config.height=480;
-    config.bpp=16;
     config.full=false;
     config.audio_rate = MIX_DEFAULT_FREQUENCY;
     config.audio_format = MIX_DEFAULT_FORMAT;
@@ -133,8 +132,6 @@
             config.width=atoi(arg1.c_str());
         } else if (option=="height") {
             config.height=atoi(arg1.c_str());
-        } else if (option=="bpp") {
-            config.bpp=atoi(arg1.c_str());
         } else if (option=="full") {
             if (arg1=="1") config.full=true;
             else config.full=false;
@@ -157,9 +154,6 @@
         } else if ( strcmp(argv[i], "-height") == 0 || strcmp(argv[i], "-h") == 0) {
             config.height=atoi(argv[i+1]);
             i++;
-        } else if ( strcmp(argv[i], "-bpp") == 0 ) {
-            config.bpp=atoi(argv[i+1]);
-            i++;
         } else if ( strcmp(argv[i], "-full") == 0 || strcmp(argv[i], "-fs") == 0) {
             config.full=SDL_FULLSCREEN;
         } else if ( strcmp(argv[i], "-map") == 0 ) {
@@ -176,7 +170,6 @@
     cout << "Usage: lost_penguins [OPTIONS]\n\n";
     cout << "  -w, -width   Changes resolution (width) of game.    Default: 640\n";
     cout << "  -h, -height  Changes resolution (height) of game.   Default: 480\n";
-    cout << "  -bpp         Specifies color depth (bpp) of screen. Default: 16\n";
     cout << "  -fs, -full   Enable fullscreen.                     Default: disabled\n";
     cout << "  -map         Load specified map from data dir.      Default: map1\n";
     cout << "  -h, --help   Show this text \n";

Modified: trunk/src/menu.cpp
===================================================================
--- trunk/src/menu.cpp	2005-07-10 09:41:56 UTC (rev 121)
+++ trunk/src/menu.cpp	2005-07-10 10:01:26 UTC (rev 122)
@@ -271,7 +271,7 @@
     entries[0]="Fullscreen:  " + string((gfxeng->fullscreen) ? "ON" : "OFF");
     entries[1]="Show FPS: "+string((gfxeng->show_fps) ? "ON" : "OFF");
     entries[2]="Show Player Bar: "+string((gfxeng->show_bar) ? "ON" : "OFF");
-    entries[3]="Video settings:  [" + string(driver_name) + "]   " + itos(gfxeng->screen->w) + " x " + itos(gfxeng->screen->h) + "  (" + itos(config.bpp) + " bpp)";
+    entries[3]="Video settings:  [" + string(driver_name) + "]   " + itos(gfxeng->screen->w) + " x " + itos(gfxeng->screen->h);
 /*
     entries.push_back("");