thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Checkpoints: add states

Browse source 
Duplicating S_SIGNSPARK1-11 because FUCK.
This commit is contained in:
James R 2023-08-30 21:05:44 -07:00 • committed by toaster
parent e351f07e4e
commit 02b6ac0b70
3 changed files with 85 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/deh_tables.c
View file

@ -4653,6 +4653,22 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
"S_BATTLEUFO_BEAM2", "S_BATTLEUFO_BEAM2",
"S_POWERUP_AURA", "S_POWERUP_AURA",
"S_CHECKPOINT",
"S_CHECKPOINT_ARM",
"S_CHECKPOINT_ORB_DEAD",
"S_CHECKPOINT_ORB_LIVE",
"S_CHECKPOINT_SPARK1",
"S_CHECKPOINT_SPARK2",
"S_CHECKPOINT_SPARK3",
"S_CHECKPOINT_SPARK4",
"S_CHECKPOINT_SPARK5",
"S_CHECKPOINT_SPARK6",
"S_CHECKPOINT_SPARK7",
"S_CHECKPOINT_SPARK8",
"S_CHECKPOINT_SPARK9",
"S_CHECKPOINT_SPARK10",
"S_CHECKPOINT_SPARK11",
}; };
// RegEx to generate this from info.h: ^\tMT_([^,]+), --> \t"MT_\1", // RegEx to generate this from info.h: ^\tMT_([^,]+), --> \t"MT_\1",
@ -5803,6 +5819,7 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t
"MT_POWERUP_AURA", "MT_POWERUP_AURA",
"MT_CHECKPOINT_END",
"MT_SCRIPT_THING", "MT_SCRIPT_THING",
}; };

47
src/info.c
View file

@ -888,6 +888,10 @@ char sprnames[NUMSPRITES + 1][5] =
"BUFO", // Battle/Power-UP UFO "BUFO", // Battle/Power-UP UFO
"CPT1", // Checkpoint Orb
"CPT2", // Checkpoint Stick
"CPT3", // Checkpoint Base
// First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw later // First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw later
"VIEW", "VIEW",
}; };
@ -5394,6 +5398,22 @@ state_t states[NUMSTATES] =
{SPR_DEZL, 3|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_BATTLEUFO_BEAM2 {SPR_DEZL, 3|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_BATTLEUFO_BEAM2
{SPR_RBOW, FF_PAPERSPRITE|FF_ADD|FF_FULLBRIGHT|FF_ANIMATE, -1, {NULL}, 14, 2, S_NULL}, // S_POWERUP_AURA {SPR_RBOW, FF_PAPERSPRITE|FF_ADD|FF_FULLBRIGHT|FF_ANIMATE, -1, {NULL}, 14, 2, S_NULL}, // S_POWERUP_AURA
{SPR_CPT3, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CHECKPOINT
{SPR_CPT2, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_CHECKPOINT_ARM
{SPR_CPT1, FF_ADD|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_CHECKPOINT_ORB_DEAD
{SPR_CPT1, FF_ADD|FF_FULLBRIGHT|FF_ANIMATE, -1, {NULL}, 2, 1, S_NULL}, // S_CHECKPOINT_ORB_LIVE
{SPR_SGNS, FF_ADD|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_CHECKPOINT_SPARK2}, // S_CHECKPOINT_SPARK1
{SPR_SGNS, FF_ADD|FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_CHECKPOINT_SPARK3}, // S_CHECKPOINT_SPARK2
{SPR_SGNS, FF_ADD|FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_CHECKPOINT_SPARK4}, // S_CHECKPOINT_SPARK3
{SPR_SGNS, FF_ADD|FF_FULLBRIGHT|3, 1, {NULL}, 0, 0, S_CHECKPOINT_SPARK5}, // S_CHECKPOINT_SPARK4
{SPR_SGNS, FF_ADD|FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_CHECKPOINT_SPARK6}, // S_CHECKPOINT_SPARK5
{SPR_SGNS, FF_ADD|FF_FULLBRIGHT|5, 1, {NULL}, 0, 0, S_CHECKPOINT_SPARK7}, // S_CHECKPOINT_SPARK6
{SPR_SGNS, FF_ADD|FF_FULLBRIGHT|6, 1, {NULL}, 0, 0, S_CHECKPOINT_SPARK8}, // S_CHECKPOINT_SPARK7
{SPR_SGNS, FF_ADD|FF_FULLBRIGHT|7, 1, {NULL}, 0, 0, S_CHECKPOINT_SPARK9}, // S_CHECKPOINT_SPARK8
{SPR_SGNS, FF_ADD|FF_FULLBRIGHT|8, 1, {NULL}, 0, 0, S_CHECKPOINT_SPARK10}, // S_CHECKPOINT_SPARK9
{SPR_SGNS, FF_ADD|FF_FULLBRIGHT|3, 1, {NULL}, 0, 0, S_CHECKPOINT_SPARK11}, // S_CHECKPOINT_SPARK10
{SPR_SGNS, FF_ADD|FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_CHECKPOINT_SPARK1}, // S_CHECKPOINT_SPARK11
}; };
mobjinfo_t mobjinfo[NUMMOBJTYPES] = mobjinfo_t mobjinfo[NUMMOBJTYPES] =
@ -30305,6 +30325,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_CHECKPOINT_END
2030, // doomednum
S_CHECKPOINT, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
0, // reactiontime
sfx_None, // attacksound
S_NULL, // painstate
0, // painchance
sfx_None, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
S_NULL, // deathstate
S_NULL, // xdeathstate
sfx_None, // deathsound
0, // speed
19*FRACUNIT, // radius
75*FRACUNIT, // height
0, // display offset
0, // mass
0, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_SCENERY|MF_DONTENCOREMAP, // flags
S_NULL // raisestate
},
{ // MT_SCRIPT_THING { // MT_SCRIPT_THING
4096, // doomednum 4096, // doomednum
S_INVISIBLE, // spawnstate S_INVISIBLE, // spawnstate

21
src/info.h
View file

@ -1442,6 +1442,10 @@ typedef enum sprite
SPR_BUFO, // Battle/Power-UP UFO SPR_BUFO, // Battle/Power-UP UFO
SPR_CPT1, // Checkpoint Orb
SPR_CPT2, // Checkpoint Stick
SPR_CPT3, // Checkpoint Base
// First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw later // First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw later
SPR_VIEW, SPR_VIEW,
@ -5823,6 +5827,22 @@ typedef enum state
S_POWERUP_AURA, S_POWERUP_AURA,
S_CHECKPOINT,
S_CHECKPOINT_ARM,
S_CHECKPOINT_ORB_DEAD,
S_CHECKPOINT_ORB_LIVE,
S_CHECKPOINT_SPARK1,
S_CHECKPOINT_SPARK2,
S_CHECKPOINT_SPARK3,
S_CHECKPOINT_SPARK4,
S_CHECKPOINT_SPARK5,
S_CHECKPOINT_SPARK6,
S_CHECKPOINT_SPARK7,
S_CHECKPOINT_SPARK8,
S_CHECKPOINT_SPARK9,
S_CHECKPOINT_SPARK10,
S_CHECKPOINT_SPARK11,
S_FIRSTFREESLOT, S_FIRSTFREESLOT,
S_LASTFREESLOT = S_FIRSTFREESLOT + NUMSTATEFREESLOTS - 1, S_LASTFREESLOT = S_FIRSTFREESLOT + NUMSTATEFREESLOTS - 1,
NUMSTATES NUMSTATES
@ -6991,6 +7011,7 @@ typedef enum mobj_type
MT_POWERUP_AURA, MT_POWERUP_AURA,
MT_CHECKPOINT_END,
MT_SCRIPT_THING, MT_SCRIPT_THING,
MT_FIRSTFREESLOT, MT_FIRSTFREESLOT,