OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 18:59:09 +00:00
Code Releases Activity

Corrections as proposed by @branan.

Browse Source
This commit is contained in:
Darryl Pogue
2012-12-15 18:23:33 -08:00
parent a92fbea356
commit 64214e1a7b
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -7,8 +7,11 @@ if(WIN32 AND NOT CYGWIN)
endif(WIN32 AND NOT CYGWIN) endif(WIN32 AND NOT CYGWIN)
if(UNIX) if(UNIX)
add_definitions(-DHS_BUILD_FOR_UNIX) add_definitions(-DHS_BUILD_FOR_UNIX)
add_definitions(-std=c++0x)
endif(UNIX) endif(UNIX)
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
add_definitions(-std=c++0x)
endif()
# End HeadSpin Configuration # End HeadSpin Configuration
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")

2
Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.cpp
View File

@ -90,7 +90,7 @@ void plLightModifier::AddTarget(plSceneObject* so)
void plLightModifier::RemoveTarget(plSceneObject* so) void plLightModifier::RemoveTarget(plSceneObject* so)
{ {
if ((so = fTarget)) if (so == fTarget)
fLight = nil; fLight = nil;
plSimpleModifier::RemoveTarget(so); plSimpleModifier::RemoveTarget(so);
} }

6
Sources/Plasma/PubUtilLib/plDrawable/plSpaceTree.cpp
View File

@ -291,7 +291,8 @@ void plSpaceTree::HarvestEnabledLeaves(plVolumeIsect* cull, const hsBitVector& c
if( IsEmpty() ) if( IsEmpty() )
return; return;
if((fCullFunc = cull)) fCullFunc = cull;
if (fCullFunc)
IHarvestAndCullEnabledLeaves(fRoot, cache, list); IHarvestAndCullEnabledLeaves(fRoot, cache, list);
else else
IHarvestEnabledLeaves(fRoot, cache, list); IHarvestEnabledLeaves(fRoot, cache, list);
@ -372,7 +373,8 @@ void plSpaceTree::HarvestLeaves(plVolumeIsect* cull, hsBitVector& list) const
{ {
if( !IsEmpty() ) if( !IsEmpty() )
{ {
if((fCullFunc = cull)) fCullFunc = cull;
if (fCullFunc)
IHarvestAndCullLeaves(fTree[fRoot], scratchTotVec, list); IHarvestAndCullLeaves(fTree[fRoot], scratchTotVec, list);
else else
IHarvestLeaves(fTree[fRoot], scratchTotVec, list); IHarvestLeaves(fTree[fRoot], scratchTotVec, list);