Author: silene
Date: Sat Feb 13 11:18:45 2010
New Revision: 41179
URL: http://svn.gna.org/viewcvs/wesnoth?rev=41179&view=rev
Log:
Removed useless base class.
Removed:
trunk/src/viewpoint.hpp
Modified:
trunk/src/display.hpp
trunk/src/minimap.cpp
trunk/src/minimap.hpp
trunk/src/team.hpp
Modified: trunk/src/display.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/display.hpp?rev=41179&r1=41178&r2=41179&view=diff
==============================================================================
--- trunk/src/display.hpp (original)
+++ trunk/src/display.hpp Sat Feb 13 11:18:45 2010
@@ -43,10 +43,10 @@
#include "key.hpp"
#include "map_location.hpp"
#include "reports.hpp"
+#include "team.hpp"
#include "time_of_day.hpp"
#include "theme.hpp"
#include "video.hpp"
-#include "viewpoint.hpp"
#include "widgets/button.hpp"
#include "SDL.h"
@@ -562,7 +562,7 @@
CVideo& screen_;
const gamemap* map_;
- const viewpoint *viewpoint_;
+ const team *viewpoint_;
int xpos_, ypos_;
theme theme_;
int zoom_;
Modified: trunk/src/minimap.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/minimap.cpp?rev=41179&r1=41178&r2=41179&view=diff
==============================================================================
--- trunk/src/minimap.cpp (original)
+++ trunk/src/minimap.cpp Sat Feb 13 11:18:45 2010
@@ -34,11 +34,7 @@
namespace image {
-
-surface getMinimap(const int w
- , const int h
- , const gamemap& map
- , const viewpoint* vw)
+surface getMinimap(int w, int h, const gamemap &map, const team *vw)
{
const int scale = 8;
Modified: trunk/src/minimap.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/minimap.hpp?rev=41179&r1=41178&r2=41179&view=diff
==============================================================================
--- trunk/src/minimap.hpp (original)
+++ trunk/src/minimap.hpp Sat Feb 13 11:18:45 2010
@@ -17,16 +17,13 @@
#include <cstddef>
class gamemap;
-class viewpoint;
class surface;
+class team;
namespace image {
///function to create the minimap for a given map
///the surface returned must be freed by the user
- surface getMinimap(const int w
- , const int h
- , const gamemap& map_
- , const viewpoint* vm = NULL);
+ surface getMinimap(int w, int h, const gamemap &map_, const team *vm =
NULL);
}
#endif
Modified: trunk/src/team.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/team.hpp?rev=41179&r1=41178&r2=41179&view=diff
==============================================================================
--- trunk/src/team.hpp (original)
+++ trunk/src/team.hpp Sat Feb 13 11:18:45 2010
@@ -18,7 +18,6 @@
#include "color_range.hpp"
#include "game_config.hpp"
#include "map_location.hpp"
-#include "viewpoint.hpp"
#include "savegame_config.hpp"
#include "unit.hpp"
@@ -34,7 +33,7 @@
* This class stores all the data for a single 'side' (in game nomenclature).
* E.g., there is only one leader unit per team.
*/
-class team : public viewpoint, public savegame::savegame_config
+class team : public savegame::savegame_config
{
class shroud_map {
public:
Removed: trunk/src/viewpoint.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/viewpoint.hpp?rev=41178&view=auto
==============================================================================
--- trunk/src/viewpoint.hpp (original)
+++ trunk/src/viewpoint.hpp (removed)
@@ -1,30 +1,0 @@
-/* $Id$ */
-/*
- Copyright (C) 2003 - 2010 by David White <[email protected]>
- Part of the Battle for Wesnoth Project http://www.wesnoth.org/
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2
- or at your option any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY.
-
- See the COPYING file for more details.
-*/
-
-/** @file map.hpp */
-
-#ifndef VIEWPOINT_H_INCLUDED
-#define VIEWPOINT_H_INCLUDED
-
-struct map_location;
-
-class viewpoint
-{
-public:
- virtual bool shrouded(const map_location& loc) const = 0;
- virtual bool fogged(const map_location& loc) const = 0;
- virtual ~viewpoint() {};
-};
-
-#endif
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
