swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-07-31 00:15:55 -04:00
Code Issues Projects Releases Wiki Activity

hopefully this fixes some more...

Browse Source
This commit is contained in:
DarthArgus
2014-10-26 22:20:06 -07:00
parent 9db3229116
commit eb2e7c78d8
23 changed files with 105 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedDebug/src/shared/CallStackCollector.cpp
+2 -2
View File
@@ -128,7 +128,7 @@ CrcString const & CallStackCollectorNamespace::Node::getName() const
void CallStackCollectorNamespace::Node::addCallStack(uint32 * const callStack)
{
//-- Compute crc of memory
uint32 const crc = Crc::calculate(callStack, sizeof(uint32) * CALLSTACK_DEPTH);
uint32 const crc = Crc::calculate(callStack, (sizeof(uint32) * CALLSTACK_DEPTH));
//-- Find callstack in list
CallStackEntryMap::iterator iter = m_callStackEntryMap.find(crc);
@@ -141,7 +141,7 @@ void CallStackCollectorNamespace::Node::addCallStack(uint32 * const callStack)
{
//-- Create new callstack
uint32 * const newCallStack = new uint32[CALLSTACK_DEPTH];
memcpy(newCallStack, callStack, sizeof(uint32) * CALLSTACK_DEPTH);
memcpy(newCallStack, callStack, (sizeof(uint32) * CALLSTACK_DEPTH));
CallStackEntry callStackEntry;
callStackEntry.m_callStack = newCallStack;
engine/shared/library/sharedTerrain/src/shared/appearance/TerrainQuadTree.cpp
-2
View File
@@ -567,7 +567,6 @@ TerrainQuadTree::Node * TerrainQuadTree::Node::findChunkNode (const ProceduralTe
TerrainQuadTree::Node * TerrainQuadTree::Node::findFirstRenderablePeerNeighbor (const TerrainQuadTree::Node * const otherNode, const int dir)
{
NOT_NULL (this);
NOT_NULL (otherNode);
const int dir_offsets[4][2] =
@@ -595,7 +594,6 @@ TerrainQuadTree::Node * TerrainQuadTree::Node::findFirstRenderablePeerNeighbor (
TerrainQuadTree::Node * TerrainQuadTree::Node::findFirstRenderableLowerNeighbor (const TerrainQuadTree::Node * const otherNode, const int dir)
{
NOT_NULL (this);
NOT_NULL (otherNode);
const int halfSize = otherNode->getSize () / 2;
engine/shared/library/sharedTerrain/src/shared/generator/AffectorRiver.cpp
+2 -2
View File
@@ -758,7 +758,7 @@ void AffectorRiver::createWaterTables (ArrayList<AffectorRiver::WaterTable>& wat
const Vector2d currentEndRight = currentEnd + currentNormal * waterWidth;
const Vector2d& previousStart = !atStart ? m_pointList [i - 1] : m_pointList [i];
const Vector2d& previousEnd = !atStart ? m_pointList [i] : m_pointList [i];
const Vector2d& previousEnd = m_pointList [i];
const Vector2d previousSegment = previousEnd - previousStart;
const Vector2d previousDirection = !atStart ? Vector2d::normalized (previousSegment) : currentDirection;
const Vector2d previousNormal = !atStart ? Vector2d::normal (previousDirection, false) : currentNormal;
@@ -768,7 +768,7 @@ void AffectorRiver::createWaterTables (ArrayList<AffectorRiver::WaterTable>& wat
const Vector2d previousEndLeft = previousEnd - previousNormal * waterWidth;
const Vector2d previousEndRight = previousEnd + previousNormal * waterWidth;
const Vector2d& nextStart = !atEndNext ? m_pointList [i + 1] : m_pointList [i + 1];
const Vector2d& nextStart = m_pointList [i + 1];
const Vector2d& nextEnd = !atEndNext ? m_pointList [i + 2] : m_pointList [i + 1];
const Vector2d nextSegment = nextEnd - nextStart;
const Vector2d nextDirection = !atEndNext ? Vector2d::normalized (nextSegment) : currentDirection;