diff --git a/src/dehacked.c b/src/dehacked.c index a48a2598f..1114d0a6b 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -2418,7 +2418,6 @@ static actionpointer_t actionpointers[] = {{A_SnapperThinker}, "A_SNAPPERTHINKER"}, {{A_SaloonDoorSpawn}, "A_SALOONDOORSPAWN"}, {{A_MinecartSparkThink}, "A_MINECARTSPARKTHINK"}, - {{A_ModuloToState}, "A_MODULOTOSTATE"}, {{NULL}, "NONE"}, // This NULL entry must be the last in the list @@ -7131,10 +7130,7 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_CRUMBLE2", // Spark - "S_SPRK1", - "S_SPRK2", - "S_SPRK3", - "S_SPRK4", + "S_SPRK", // Robot Explosion "S_XPLD_FLICKY", diff --git a/src/info.c b/src/info.c index c49585977..db58d6e45 100644 --- a/src/info.c +++ b/src/info.c @@ -3827,10 +3827,7 @@ state_t states[NUMSTATES] = {SPR_NULL, 0, 105, {A_Scream}, 0, 0, S_NULL}, // S_CRUMBLE2 // Spark - {SPR_SPRK, FF_TRANS80|18, 1, {NULL}, 0, 0, S_SPRK4}, // S_SPRK1 - {SPR_SPRK, FF_TRANS20|FF_ANIMATE|0, 18, {NULL}, 8, 2, S_NULL}, // S_SPRK2 - {SPR_SPRK, FF_TRANS20|FF_ANIMATE|9, 1, {NULL}, 8, 2, S_NULL}, // S_SPRK3 - {SPR_SPRK, FF_TRANS50|1, 0, {A_ModuloToState}, 2, S_SPRK2, S_SPRK3}, // S_SPRK4 + {SPR_SPRK, FF_TRANS20|FF_ANIMATE|0, 18, {NULL}, 8, 2, S_NULL}, // S_SPRK // Robot Explosion {SPR_BOM1, 0, 0, {A_FlickySpawn}, 0, 0, S_XPLD1}, // S_XPLD_FLICKY @@ -5600,7 +5597,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_None, // deathsound 10*FRACUNIT, // speed @@ -6437,7 +6434,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_itemup, // deathsound 38*FRACUNIT, // speed @@ -6464,7 +6461,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_itemup, // deathsound 38*FRACUNIT, // speed @@ -6572,7 +6569,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_itemup, // deathsound 38*FRACUNIT, // speed @@ -6599,7 +6596,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_itemup, // deathsound 38*FRACUNIT, // speed @@ -6626,7 +6623,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_None, // deathsound 0, // speed @@ -6707,7 +6704,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_ncitem, // deathsound 1, // speed @@ -6734,7 +6731,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_cgot, // deathsound EMERALD1, // speed @@ -6760,7 +6757,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_cgot, // deathsound EMERALD2, // speed @@ -6786,7 +6783,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_cgot, // deathsound EMERALD3, // speed @@ -6812,7 +6809,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_cgot, // deathsound EMERALD4, // speed @@ -6838,7 +6835,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_cgot, // deathsound EMERALD5, // speed @@ -6864,7 +6861,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_cgot, // deathsound EMERALD6, // speed @@ -6890,7 +6887,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_cgot, // deathsound EMERALD7, // speed @@ -6917,7 +6914,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_cgot, // deathsound 8, // speed @@ -6971,7 +6968,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_cgot, // deathsound 60*FRACUNIT, // speed @@ -17162,8 +17159,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate - S_SPRK1, // xdeathstate + S_SPRK, // deathstate + S_SPRK, // xdeathstate sfx_None, // deathsound 60*FRACUNIT, // speed 16*FRACUNIT, // radius @@ -17189,7 +17186,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_itemup, // deathsound 60*FRACUNIT, // speed @@ -17217,7 +17214,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_itemup, // deathsound 60*FRACUNIT, // speed @@ -17244,7 +17241,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_itemup, // deathsound 60*FRACUNIT, // speed @@ -17271,7 +17268,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_itemup, // deathsound 60*FRACUNIT, // speed @@ -17298,7 +17295,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_itemup, // deathsound 60*FRACUNIT, // speed @@ -17325,7 +17322,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_itemup, // deathsound 60*FRACUNIT, // speed @@ -17352,7 +17349,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_itemup, // deathsound 60*FRACUNIT, // speed @@ -17379,7 +17376,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_itemup, // deathsound 60*FRACUNIT, // speed @@ -17569,7 +17566,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_itemup, // deathsound 60*FRACUNIT, // speed @@ -17596,7 +17593,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_itemup, // deathsound 60*FRACUNIT, // speed @@ -17623,7 +17620,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_itemup, // deathsound 60*FRACUNIT, // speed @@ -17650,7 +17647,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_itemup, // deathsound 60*FRACUNIT, // speed @@ -18540,7 +18537,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_s3k33, // painsound S_RING, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_ncchip, // deathsound 1, // speed @@ -18567,7 +18564,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_ncchip, // deathsound 38*FRACUNIT, // speed @@ -18594,7 +18591,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_s3k33, // painsound S_RING, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_ncitem, // deathsound 1, // speed @@ -18621,7 +18618,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_ncspec, // deathsound 20*TICRATE, // speed @@ -18648,7 +18645,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_ncspec, // deathsound 96*20, // speed @@ -18675,7 +18672,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_ncspec, // deathsound 20*TICRATE, // speed @@ -18702,7 +18699,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_ncspec, // deathsound 30*TICRATE, // speed @@ -18729,7 +18726,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_SPRK1, // deathstate + S_SPRK, // deathstate S_NULL, // xdeathstate sfx_ncspec, // deathsound 15*TICRATE, // speed @@ -19612,7 +19609,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = { // MT_SPARK -1, // doomednum - S_SPRK1, // spawnstate + S_SPRK, // spawnstate 1000, // spawnhealth S_NULL, // seestate sfx_None, // seesound diff --git a/src/info.h b/src/info.h index 1c03a0d3c..feba1e6d9 100644 --- a/src/info.h +++ b/src/info.h @@ -265,7 +265,6 @@ void A_SnapperSpawn(); void A_SnapperThinker(); void A_SaloonDoorSpawn(); void A_MinecartSparkThink(); -void A_ModuloToState(); // ratio of states to sprites to mobj types is roughly 6 : 1 : 1 #define NUMMOBJFREESLOTS 512 @@ -3890,10 +3889,7 @@ typedef enum state S_CRUMBLE2, // Spark - S_SPRK1, - S_SPRK2, - S_SPRK3, - S_SPRK4, + S_SPRK, // Robot Explosion S_XPLD_FLICKY, diff --git a/src/p_enemy.c b/src/p_enemy.c index dcd58e53d..d422ba89a 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -37,8 +37,6 @@ boolean LUA_CallAction(const char *action, mobj_t *actor); player_t *stplyr; INT32 var1; INT32 var2; -INT32 Modulothing; - // // P_NewChaseDir related LUT. // @@ -295,7 +293,6 @@ void A_SnapperSpawn(mobj_t *actor); void A_SnapperThinker(mobj_t *actor); void A_SaloonDoorSpawn(mobj_t *actor); void A_MinecartSparkThink(mobj_t *actor); -void A_ModuloToState(mobj_t *actor); //for p_enemy.c @@ -13650,25 +13647,4 @@ void A_MinecartSparkThink(mobj_t *actor) P_SetScale(trail, trail->scale/4); trail->destscale = trail->scale; } -} - -// Function: A_MinecartSparkThink -// -// Description: Modulo operation to state -// -// var1 = Modulo -// var2 = State -// -void A_ModuloToState(mobj_t *actor) -{ - INT32 locvar1 = var1; - INT32 locvar2 = var2; -#ifdef HAVE_BLUA - if (LUA_CallAction("A_ModuloToState", actor)) - return; -#endif - - if ((Modulothing % locvar1 == 0)) - P_SetMobjState(actor, (locvar2)); - Modulothing = Modulothing + 1; } \ No newline at end of file diff --git a/src/p_saveg.c b/src/p_saveg.c index 09df38eb0..9bd14ce39 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -4096,7 +4096,7 @@ static inline boolean P_NetUnArchiveMisc(void) countdowntimer = (tic_t)READUINT32(save_p); countdowntimeup = (boolean)READUINT8(save_p); - hidetime = READUINT32(save_p); + hidetime = READUINT32(save_p);; // Is it paused? if (READUINT8(save_p) == 0x2f)