6/21/2008 - giwo (0.98-3.7s)

	Modified UString to function without crashing under VS2008
	Fixed a bug in CItem::RemoveFromSight() causing items inside containers on the ground not to properly notify nearby players when removed.
	Fixed a bug in CPIDropItem() when the compiler does not automatically instantiate booleans to false

source/CPacketReceive.cpp

@@ -1141,6 +1141,7 @@ CPIDropItem::CPIDropItem( CSocket *s ) : CPInputBuffer( s )
 }
 void CPIDropItem::Receive( void )
 {
+	uokrFlag = false;
 	if( tSock->ClientType() == CV_UOKR )
 		uokrFlag = true;
 

source/Changelog.txt

@@ -1,3 +1,8 @@
+6/21/2008 - giwo (0.98-3.7s)
+	Modified UString to function without crashing under VS2008
+	Fixed a bug in CItem::RemoveFromSight() causing items inside containers on the ground not to properly notify nearby players when removed.
+	Fixed a bug in CPIDropItem() when the compiler does not automatically instantiate booleans to false
+
 6/21/2008 - giwo
 	Fixed several issues with tracking.
 	Fixed a crash caused by passing an invalid object to the JS Method TurnToward

source/cItem.cpp

@@ -1748,7 +1748,11 @@ void CItem::RemoveFromSight( CSocket *mSock )
 				mSock->Send( &toRemove );
 			else
 			{
-				SOCKLIST nearbyChars = FindPlayersInOldVisrange( this );
+				SOCKLIST nearbyChars;
+				if( rItem == this )
+					nearbyChars = FindPlayersInOldVisrange( rItem );
+				else
+					nearbyChars = FindPlayersInVisrange( rItem );
 				for( SOCKLIST_CITERATOR cIter = nearbyChars.begin(); cIter != nearbyChars.end(); ++cIter )
 				{
 					if( !(*cIter)->LoginComplete() )
@@ -1843,11 +1847,10 @@ void CItem::Cleanup( void )
 	{
 		JSEngine->ReleaseObject( IUE_ITEM, this );
 
-		RemoveSelfFromCont();
-
 		CBaseObject::Cleanup();
 
 		RemoveFromSight();
+		RemoveSelfFromCont();
 		RemoveSelfFromOwner();
 
 		for( CItem *tItem = Contains.First(); !Contains.Finished(); tItem = Contains.Next() )

source/cVersionClass.cpp

@@ -1,4 +1,4 @@
- //o--------------------------------------------------------------------------o
+//o--------------------------------------------------------------------------o
 //|	Function/Class	-	
 //|	Date			-	10/17/2002
 //|	Developer(s)	-	EviLDeD

source/skills.cpp

@@ -1320,7 +1320,7 @@ void cSkills::CreateTrackingMenu( CSocket *s, UI16 m )
 			if( ( !tempChar->isHuman() || creatureType == CT_PERSON ) && ( !cwmWorldState->creatures[id].IsAnimal() || creatureType == CT_ANIMAL ) )
 			{
 				const bool cmdLevelCheck = ( isOnline( (*tempChar) ) && ( mChar->GetCommandLevel() >= tempChar->GetCommandLevel() ) );
-				if( tempChar != mChar && objInRange( tempChar, mChar, static_cast<UI16>(distance) ) && !tempChar->IsDead() && ( cmdLevelCheck || tempChar->IsNpc() ) )
+				if( tempChar != mChar && objInRange( tempChar, mChar, distance ) && !tempChar->IsDead() && ( cmdLevelCheck || tempChar->IsNpc() ) )
 				{
 					mChar->SetTrackingTargets( tempChar, MaxTrackingTargets );
 					++MaxTrackingTargets;

source/ustring.cpp

@@ -416,15 +416,14 @@ UString UString::number ( unsigned int n, int base  )
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 UString UString::lower() const
 {
-	UString sReturn = *this; 
+	UString sReturn(this->c_str()); 
 	std::transform(sReturn.begin(), sReturn.end(), sReturn.begin(), ::tolower);
 	return ( sReturn );
 }
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 UString UString::upper() const
 {
-	UString sReturn = *this;
-
+	UString sReturn(this->c_str());
 	std::transform(sReturn.begin(), sReturn.end(), sReturn.begin(), ::toupper);
 	return ( sReturn );
 }

source/ustring.h

@@ -1,11 +1,11 @@
-#ifndef __STRING_H
-#define __STRING_H
+#ifndef __USTRING_H
+#define __USTRING_H
 // Ssytem Includes
-#include <string>
-#include <cstdarg>
-#include <cstdio> 
-#include "stream.h"
-#include <algorithm>
+//#include <string>
+//#include <cstdarg>
+//#include <cstdio> 
+//#include "stream.h"
+//#include <algorithm>
 
 
 typedef std::string stdstring ;