Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14133
Modified Files:
dragdrop.cpp wolfpack.vcproj
Log Message:
Fix for items not being removed from their spawnregion if grabbed.
Index: wolfpack.vcproj
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.vcproj,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** wolfpack.vcproj 2 Jul 2004 13:35:36 -0000 1.34
--- wolfpack.vcproj 18 Jul 2004 19:57:02 -0000 1.35
***************
*** 32,41 ****
WarningLevel="1"
Detect64BitPortabilityProblems="TRUE"
! DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
! AdditionalDependencies="qt-mt322.lib ws2_32.lib comctl32.lib"
OutputFile="../wolfpack.exe"
LinkIncremental="2"
--- 32,41 ----
WarningLevel="1"
Detect64BitPortabilityProblems="TRUE"
! DebugInformationFormat="4"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
! AdditionalDependencies="qt-mt331.lib ws2_32.lib comctl32.lib"
OutputFile="../wolfpack.exe"
LinkIncremental="2"
***************
*** 95,99 ****
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="FALSE"
! EnableEnhancedInstructionSet="1"
ForceConformanceInForLoopScope="TRUE"
RuntimeTypeInfo="TRUE"
--- 95,99 ----
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="FALSE"
! EnableEnhancedInstructionSet="0"
ForceConformanceInForLoopScope="TRUE"
RuntimeTypeInfo="TRUE"
Index: dragdrop.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dragdrop.cpp,v
retrieving revision 1.235
retrieving revision 1.236
diff -C2 -d -r1.235 -r1.236
*** dragdrop.cpp 14 Jul 2004 02:40:46 -0000 1.235
--- dragdrop.cpp 18 Jul 2004 19:57:01 -0000 1.236
***************
*** 171,175 ****
pContainer->addItem( splitItem, false );
splitItem->SetOwnSerial( pItem->ownSerial() );
! splitItem->setSpawnregion(pItem->spawnregion());
// He needs to see the new item
--- 171,176 ----
pContainer->addItem( splitItem, false );
splitItem->SetOwnSerial( pItem->ownSerial() );
!
! splitItem->setSpawnregion(pItem->spawnregion());
// He needs to see the new item
***************
*** 177,181 ****
// If we're taking something out of a spawn-region it's spawning "flag" is removed isn't it?
- pItem->setSpawnregion(0);
pItem->setAmount( pickedAmount );
}
--- 178,181 ----
***************
*** 185,188 ****
--- 185,191 ----
pItem->removeFromView( true );
+ // Remove from spawnregion
+ pItem->setSpawnregion(0);
+
// Remove it from the World if it is in world, otherwise remove it from it's current container
if ( pItem->isInWorld() )
|
