FIXED mapview size and forced scaling in window mode

ksterker · Oct 31, 2010 · a5a1fd4 · a5a1fd4
1 parent d6a2bb8
commit a5a1fd4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/gfx/gfx.cc b/src/gfx/gfx.cc
@@ -89,7 +89,6 @@ namespace gfx
         }
 
         screen::ShadowSurface = NULL;
-        screen::Scale = 1;
 
         screen::get_video_mode_p = (void(*)(u_int16*, u_int16*, u_int8*)) lt_dlsym(dlhandle, "gfx_screen_get_video_mode");
         if (!screen::get_video_mode_p)

diff --git a/src/gfx/screen.cc b/src/gfx/screen.cc
@@ -44,10 +44,10 @@ namespace gfx
     const u_int8 screen::TRANS_BLUE = 0xff;    
 
     // All the static data for the screen.
-    u_int16 screen::length_, screen::height_;
+    u_int16 screen::length_ = 0, screen::height_ = 0;
     u_int8 screen::bytes_per_pixel_;
     bool screen::fullscreen_;
-    u_int8 screen::Scale;
+    u_int8 screen::Scale = 1;
     surface *screen::ShadowSurface;
 
     void (*screen::get_video_mode_p) (u_int16 *l, u_int16 *h, u_int8 *depth) = NULL;
@@ -120,8 +120,11 @@ namespace gfx
     	else
     	{
     		// use maximum allowed view size for windowed mode
-    		length_ = length = max_x;
-    		height_ = height = max_y;
+    		length_ = max_x;
+    		height_ = max_y;
+
+    		length = length_ * Scale;
+    		height = height_ * Scale;
     	}
 
     	if (!set_video_mode_p (length, height, bytes_per_pixel_*8))

diff --git a/test/worldtest.cc b/test/worldtest.cc
@@ -146,6 +146,9 @@ class world_test : public adonthell::app
         game_mgr.load (base::savegame::INITIAL_SAVE);
         LOG(INFO) << "  done!";
 
+        // set mapview to proper size
+        world::area_manager::get_mapview()->resize(gfx::screen::length(), gfx::screen::height());
+
         LOG(INFO) << "Creating 'Human' specie... ";
         rpg::specie human("Human");
         human.get_state("groups/human.specie");