[Wesnoth-commits] r42228 - in /trunk: data/core/images/terrain/fog.png data/core/images/terrain/fog1.png src/display.cpp src/display.hpp

[jeremy . rosen]

Author: boucman
Date: Fri Apr 23 18:04:51 2010
New Revision: 42228

URL: http://svn.gna.org/viewcvs/wesnoth?rev=42228&view=rev
Log:
hack in a way to have multiple fog tiles.

Added:
    trunk/data/core/images/terrain/fog1.png
      - copied unchanged from r42226, trunk/data/core/images/terrain/fog.png
Removed:
    trunk/data/core/images/terrain/fog.png
Modified:
    trunk/src/display.cpp
    trunk/src/display.hpp

Removed: trunk/data/core/images/terrain/fog.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/fog.png?rev=42227&view=auto
==============================================================================
Binary file - no diff available.

Modified: trunk/src/display.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/display.cpp?rev=42228&r1=42227&r2=42228&view=diff
==============================================================================
--- trunk/src/display.cpp (original)
+++ trunk/src/display.cpp Fri Apr 23 18:04:51 2010
@@ -98,7 +98,7 @@
        invalidateGameStatus_(true),
        map_labels_(new map_labels(*this, 0)),
        shroud_image_("terrain/" + 
get_map().get_terrain_info(t_translation::VOID_TERRAIN).minimap_image() + 
".png"),
-       fog_image_("terrain/" + 
get_map().get_terrain_info(t_translation::FOGGED).minimap_image() + ".png"),
+       fog_image_("terrain/" + 
get_map().get_terrain_info(t_translation::FOGGED).minimap_image()),
        tod_(time_of_day()),
        scroll_event_("scrolled"),
        nextDraw_(0),
@@ -2003,7 +2003,7 @@
                        image::get_image(shroud_image_, image_type)));
        } else if(fogged(loc)) {
                drawing_buffer_add(LAYER_FOG_SHROUD, loc, tblit(xpos, ypos,
-                       image::get_image(fog_image_, image_type)));
+                       image::get_image(fog_image(loc), image_type)));
        }
 
        if(!shrouded(loc)) {

Modified: trunk/src/display.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/display.hpp?rev=42228&r1=42227&r2=42228&view=diff
==============================================================================
--- trunk/src/display.hpp (original)
+++ trunk/src/display.hpp Fri Apr 23 18:04:51 2010
@@ -33,6 +33,7 @@
 #ifndef DISPLAY_H_INCLUDED
 #define DISPLAY_H_INCLUDED
 
+#include <sstream>
 class config;
 class terrain_builder;
 class map_labels;
@@ -559,6 +560,14 @@
        void draw_image_for_report(surface& img, SDL_Rect& rect);
 
        void scroll_to_xy(int screenxpos, int screenypos, SCROLL_TYPE 
scroll_type,bool force = true);
+
+       std::string fog_image(const map_location & loc){ 
+               std::stringstream tmp;
+               tmp << fog_image_;
+               tmp << (loc.x+loc.y)%3 +1;
+               tmp << ".png";
+               return tmp.str();
+       }
 
        CVideo& screen_;
        const gamemap* map_;


_______________________________________________
Wesnoth-commits mailing list
Wesnoth-commits@gna.org
https://mail.gna.org/listinfo/wesnoth-commits