[Pingus-CVS] CVS: Games/Pingus/src smallmap.cxx,1.35,1.36 smallmap.hxx,1.16,1.17

[grumbel]

Update of /var/lib/cvs/Games/Pingus/src
In directory dark:/tmp/cvs-serv29565/src

Modified Files:
        smallmap.cxx smallmap.hxx 
Log Message:
another level, should be the last one for 0.6

Index: smallmap.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/smallmap.cxx,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- smallmap.cxx        21 Mar 2003 22:08:06 -0000      1.35
+++ smallmap.cxx        2 Apr 2003 12:04:04 -0000       1.36
@@ -40,6 +40,9 @@
   max_width = 175;
   max_height = 100;
 
+  min_height = 70;
+  min_width = 100;
+
   // Don't really need to initialise these now as this values are calculated
   // later on.  However, initialise here, just in case.
   width = 175;
@@ -81,12 +84,12 @@
       // pixels than one vertical pixel
       if (x_scaling > y_scaling)
         {
-          width = max_width;
-          height = colmap->get_height() / x_scaling;
+          width  = max_width;
+          height = Math::max(min_height, colmap->get_height() / x_scaling);
         }
       else
         {
-          width = colmap->get_width() / y_scaling;
+          width  = Math::max(min_width, colmap->get_width() / y_scaling);
           height = max_height;
         }
 

Index: smallmap.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/smallmap.hxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- smallmap.hxx        19 Feb 2003 10:37:31 -0000      1.16
+++ smallmap.hxx        2 Apr 2003 12:04:04 -0000       1.17
@@ -59,6 +59,9 @@
   /** Height of the small map */
   int height;
 
+  int min_width;
+  int min_height;
+
   /** Max width of the small map */
   int max_width;