diff --git a/src/p_maputl.cpp b/src/p_maputl.cpp index c4fe47f31..053f44c13 100644 --- a/src/p_maputl.cpp +++ b/src/p_maputl.cpp @@ -954,7 +954,7 @@ DEFINE_ACTION_FUNCTION(DBlockLinesIterator, CreateFromPos) 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); 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)); } -DEFINE_ACTION_FUNCTION(DBlockLinesIterator, Next) +DEFINE_ACTION_FUNCTION(DBlockThingsIterator, Next) { - PARAM_SELF_PROLOGUE(DBlockLinesIterator); + PARAM_SELF_PROLOGUE(DBlockThingsIterator); ACTION_RETURN_BOOL(self->Next()); } diff --git a/src/p_sight.cpp b/src/p_sight.cpp index 68bf2ed3d..92cd52b95 100644 --- a/src/p_sight.cpp +++ b/src/p_sight.cpp @@ -735,7 +735,7 @@ bool SightCheck::P_SightPathTraverse () // step through map blocks // Count is present to prevent a round off error from skipping the break - int itres; + int itres = -1; for (count = 0 ; count < 1000 ; count++) { // end traversing when reaching the end of the blockmap