From 2402c4907908c8b46a8fcc218db0854c71ca24dd Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Wed, 31 Dec 2008 00:45:22 +0300
Subject: [PATCH] [6989] Always initilize WaypointBehavior pointer to NULL in
 WaypointNode. Small code Cleanup.

---
 src/game/WaypointManager.cpp | 17 +++++++++--------
 src/game/WaypointManager.h   |  2 +-
 src/shared/revision_nr.h     |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/game/WaypointManager.cpp b/src/game/WaypointManager.cpp
index 7478f8efe..0fefe4429 100644
--- a/src/game/WaypointManager.cpp
+++ b/src/game/WaypointManager.cpp
@@ -300,7 +300,8 @@ void WaypointManager::CheckTextsExistance(std::set<int32>& ids)
     {
         for (int i = 0; i < pmItr->second.size(); ++i)
         {
-            if (!pmItr->second[i].behavior)
+            WaypointBehavior* be = pmItr->second[i].behavior;
+            if (!be)
                 continue;
 
             // Now we check text existence and put all zero texts ids to the end of array
@@ -309,29 +310,29 @@ void WaypointManager::CheckTextsExistance(std::set<int32>& ids)
             int zeroCount = 0;
             for (int j = 0; j < MAX_WAYPOINT_TEXT; ++j)
             {
-                if (!pmItr->second[i].behavior->textid[j])
+                if (!be->textid[j])
                 {
                     ++zeroCount;
                     continue;
                 }
                 else
                 {
-                    if (!objmgr.GetMangosStringLocale(pmItr->second[i].behavior->textid[j]))
+                    if (!objmgr.GetMangosStringLocale(be->textid[j]))
                     {
-                        sLog.outErrorDb("ERROR: Some waypoint has textid%u with not existing %u text.", j, pmItr->second[i].behavior->textid[j]);
-                        pmItr->second[i].behavior->textid[j] = 0;
+                        sLog.outErrorDb("ERROR: Some waypoint has textid%u with not existing %u text.", j, be->textid[j]);
+                        be->textid[j] = 0;
                         ++zeroCount;
                         continue;
                     }
                     else
-                        ids.erase(pmItr->second[i].behavior->textid[j]);
+                        ids.erase(be->textid[j]);
 
                     // Shifting check
                     if (zeroCount)
                     {
                         // Correct textid but some zeros leading, so move it forward.
-                        pmItr->second[i].behavior->textid[j-zeroCount] = pmItr->second[i].behavior->textid[j];
-                        pmItr->second[i].behavior->textid[j] = 0;
+                        be->textid[j-zeroCount] = be->textid[j];
+                        be->textid[j] = 0;
                     }
                 }
             }
diff --git a/src/game/WaypointManager.h b/src/game/WaypointManager.h
index 939d7f2af..3a6951643 100644
--- a/src/game/WaypointManager.h
+++ b/src/game/WaypointManager.h
@@ -45,7 +45,7 @@ struct WaypointNode
     float orientation;
     uint32 delay;
     WaypointBehavior * behavior;
-    WaypointNode() {}
+    WaypointNode() : x(0.0f), y(0.0f), z(0.0f), orientation(0.0f), delay(0), behavior(NULL) {}
     WaypointNode(float _x, float _y, float _z, float _o, uint32 _delay, WaypointBehavior * _behavior)
       : x(_x), y(_y), z(_z), orientation(_o), delay(_delay), behavior(_behavior) {}
 };
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 291d0b1f1..b46aded87 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "6988"
+ #define REVISION_NR "6989"
 #endif // __REVISION_NR_H__
-- 
2.11.4.GIT