From e5143747a549960f33f1236bfdf2045ea03e4b11 Mon Sep 17 00:00:00 2001 From: XP-Cagey Date: Wed, 6 Apr 2005 01:33:38 +0000 Subject: [PATCH] Fixed infinite loop in AvHTechTree.cpp (Mantis #997) Fixed NULL ptr reference in AvHPlayer.cpp (before report was filed) git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@35 67975925-1194-0748-b3d5-c16f83f1a3a1 --- main/source/mod/AvHPlayer.cpp | 4 ++-- main/source/mod/AvHTechTree.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main/source/mod/AvHPlayer.cpp b/main/source/mod/AvHPlayer.cpp index 451032ce..04462130 100644 --- a/main/source/mod/AvHPlayer.cpp +++ b/main/source/mod/AvHPlayer.cpp @@ -9532,8 +9532,8 @@ void AvHPlayer::UpdateTechNodes() } else { - //send signal to remove the tech node from the client here... - this->mClientTechNodes.RemoveNode( Node->getMessageID() ); + //TODO: send signal to remove the tech node from the client here... + this->mClientTechNodes.RemoveNode(*current); } } mClientTechDelta.clear(); diff --git a/main/source/mod/AvHTechTree.cpp b/main/source/mod/AvHTechTree.cpp index a2f96f8a..9d90dc22 100644 --- a/main/source/mod/AvHTechTree.cpp +++ b/main/source/mod/AvHTechTree.cpp @@ -493,7 +493,7 @@ void AvHTechTree::GetDelta(const AvHTechTree& other, MessageIDListType& delta) c while( other_current != other_end ) { delta.push_back(other_current->first); - ++current; + ++other_current; } }