diff --git a/src/p_maputl.cpp b/src/p_maputl.cpp index e639c440e..603a0897f 100644 --- a/src/p_maputl.cpp +++ b/src/p_maputl.cpp @@ -955,7 +955,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()); @@ -1294,9 +1294,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 d666bc3e9..d468d52a9 100644 --- a/src/p_sight.cpp +++ b/src/p_sight.cpp @@ -736,7 +736,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