diff --git a/CMakeLists.txt b/CMakeLists.txt index f9364fdd..eb91866f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.0) project(SRB2 - VERSION 2.1.19 + VERSION 2.1.20 LANGUAGES C) if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR}) diff --git a/appveyor.yml b/appveyor.yml index ae3f82f5..69913cfc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 2.1.19.{branch}-{build} +version: 2.1.20.{branch}-{build} os: MinGW environment: diff --git a/src/doomdef.h b/src/doomdef.h index 86c6baa2..175838c0 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -205,7 +205,7 @@ extern FILE *logstream; // Will always resemble the versionstring, 205 = 2.0.5, 210 = 2.1, etc. #define CODEBASE 210 -// The Modification ID; must be obtained from Inuyasha ( http://mb.srb2.org/private.php?do=newpm&u=2604 ). +// The Modification ID; must be obtained from Rob ( https://mb.srb2.org/private.php?do=newpm&u=546 ). // DO NOT try to set this otherwise, or your modification will be unplayable through the Master Server. // "12" is the default mod ID for version 2.1 #define MODID 12 diff --git a/src/lua_hooklib.c b/src/lua_hooklib.c index a24473ba..eadd0153 100644 --- a/src/lua_hooklib.c +++ b/src/lua_hooklib.c @@ -231,6 +231,8 @@ boolean LUAh_MobjHook(mobj_t *mo, enum hook which) if (!gL || !(hooksAvailable[which/8] & (1<<(which%8)))) return false; + I_Assert(mo->type < NUMMOBJTYPES); + lua_settop(gL, 0); // Look for all generic mobj hooks @@ -406,6 +408,8 @@ UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which) if (!gL || !(hooksAvailable[which/8] & (1<<(which%8)))) return 0; + I_Assert(thing1->type < NUMMOBJTYPES); + lua_settop(gL, 0); // Look for all generic mobj collision hooks @@ -479,6 +483,8 @@ boolean LUAh_MobjThinker(mobj_t *mo) if (!gL || !(hooksAvailable[hook_MobjThinker/8] & (1<<(hook_MobjThinker%8)))) return false; + I_Assert(mo->type < NUMMOBJTYPES); + lua_settop(gL, 0); // Look for all generic mobj thinker hooks @@ -532,6 +538,8 @@ boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher) if (!gL || !(hooksAvailable[hook_TouchSpecial/8] & (1<<(hook_TouchSpecial%8)))) return 0; + I_Assert(special->type < NUMMOBJTYPES); + lua_settop(gL, 0); // Look for all generic touch special hooks @@ -595,6 +603,8 @@ UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 if (!gL || !(hooksAvailable[hook_ShouldDamage/8] & (1<<(hook_ShouldDamage%8)))) return 0; + I_Assert(target->type < NUMMOBJTYPES); + lua_settop(gL, 0); // Look for all generic should damage hooks @@ -676,6 +686,8 @@ boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 if (!gL || !(hooksAvailable[hook_MobjDamage/8] & (1<<(hook_MobjDamage%8)))) return 0; + I_Assert(target->type < NUMMOBJTYPES); + lua_settop(gL, 0); // Look for all generic mobj damage hooks @@ -747,6 +759,8 @@ boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source) if (!gL || !(hooksAvailable[hook_MobjDeath/8] & (1<<(hook_MobjDeath%8)))) return 0; + I_Assert(target->type < NUMMOBJTYPES); + lua_settop(gL, 0); // Look for all generic mobj death hooks diff --git a/src/p_mobj.c b/src/p_mobj.c index f85027cd..286fa292 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -9296,6 +9296,16 @@ void P_RespawnSpecials(void) if (mthing->type == mobjinfo[i].doomednum) break; + if (i == NUMMOBJTYPES) // prevent creation of objects with this type -- Monster Iestyn 17/12/17 + { + // 3D Mode start Thing is unlikely to be added to the que, + // so don't bother checking for that specific type + CONS_Alert(CONS_WARNING, M_GetText("P_RespawnSpecials: Unknown thing type %d attempted to respawn at (%d, %d)\n"), mthing->type, mthing->x, mthing->y); + // pull it from the que + iquetail = (iquetail+1)&(ITEMQUESIZE-1); + return; + } + //CTF rings should continue to respawn as normal rings outside of CTF. if (gametype != GT_CTF) { diff --git a/src/p_spec.c b/src/p_spec.c index bb5a9c52..36cdda6f 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -5292,13 +5292,11 @@ static void P_AddOldAirbob(sector_t *sec, line_t *sourceline, boolean noadjust) airbob->vars[2] = FRACUNIT; if (noadjust) - { airbob->vars[7] = airbob->sector->ceilingheight-16*FRACUNIT; - airbob->vars[6] = airbob->vars[7] - - (sec->ceilingheight - sec->floorheight); - } else airbob->vars[7] = airbob->sector->ceilingheight - P_AproxDistance(sourceline->dx, sourceline->dy); + airbob->vars[6] = airbob->vars[7] + - (sec->ceilingheight - sec->floorheight); airbob->vars[3] = airbob->vars[2]; diff --git a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj index 68391f99..eaac87de 100644 --- a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj +++ b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj @@ -1214,7 +1214,7 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CURRENT_PROJECT_VERSION = 2.1.19; + CURRENT_PROJECT_VERSION = 2.1.20; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", NORMALSRB2, @@ -1226,7 +1226,7 @@ C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CURRENT_PROJECT_VERSION = 2.1.19; + CURRENT_PROJECT_VERSION = 2.1.20; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( diff --git a/src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj b/src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj index fada7849..574161c6 100644 --- a/src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj +++ b/src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj @@ -1214,7 +1214,7 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CURRENT_PROJECT_VERSION = 2.1.19; + CURRENT_PROJECT_VERSION = 2.1.20; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", NORMALSRB2, @@ -1226,7 +1226,7 @@ C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CURRENT_PROJECT_VERSION = 2.1.19; + CURRENT_PROJECT_VERSION = 2.1.20; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = (