thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-28 04:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge y_inter.c/h

Browse source
This commit is contained in:
Sally Coolatta 2020-08-09 15:47:37 -04:00
parent 68f9edf86b
commit 4f47775d51
3 changed files with 31 additions and 1297 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/dehacked.c
View file

@ -11216,14 +11216,9 @@ struct {
// Intermission types // Intermission types
{"int_none",int_none}, {"int_none",int_none},
{"int_coop",int_coop},
{"int_match",int_match},
{"int_teammatch",int_teammatch},
//{"int_tag",int_tag},
{"int_ctf",int_ctf},
{"int_spec",int_spec},
{"int_race",int_race}, {"int_race",int_race},
{"int_comp",int_comp}, {"int_battle",int_battle},
{"int_timeattack",int_timeattack},
// Jingles (jingletype_t) // Jingles (jingletype_t)
{"JT_NONE",JT_NONE}, {"JT_NONE",JT_NONE},

1294
src/y_inter.c
View file

File diff suppressed because it is too large Load diff

25
src/y_inter.h
View file

@ -27,27 +27,10 @@ void Y_SetupVoteFinish(SINT8 pick, SINT8 level);
typedef enum typedef enum
{ {
int_none, int_none,
<<<<<<< HEAD int_race, // Race
int_timeattack, // Time Attack int_battle, // Battle
int_match, // Match int_timeattack, // Time Attack
int_teammatch, // Team Match
// int_tag, // Tag
int_ctf, // CTF
int_spec, // Special Stage
int_nights, // NiGHTS into Dreams
int_nightsspec, // NiGHTS special stage
int_race, // Race
int_classicrace, // Competition
=======
int_coop, // Single Player/Cooperative
int_match, // Match
int_teammatch,// Team Match
// int_tag, // Tag
int_ctf, // CTF
int_spec, // Special Stage
int_race, // Race
int_comp, // Competition
>>>>>>> srb2/next
} intertype_t; } intertype_t;
extern intertype_t intertype; extern intertype_t intertype;
extern intertype_t intermissiontypes[NUMGAMETYPES]; extern intertype_t intermissiontypes[NUMGAMETYPES];