diff --git a/src/g_game.c b/src/g_game.c index eba9dbd5b..1c26b6787 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -3355,18 +3355,6 @@ static void G_DoStartVote(void) gameaction = ga_nothing; } -// -// G_UseContinue -// -void G_UseContinue(void) -{ - if (gamestate == GS_LEVEL && !netgame && !multiplayer) - { - gameaction = ga_startcont; - lastdraw = true; - } -} - static void G_DoStartContinue(void) { I_Assert(!netgame && !multiplayer); diff --git a/src/g_game.h b/src/g_game.h index 76759d257..f1ed7834e 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -248,7 +248,6 @@ UINT8 G_GetGametypeColor(INT16 gt); void G_ExitLevel(void); void G_NextLevel(void); void G_Continue(void); -void G_UseContinue(void); void G_AfterIntermission(void); void G_EndGame(void); // moved from y_inter.c/h and renamed diff --git a/src/k_kart.c b/src/k_kart.c index 6018d6591..1bcc86128 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1649,7 +1649,6 @@ static UINT8 K_CheckOffroadCollide(mobj_t *mo) fixed_t flr, cel; // floor & ceiling for height checks to make sure we're touching the offroad sector. INT32 special; - I_Assert(mo != NULL); I_Assert(!P_MobjWasRemoved(mo)); for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next) @@ -1789,7 +1788,6 @@ static void K_SpawnDashDustRelease(player_t *player) INT32 i; I_Assert(player != NULL); - I_Assert(player->mo != NULL); I_Assert(!P_MobjWasRemoved(player->mo)); if (!player->speed && !player->kartstuff[k_startboost]) @@ -1827,7 +1825,6 @@ static void K_SpawnBrakeDriftSparks(player_t *player) // Be sure to update the m mobj_t *sparks; I_Assert(player != NULL); - I_Assert(player->mo != NULL); I_Assert(!P_MobjWasRemoved(player->mo)); // Position & etc are handled in its thinker, and its spawned invisible. @@ -3227,7 +3224,6 @@ static void K_SpawnDriftSparks(player_t *player) INT32 i; I_Assert(player != NULL); - I_Assert(player->mo != NULL); I_Assert(!P_MobjWasRemoved(player->mo)); if (leveltime % 2 == 1) @@ -3599,7 +3595,6 @@ void K_SpawnBoostTrail(player_t *player) INT32 i; I_Assert(player != NULL); - I_Assert(player->mo != NULL); I_Assert(!P_MobjWasRemoved(player->mo)); if (!P_IsObjectOnGround(player->mo) @@ -3681,7 +3676,6 @@ void K_SpawnSparkleTrail(mobj_t *mo) mobj_t *sparkle; INT32 i; - I_Assert(mo != NULL); I_Assert(!P_MobjWasRemoved(mo)); const boolean shouldblend = (mo->player && K_PlayerEffectsShouldBlend(mo->player)); @@ -3715,7 +3709,6 @@ mobj_t *K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent) mobj_t *dust; angle_t aoff; - I_Assert(mo != NULL); I_Assert(!P_MobjWasRemoved(mo)); if (mo->player) diff --git a/src/p_enemy.c b/src/p_enemy.c index f1a0ed535..15410747a 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -306,7 +306,6 @@ void P_NewChaseDir(mobj_t *actor) dirtype_t d[3]; dirtype_t tdir = DI_NODIR, olddir, turnaround; - I_Assert(actor->target != NULL); I_Assert(!P_MobjWasRemoved(actor->target)); olddir = actor->movedir; @@ -619,7 +618,6 @@ void A_Chase(void *thing) if (LUA_CallAction(A_CHASE, actor)) return; - I_Assert(actor != NULL); I_Assert(!P_MobjWasRemoved(actor)); if (actor->reactiontime) diff --git a/src/p_maputl.cpp b/src/p_maputl.cpp index ebf4a08fa..592f57e92 100644 --- a/src/p_maputl.cpp +++ b/src/p_maputl.cpp @@ -423,8 +423,6 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj) // Set open and high/low values here fixed_t frontheight, backheight; - I_Assert(mobj != NULL); - if (mobj) { frontheight = P_GetCeilingZ(mobj, front, tmx, tmy, linedef); @@ -707,7 +705,6 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj) // void P_UnsetThingPosition(mobj_t *thing) { - I_Assert(thing != NULL); I_Assert(!P_MobjWasRemoved(thing)); if (!(thing->flags & MF_NOSECTOR)) @@ -811,7 +808,6 @@ void P_SetThingPosition(mobj_t *thing) sector_t *oldsec = NULL; fixed_t tfloorz, tceilz; - I_Assert(thing != NULL); I_Assert(!P_MobjWasRemoved(thing)); if (thing->player && thing->z <= thing->floorz && thing->subsector) diff --git a/src/p_mobj.c b/src/p_mobj.c index e44436e52..4be86822b 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -222,11 +222,6 @@ boolean P_SetMobjState(mobj_t *mobj, statenum_t state) INT32 recursion = 0; -#ifdef PARANOIA - if (mobj->player != NULL) - I_Error("P_SetMobjState used for player mobj. Use P_SetPlayerMobjState instead!\n(State called: %d)", state); -#endif - if (mobj->player != NULL) return P_SetPlayerMobjState(mobj, state); @@ -339,7 +334,6 @@ void P_ExplodeMissile(mobj_t *mo) { mobj_t *explodemo; - I_Assert(mo != NULL); I_Assert(!P_MobjWasRemoved(mo)); mo->momx = mo->momy = mo->momz = 0; @@ -983,7 +977,6 @@ fixed_t P_GetMobjGravity(mobj_t *mo) boolean goopgravity = false; boolean wasflip; - I_Assert(mo != NULL); I_Assert(!P_MobjWasRemoved(mo)); wasflip = (mo->eflags & MFE_VERTICALFLIP) != 0; @@ -1156,7 +1149,6 @@ void P_CheckGravity(mobj_t *mo, boolean affect) // static void P_SceneryXYFriction(mobj_t *mo, fixed_t oldx, fixed_t oldy) { - I_Assert(mo != NULL); I_Assert(!P_MobjWasRemoved(mo)); const fixed_t fric_scale = FixedMul(FRACUNIT/32, mo->scale); @@ -1200,7 +1192,6 @@ static void P_XYFriction(mobj_t *mo, fixed_t oldx, fixed_t oldy) { player_t *player; - I_Assert(mo != NULL); I_Assert(!P_MobjWasRemoved(mo)); player = mo->player; @@ -1252,7 +1243,6 @@ static void P_PushableCheckBustables(mobj_t *mo) fixed_t oldx; fixed_t oldy; - I_Assert(mo != NULL); I_Assert(!P_MobjWasRemoved(mo)); if (netgame && mo->player && mo->player->spectator) @@ -1371,7 +1361,6 @@ void P_XYMovement(mobj_t *mo) vector3_t slopemom = {0, 0, 0}; fixed_t predictedz = 0; - I_Assert(mo != NULL); I_Assert(!P_MobjWasRemoved(mo)); // if it's stopped @@ -1726,7 +1715,6 @@ void P_XYMovement(mobj_t *mo) static void P_RingXYMovement(mobj_t *mo) { - I_Assert(mo != NULL); I_Assert(!P_MobjWasRemoved(mo)); if (!P_SceneryTryMove(mo, mo->x + mo->momx, mo->y + mo->momy)) @@ -1737,7 +1725,6 @@ static void P_SceneryXYMovement(mobj_t *mo) { fixed_t oldx, oldy; // reducing bobbing/momentum on ice when up against walls - I_Assert(mo != NULL); I_Assert(!P_MobjWasRemoved(mo)); oldx = mo->x; @@ -1775,7 +1762,6 @@ static void P_AdjustMobjFloorZ_FFloors(mobj_t *mo, sector_t *sector, UINT8 motyp fixed_t delta1, delta2, thingtop; fixed_t topheight, bottomheight; - I_Assert(mo != NULL); I_Assert(!P_MobjWasRemoved(mo)); thingtop = mo->z + mo->height; @@ -1852,7 +1838,6 @@ static void P_AdjustMobjFloorZ_PolyObjs(mobj_t *mo, subsector_t *subsec) fixed_t delta1, delta2, thingtop; fixed_t polytop, polybottom; - I_Assert(mo != NULL); I_Assert(!P_MobjWasRemoved(mo)); thingtop = mo->z + mo->height; @@ -1896,7 +1881,6 @@ static void P_AdjustMobjFloorZ_PolyObjs(mobj_t *mo, subsector_t *subsec) static void P_RingZMovement(mobj_t *mo) { - I_Assert(mo != NULL); I_Assert(!P_MobjWasRemoved(mo)); // Intercept the stupid 'fall through 3dfloors' bug @@ -1931,7 +1915,6 @@ static void P_RingZMovement(mobj_t *mo) boolean P_CheckDeathPitCollide(mobj_t *mo) { - I_Assert(mo != NULL); I_Assert(!P_MobjWasRemoved(mo)); const INT32 secspecial = GETSECSPECIAL(mo->subsector->sector->special, 1); @@ -1948,7 +1931,6 @@ boolean P_CheckDeathPitCollide(mobj_t *mo) boolean P_CheckSolidLava(mobj_t *mo, ffloor_t *rover) { - I_Assert(mo != NULL); I_Assert(!P_MobjWasRemoved(mo)); if (rover->flags & FF_SWIMMABLE && GETSECSPECIAL(rover->master->frontsector->special, 1) == 3 @@ -1967,7 +1949,6 @@ static boolean P_ZMovement(mobj_t *mo) { fixed_t dist, delta; - I_Assert(mo != NULL); I_Assert(!P_MobjWasRemoved(mo)); // Intercept the stupid 'fall through 3dfloors' bug @@ -2424,7 +2405,6 @@ static boolean P_ZMovement(mobj_t *mo) static void P_PlayerZMovement(mobj_t *mo) { - I_Assert(mo != NULL); I_Assert(!P_MobjWasRemoved(mo)); if (!mo->player) @@ -3484,7 +3464,6 @@ static void P_PlayerMobjThinker(mobj_t *mobj) { msecnode_t *node; - I_Assert(mobj != NULL); I_Assert(mobj->player != NULL); I_Assert(!P_MobjWasRemoved(mobj)); @@ -9185,7 +9164,6 @@ static void P_FiringThink(mobj_t *mobj) // void P_MobjThinker(mobj_t *mobj) { - I_Assert(mobj != NULL); I_Assert(!P_MobjWasRemoved(mobj)); if (mobj->flags & MF_NOTHINK) @@ -9289,7 +9267,6 @@ void P_MobjThinker(mobj_t *mobj) if (mobj->fuse && !P_FuseThink(mobj)) return; - I_Assert(mobj != NULL); I_Assert(!P_MobjWasRemoved(mobj)); if (mobj->momx || mobj->momy || (mobj->flags2 & MF2_SKULLFLY)) @@ -9385,7 +9362,6 @@ boolean P_RailThinker(mobj_t *mobj) { fixed_t x, y, z; - I_Assert(mobj != NULL); I_Assert(!P_MobjWasRemoved(mobj)); x = mobj->x, y = mobj->y, z = mobj->z; @@ -9411,7 +9387,6 @@ void P_PushableThinker(mobj_t *mobj) { sector_t *sec; - I_Assert(mobj != NULL); I_Assert(!P_MobjWasRemoved(mobj)); if (!mobj) diff --git a/src/p_user.c b/src/p_user.c index ae5983935..9df7d2735 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -2112,7 +2112,6 @@ void P_ElementalFireTrail(player_t *player) INT32 i; I_Assert(player != NULL); - I_Assert(player->mo != NULL); I_Assert(!P_MobjWasRemoved(player->mo)); if (player->mo->eflags & MFE_VERTICALFLIP)