diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c index af79e2251..22c4a23bd 100644 --- a/polymer/eduke32/source/astub.c +++ b/polymer/eduke32/source/astub.c @@ -44,7 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #endif -#define BUILDDATE " 20090104" +#define BUILDDATE " 20090105" #define VERSION " 1.2.0devel" static int floor_over_floor; diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c index 3d919e77f..d78059200 100644 --- a/polymer/eduke32/source/gamedef.c +++ b/polymer/eduke32/source/gamedef.c @@ -1803,7 +1803,9 @@ static int C_GetNextValue(int type) static int C_CheckEmptyBranch(int tw, intptr_t lastScriptPtr) { - if (Bstrncmp(keyw[tw], "if", 2) && tw != CON_ELSE) + // ifrnd and ifhitweapon actually do something when the condition is executed + if ((Bstrncmp(keyw[tw], "if", 2) && tw != CON_ELSE) || + tw == CON_IFRND || tw == CON_IFHITWEAPON) { g_ifElseAborted = 0; return 0; @@ -2983,7 +2985,7 @@ static int C_ParseCommand(void) g_numBraces++; do - done = C_ParseCommand(); + done = C_ParseCommand(); while (done == 0); } else C_ParseCommand();