Did everything toaster suggested

This commit is contained in:
Latapostrophe 2018-09-22 01:47:13 +02:00
parent 23090e82b5
commit f8c9ef9431
5 changed files with 8 additions and 6 deletions

View file

@ -60,7 +60,7 @@ char sprnames[NUMSPRITES + 1][5] =
"BHBM","BLIG","LIGH","THNS","SINK","SITR","KBLN","DEZL","POKE","AUDI", "BHBM","BLIG","LIGH","THNS","SINK","SITR","KBLN","DEZL","POKE","AUDI",
"DECO","DOOD","SNES","GBAS","SPRS","BUZB","CHOM","SACO","CRAB","SHAD", "DECO","DOOD","SNES","GBAS","SPRS","BUZB","CHOM","SACO","CRAB","SHAD",
"BRNG","BUMP","FLEN","CLAS","PSHW","ISTA","ISTB","ARRO","ITEM","ITMO", "BRNG","BUMP","FLEN","CLAS","PSHW","ISTA","ISTB","ARRO","ITEM","ITMO",
"ITMI","ITMN","WANT","PBOM","RETI","VIEW","KSPK","LZI1","LZI2","KLIT" "ITMI","ITMN","WANT","PBOM","RETI","KSPK","LZI1","LZI2","KLIT","VIEW"
}; };
// Doesn't work with g++, needs actionf_p1 (don't modify this comment) // Doesn't work with g++, needs actionf_p1 (don't modify this comment)

View file

@ -643,13 +643,13 @@ typedef enum sprite
SPR_PBOM, // player bomb SPR_PBOM, // player bomb
SPR_RETI, // player reticule SPR_RETI, // player reticule
SPR_VIEW, // First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw!
SPR_KSPK, // Spark radius for the lightning shield SPR_KSPK, // Spark radius for the lightning shield
SPR_LZI1, // Lightning that falls on the player for lightning shield SPR_LZI1, // Lightning that falls on the player for lightning shield
SPR_LZI2, // ditto SPR_LZI2, // ditto
SPR_KLIT, // You have a twisted mind. But this actually is for the diagonal lightning. SPR_KLIT, // You have a twisted mind. But this actually is for the diagonal lightning.
SPR_VIEW, // First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw!
SPR_FIRSTFREESLOT, SPR_FIRSTFREESLOT,
SPR_LASTFREESLOT = SPR_FIRSTFREESLOT + NUMSPRITEFREESLOTS - 1, SPR_LASTFREESLOT = SPR_FIRSTFREESLOT + NUMSPRITEFREESLOTS - 1,
NUMSPRITES NUMSPRITES

View file

@ -2757,6 +2757,8 @@ static void K_DoThunderShield(player_t *player)
} }
} }
#undef THUNDERRADIUS
static void K_DoHyudoroSteal(player_t *player) static void K_DoHyudoroSteal(player_t *player)
{ {
INT32 i, numplayers = 0; INT32 i, numplayers = 0;

View file

@ -812,8 +812,8 @@ sfxinfo_t S_sfx[NUMSFX] =
{"noooo2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"noooo2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"hogbom", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR}, {"hogbom", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR},
{"ddash", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"ddash", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"dbgsal", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR},
{"zio3", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR}, {"zio3", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR},
{"dbgsal", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR},
// SRB2kart - Skin sounds // SRB2kart - Skin sounds
{"kwin", false, 64, 0, -1, NULL, 0, SKSWIN, -1, LUMPERROR}, {"kwin", false, 64, 0, -1, NULL, 0, SKSWIN, -1, LUMPERROR},

View file

@ -884,8 +884,8 @@ typedef enum
sfx_noooo2, sfx_noooo2,
sfx_hogbom, sfx_hogbom,
sfx_ddash, sfx_ddash,
sfx_dbgsal,
sfx_zio3, sfx_zio3,
sfx_dbgsal,
sfx_kwin, sfx_kwin,
sfx_klose, sfx_klose,