DisplayMode: Sort modes primarily by ascending width

Makes for a slightly better organized appearance compared to ascending height.
skyjake · Apr 1, 2012 · 6487135 · 6487135
1 parent edb9aa4
commit 6487135
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/doomsday/engine/portable/src/con_busy.c b/doomsday/engine/portable/src/con_busy.c
@@ -528,7 +528,7 @@ static void Con_DrawScreenshotBackground(float x, float y, float width, float he
     GLint p; \
     glGetIntegerv(GL_TEXTURE_BINDING_2D, &p); \
     Sys_GLCheckError(); \
-    if(p != tex) fprintf(stderr, "tex=%i, got %i at line %i\n", tex, p, __LINE__); \
+    assert(p == tex); \
 }
 #else
 #define _assertTexture(tex)

diff --git a/doomsday/engine/portable/src/displaymode.cpp b/doomsday/engine/portable/src/displaymode.cpp
@@ -70,9 +70,9 @@ struct Mode : public DisplayMode
 
     bool operator < (const Mode& b) const
     {
-        if(height == b.height)
+        if(width == b.width)
         {
-            if(width == b.width)
+            if(height == b.height)
             {
                 if(depth == b.depth)
                 {
@@ -81,9 +81,9 @@ struct Mode : public DisplayMode
                 }
                 return depth < b.depth;
             }
-            return width < b.width;
+            return height < b.height;
         }
-        return height < b.height;
+        return width < b.width;
     }
 
     void updateRatio()