[Wesnoth-cvs-commits] wesnoth/src astarnode.hpp

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/06/05 09:23:32

Modified files:
        src            : astarnode.hpp 

Log message:
        A bit of cleanup, and undefine PARANO_ASTAR. Next step will be its 
removal.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/astarnode.hpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: wesnoth/src/astarnode.hpp
diff -u wesnoth/src/astarnode.hpp:1.3 wesnoth/src/astarnode.hpp:1.4
--- wesnoth/src/astarnode.hpp:1.3       Sat Jun  4 19:16:05 2005
+++ wesnoth/src/astarnode.hpp   Sun Jun  5 09:23:32 2005
@@ -1,4 +1,4 @@
-/* $Id: astarnode.hpp,v 1.3 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: astarnode.hpp,v 1.4 2005/06/05 09:23:32 silene Exp $ */
 /*
 Copyright (C) 2003 by David White <address@hidden>
 Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -19,7 +19,6 @@
 #include <set>
 #include <vector>
 
-#define _PARANO_ASTAR_
 #ifdef _PARANO_ASTAR_
 # define assertParanoAstar(param) assert(param)
 #else
@@ -34,9 +33,8 @@
        a_star_node* nodeParent;
        bool isInCloseList;
 
-       void initNode( const gamemap::location& pos, const gamemap::location& 
dst,
-                                                                double cost, 
a_star_node* parent,
-                                                                const 
std::set<gamemap::location>* teleports);
+       void initNode(gamemap::location const &pos, gamemap::location const 
&dst,
+                     double cost, a_star_node *parent, 
std::set<gamemap::location> const *teleports);
 
        inline double heuristic(const gamemap::location& src, const 
gamemap::location& dst)
        {
@@ -66,11 +64,11 @@
 protected:
        typedef std::vector<a_star_node*> vect_a_star_node;
 
-       vect_a_star_node                _vectAStarNode;
-       size_t                                          _width;
+       vect_a_star_node _vectAStarNode;
+       size_t _width;
 
 public:
-       size_t                                          _nbNode;
+       size_t _nbNode;
 
        void resize_IFN(const size_t parWidth, const size_t parHeight);
        void clear(void);
@@ -81,20 +79,5 @@
        a_star_world(void) : _width(0), _nbNode(0) {};
 };
 
-/*
-namespace std
-{
-       template<class _Ty,
-       class _Container = vector<_Ty>,
-       class _Pr = less<typename _Container::value_type> >
-       class priority_queue_extended : public std::priority_queue<_Ty, 
_Container, _Pr>
-       {
-       public:
-               inline void clear(void) { c.clear(); }
-               inline void reserve(size_type _Count) { c.reserve(_Count); }
-       };
-};
-*/
-
 #endif