r1984 - in packages/tags/wormux/0.7.4-2/debian: . patches

[Eddy Petrisor]

Author: eddyp-guest
Date: 2006-11-14 15:07:58 +0100 (Tue, 14 Nov 2006)
New Revision: 1984

Modified:
   packages/tags/wormux/0.7.4-2/debian/changelog
   packages/tags/wormux/0.7.4-2/debian/patches/001_dont_crash_if_default_resolution_is_unavailable_just-for-0.7.4.patch
Log:
merge r1983 from trunk to remove duplication of the resolutions in the resolution list

Modified: packages/tags/wormux/0.7.4-2/debian/changelog
===================================================================
--- packages/tags/wormux/0.7.4-2/debian/changelog	2006-11-14 14:02:32 UTC (rev 1983)
+++ packages/tags/wormux/0.7.4-2/debian/changelog	2006-11-14 14:07:58 UTC (rev 1984)
@@ -8,9 +8,9 @@
   * added patchutils as a build dependency since we need patches
   * wrote my name with the correct diacritic in control file
   * doesn't crash if default resolution is unavailable, thanks
-    Hanna Ollila (Closes: #395217)
+    Hanna Ollila for the initial patch (Closes: #395217)
 
- -- Eddy Petrișor <eddy.petrisor at gmail.com>  Mon, 13 Nov 2006 18:48:03 +0200
+ -- Eddy Petrișor <eddy.petrisor at gmail.com>  Mon, 13 Nov 2006 23:59:18 +0200
 
 wormux (0.7.4-1) unstable; urgency=low
 

Modified: packages/tags/wormux/0.7.4-2/debian/patches/001_dont_crash_if_default_resolution_is_unavailable_just-for-0.7.4.patch
===================================================================
--- packages/tags/wormux/0.7.4-2/debian/patches/001_dont_crash_if_default_resolution_is_unavailable_just-for-0.7.4.patch	2006-11-14 14:02:32 UTC (rev 1983)
+++ packages/tags/wormux/0.7.4-2/debian/patches/001_dont_crash_if_default_resolution_is_unavailable_just-for-0.7.4.patch	2006-11-14 14:07:58 UTC (rev 1984)
@@ -1,18 +1,19 @@
 --- wormux-0.7.4/src/menu/options_menu.cpp	2006-08-16 00:29:30.000000000 +0300
 +++ wormux-0.7.4-new/src/menu/options_menu.cpp	2006-11-12 16:31:07.000000000 +0200
-@@ -132,20 +132,17 @@
+@@ -132,20 +132,18 @@
    /* Check is there are any modes available */
    AppWormux * app = AppWormux::GetInstance();
  
 -  if(modes == (SDL_Rect **)0){
 +  std::ostringstream ss,ss2;
 +  ss << app->video.window.GetWidth() << "x" << app->video.window.GetHeight();
-+  ss2 << "Current ("<< app->video.window.GetWidth() << "x" << app->video.window.GetHeight() << ")";
++  ss2 << app->video.window.GetWidth() << "x" << app->video.window.GetHeight() << " *";
 +  lbox_video_mode->AddItem(true, ss2.str(), ss.str());
-+  
-+  lbox_video_mode->AddItem(false, "Minimum (800x600)", "800x600");
++
 +  for(int i=0;modes[i];++i) {
 +    if (modes[i]->w < 800 || modes[i]->h < 600) continue;
++    if (modes[i]->w == app->video.window.GetWidth() &&
++        modes[i]->h == app->video.window.GetHeight()) continue;
      std::ostringstream ss;
 -    ss << app->video.window.GetWidth() << "x" << app->video.window.GetHeight();
 -    lbox_video_mode->AddItem(false, "No modes available!", ss.str());