TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 07:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

winconsole many, many i vars. worldEditor path arguement, lockPtr doubleup. volume.cpp: uneccesary duplicated FileNode::Attributes attr; def

Browse source
This commit is contained in:
Azaezel 2018-03-12 19:10:55 -05:00
parent 015f07e50e
commit f59b92bf4e
3 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Engine/source/core/volume.cpp
View file

@ -808,7 +808,6 @@ bool MountSystem::isDirectory(const Path& path, FileSystemRef fsRef)
if (fnRef.isNull()) if (fnRef.isNull())
return false; return false;
FileNode::Attributes attr;
if (fnRef->getAttributes(&attr)) if (fnRef->getAttributes(&attr))
return attr.flags & FileNode::Directory; return attr.flags & FileNode::Directory;
return false; return false;

12
Engine/source/gui/worldEditor/worldEditor.cpp
View file

@ -1454,16 +1454,16 @@ void WorldEditor::renderSplinePath(SimPath::Path *path)
} }
CameraSpline::Knot::Path path; CameraSpline::Knot::Path tPath;
switch (pathmarker->mSmoothingType) switch (pathmarker->mSmoothingType)
{ {
case Marker::SmoothingTypeLinear: path = CameraSpline::Knot::LINEAR; break; case Marker::SmoothingTypeLinear: tPath = CameraSpline::Knot::LINEAR; break;
case Marker::SmoothingTypeSpline: case Marker::SmoothingTypeSpline:
default: path = CameraSpline::Knot::SPLINE; break; default: tPath = CameraSpline::Knot::SPLINE; break;
} }
spline.push_back(new CameraSpline::Knot(pos, rot, 1.0f, type, path)); spline.push_back(new CameraSpline::Knot(pos, rot, 1.0f, type, tPath));
} }
F32 t = 0.0f; F32 t = 0.0f;
@ -1559,8 +1559,8 @@ void WorldEditor::renderSplinePath(SimPath::Path *path)
// Reset for next pass... // Reset for next pass...
vIdx = 0; vIdx = 0;
void *lockPtr = vb.lock(); void *nextlockPtr = vb.lock();
if(!lockPtr) return; if(!nextlockPtr) return;
} }
} }

8
Engine/source/platformWin32/winConsole.cpp
View file

@ -176,12 +176,12 @@ void WinConsole::process()
S32 outpos = 0; S32 outpos = 0;
ReadConsoleInput(stdIn, rec, 20, &numEvents); ReadConsoleInput(stdIn, rec, 20, &numEvents);
DWORD i; DWORD evt;
for(i = 0; i < numEvents; i++) for(evt = 0; evt < numEvents; evt++)
{ {
if(rec[i].EventType == KEY_EVENT) if(rec[evt].EventType == KEY_EVENT)
{ {
KEY_EVENT_RECORD *ke = &(rec[i].Event.KeyEvent); KEY_EVENT_RECORD *ke = &(rec[evt].Event.KeyEvent);
if(ke->bKeyDown) if(ke->bKeyDown)
{ {
switch (ke->uChar.AsciiChar) switch (ke->uChar.AsciiChar)