zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-14 08:30:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed bad definition of FBlockThingsIterator.Next(). When implementing the BlockLinesIterator apparently some incorrect code got modified.

Browse source 
- fixed an uninitialized variable in P_CheckSight.
This commit is contained in:
Christoph Oelckers 2017-03-10 10:37:43 +01:00
parent 0d5cb0536e
commit 5b9fece062
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_maputl.cpp
View file

@ -954,7 +954,7 @@ DEFINE_ACTION_FUNCTION(DBlockLinesIterator, CreateFromPos)
ACTION_RETURN_OBJECT(new DBlockLinesIterator(x, y, z, h, radius, sec)); ACTION_RETURN_OBJECT(new DBlockLinesIterator(x, y, z, h, radius, sec));
} }
DEFINE_ACTION_FUNCTION(DBlockThingsIterator, Next) DEFINE_ACTION_FUNCTION(DBlockLinesIterator, Next)
{ {
PARAM_SELF_PROLOGUE(DBlockLinesIterator); PARAM_SELF_PROLOGUE(DBlockLinesIterator);
ACTION_RETURN_BOOL(self->Next()); ACTION_RETURN_BOOL(self->Next());
@ -1293,9 +1293,9 @@ DEFINE_ACTION_FUNCTION(DBlockThingsIterator, CreateFromPos)
ACTION_RETURN_OBJECT(new DBlockThingsIterator(x, y, z, h, radius, ignore, nullptr)); ACTION_RETURN_OBJECT(new DBlockThingsIterator(x, y, z, h, radius, ignore, nullptr));
} }
DEFINE_ACTION_FUNCTION(DBlockLinesIterator, Next) DEFINE_ACTION_FUNCTION(DBlockThingsIterator, Next)
{ {
PARAM_SELF_PROLOGUE(DBlockLinesIterator); PARAM_SELF_PROLOGUE(DBlockThingsIterator);
ACTION_RETURN_BOOL(self->Next()); ACTION_RETURN_BOOL(self->Next());
} }

2
src/p_sight.cpp
View file

@ -735,7 +735,7 @@ bool SightCheck::P_SightPathTraverse ()
// step through map blocks // step through map blocks
// Count is present to prevent a round off error from skipping the break // Count is present to prevent a round off error from skipping the break
int itres; int itres = -1;
for (count = 0 ; count < 1000 ; count++) for (count = 0 ; count < 1000 ; count++)
{ {
// end traversing when reaching the end of the blockmap // end traversing when reaching the end of the blockmap