[Wesnoth-cvs-commits] wesnoth/src gamestatus.cpp map_create.cpp terra...

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/03/23 22:08:52

Modified files:
        src            : gamestatus.cpp map_create.cpp terrain.cpp 
                         terrain.hpp 

Log message:
        get rid of terrain_type::get_rgb => more include cleanups

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/gamestatus.cpp.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/map_create.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/terrain.cpp.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/terrain.hpp.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: wesnoth/src/gamestatus.cpp
diff -u wesnoth/src/gamestatus.cpp:1.61 wesnoth/src/gamestatus.cpp:1.62
--- wesnoth/src/gamestatus.cpp:1.61     Tue Mar 22 23:42:36 2005
+++ wesnoth/src/gamestatus.cpp  Wed Mar 23 22:08:52 2005
@@ -1,4 +1,4 @@
-/* $Id: gamestatus.cpp,v 1.61 2005/03/22 23:42:36 ydirson Exp $ */
+/* $Id: gamestatus.cpp,v 1.62 2005/03/23 22:08:52 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -28,6 +28,7 @@
 
 #include <algorithm>
 #include <cstdio>
+#include <iostream>
 #include <iterator>
 #include <sstream>
 
Index: wesnoth/src/map_create.cpp
diff -u wesnoth/src/map_create.cpp:1.3 wesnoth/src/map_create.cpp:1.4
--- wesnoth/src/map_create.cpp:1.3      Wed Mar  9 20:48:42 2005
+++ wesnoth/src/map_create.cpp  Wed Mar 23 22:08:52 2005
@@ -4,8 +4,12 @@
 #include "log.hpp"
 #include "map_create.hpp"
 #include "mapgen_dialog.hpp"
+#include "scoped_resource.hpp"
 #include "serialization/string_utils.hpp"
 
+#include <string>
+#include <vector>
+
 #define ERR_CF lg::err(lg::config)
 
 map_generator* create_map_generator(const std::string& name, const config* cfg)
Index: wesnoth/src/terrain.cpp
diff -u wesnoth/src/terrain.cpp:1.26 wesnoth/src/terrain.cpp:1.27
--- wesnoth/src/terrain.cpp:1.26        Thu Mar 10 22:03:32 2005
+++ wesnoth/src/terrain.cpp     Wed Mar 23 22:08:52 2005
@@ -1,4 +1,4 @@
-/* $Id: terrain.cpp,v 1.26 2005/03/10 22:03:32 ydirson Exp $ */
+/* $Id: terrain.cpp,v 1.27 2005/03/23 22:08:52 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -46,8 +46,6 @@
                type_ = alias;
        }
 
-       colour_.read(cfg);
-
        height_adjust_ = atoi(cfg["unit_height_adjust"].c_str());
        submerge_ = atof(cfg["submerge"].c_str());
 
@@ -84,11 +82,6 @@
        return type_;
 }
 
-pixel_data terrain_type::get_rgb() const
-{
-       return colour_;
-}
-
 bool terrain_type::is_light() const
 {
        return is_light_;
Index: wesnoth/src/terrain.hpp
diff -u wesnoth/src/terrain.hpp:1.21 wesnoth/src/terrain.hpp:1.22
--- wesnoth/src/terrain.hpp:1.21        Thu Mar 10 22:03:32 2005
+++ wesnoth/src/terrain.hpp     Wed Mar 23 22:08:52 2005
@@ -1,4 +1,4 @@
-/* $Id: terrain.hpp,v 1.21 2005/03/10 22:03:32 ydirson Exp $ */
+/* $Id: terrain.hpp,v 1.22 2005/03/23 22:08:52 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -14,7 +14,6 @@
 #define TERRAIN_H_INCLUDED
 
 class config;
-#include "sdl_utils.hpp"
 
 #include <map>
 #include <string>
@@ -36,8 +35,6 @@
        //the underlying type of the terrain
        const std::string& type() const;
 
-       pixel_data get_rgb() const;
-
        bool is_light() const;
        bool is_alias() const;
 
@@ -60,8 +57,6 @@
        char letter_;
        std::string type_;
 
-       pixel_data colour_;
-
        int height_adjust_;
 
        double submerge_;
@@ -74,6 +69,6 @@
 void create_terrain_maps(const std::vector<config*>& cfgs,
                          std::vector<char>& terrain_precedence,
                          std::map<char,terrain_type>& letter_to_terrain,
-                                                
std::map<std::string,terrain_type>& str_to_terrain);
+                        std::map<std::string,terrain_type>& str_to_terrain);
 
 #endif