[wpdev-commits] wolfpack dragdrop.cpp,1.208,1.209 uobject.cpp,1.125,1.126 wolfpack.vcproj,1.7,1.8

[<dar...@pr...>]

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27383

Modified Files:
	dragdrop.cpp uobject.cpp wolfpack.vcproj 
Log Message:
Fixed an issue with onDropOnItem...

Index: dragdrop.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dragdrop.cpp,v
retrieving revision 1.208
retrieving revision 1.209
diff -C2 -d -r1.208 -r1.209
*** dragdrop.cpp	26 Nov 2003 03:53:52 -0000	1.208
--- dragdrop.cpp	26 Jan 2004 03:48:40 -0000	1.209
***************
*** 780,785 ****
  	// And were *un*able to stack it (!)
  	// >> Set it to the location of the item we dropped it on and stack it up by 2
! 	pItem->moveTo( pCont->pos() );
! 	pItem->setPos( pItem->pos() + Coord_cl(0, 0, 2) );
  	pItem->update();
  
--- 780,796 ----
  	// And were *un*able to stack it (!)
  	// >> Set it to the location of the item we dropped it on and stack it up by 2
! 	if (pCont->container()) {
! 		P_ITEM pNewCont = dynamic_cast<P_ITEM>(pCont->container());
! 
! 		if (pNewCont) {
! 			pNewCont->addItem(pItem, false);
! 			pItem->setPos(pCont->pos() + Coord_cl(0, 0, 2));
! 		} else {
! 			pChar->getBackpack()->addItem(pItem);
! 		}
! 	} else {
! 		pItem->moveTo(pCont->pos() + Coord_cl(0, 0, 2));
! 	}
! 
  	pItem->update();
  

Index: uobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** uobject.cpp	26 Jan 2004 00:45:10 -0000	1.125
--- uobject.cpp	26 Jan 2004 03:48:40 -0000	1.126
***************
*** 735,755 ****
  
  void cUObject::resendTooltip() {
! 	tooltip_ = World::instance()->getUnusedTooltip(); 
! 	setTooltip(tooltip_);
! 
! 	cUOTxAttachTooltip tooltip;
! 
! 	tooltip.setId( tooltip_ );
! 	tooltip.setSerial( serial() );
! 
! 	cUOTxAttachTooltip attach;
! 	attach.setId(tooltip_);
! 	attach.setSerial(serial_);
  
! 	for (cUOSocket *s = cNetwork::instance()->first(); s; s = cNetwork::instance()->next()) {
! 		if (s->player() && s->player()->inRange(this, s->player()->visualRange())) {
! 			s->addTooltip(tooltip_);
! 			s->send(&attach);
  		}
  	}
  }
--- 735,754 ----
  
  void cUObject::resendTooltip() {
! 	// Either Attach or Refresh the Data
! 	if (tooltip_ == 0xFFFFFFFF) {
! 		tooltip_ = World::instance()->getUnusedTooltip();
! 		
! 		cUOTxAttachTooltip attach;
! 		attach.setId(tooltip_);
! 		attach.setSerial(serial_);
  
! 		for (cUOSocket *s = cNetwork::instance()->first(); s; s = cNetwork::instance()->next()) {
! 			if (s->player() && s->player()->inRange(this, s->player()->visualRange())) {
! 				s->addTooltip(tooltip_);
! 				s->send(&attach);
! 			}
  		}
+ 	} else {
+ 		// TODO: Tooltip implementation sucks... redo...
  	}
  }

Index: wolfpack.vcproj
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.vcproj,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wolfpack.vcproj	24 Jan 2004 22:35:28 -0000	1.7
--- wolfpack.vcproj	26 Jan 2004 03:48:40 -0000	1.8
***************
*** 76,90 ****
  				Optimization="3"
  				GlobalOptimizations="TRUE"
! 				InlineFunctionExpansion="2"
  				EnableIntrinsicFunctions="TRUE"
! 				FavorSizeOrSpeed="1"
  				OptimizeForWindowsApplication="FALSE"
  				AdditionalIncludeDirectories="sqlite"
  				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;QT_DLL;QT_NO_STL;QT_THREAD_SUPPORT"
  				MinimalRebuild="FALSE"
  				RuntimeLibrary="0"
  				BufferSecurityCheck="FALSE"
  				EnableFunctionLevelLinking="FALSE"
  				ForceConformanceInForLoopScope="TRUE"
  				UsePrecompiledHeader="0"
  				BrowseInformation="1"
--- 76,93 ----
  				Optimization="3"
  				GlobalOptimizations="TRUE"
! 				InlineFunctionExpansion="1"
  				EnableIntrinsicFunctions="TRUE"
! 				FavorSizeOrSpeed="2"
  				OptimizeForWindowsApplication="FALSE"
  				AdditionalIncludeDirectories="sqlite"
  				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;QT_DLL;QT_NO_STL;QT_THREAD_SUPPORT"
+ 				StringPooling="TRUE"
  				MinimalRebuild="FALSE"
  				RuntimeLibrary="0"
  				BufferSecurityCheck="FALSE"
  				EnableFunctionLevelLinking="FALSE"
+ 				EnableEnhancedInstructionSet="1"
  				ForceConformanceInForLoopScope="TRUE"
+ 				RuntimeTypeInfo="TRUE"
  				UsePrecompiledHeader="0"
  				BrowseInformation="1"
***************
*** 96,100 ****
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="qt-mt321.lib ws2_32.lib"
  				OutputFile="../wolfpack.exe"
  				LinkIncremental="1"
--- 99,103 ----
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="qt-mt322.lib ws2_32.lib"
  				OutputFile="../wolfpack.exe"
  				LinkIncremental="1"