thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-31 04:02:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge g_game.c/h

Browse source
This commit is contained in:
Sally Coolatta 2020-08-10 13:09:26 -04:00
parent f8ea416a97
commit a771bb0047
2 changed files with 97 additions and 639 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

723
src/g_game.c
View file

File diff suppressed because it is too large Load diff

13
src/g_game.h
View file

@ -82,12 +82,7 @@ extern consvar_t cv_resume;
// build an internal map name MAPxx from map number
const char *G_BuildMapName(INT32 map);
<<<<<<< HEAD
=======
extern INT16 ticcmd_oldangleturn[2];
extern boolean ticcmd_centerviewdown[2]; // For simple controls, lock the camera behind the player
extern mobj_t *ticcmd_ztargetfocus[2]; // Locking onto an object?
>>>>>>> srb2/next
extern INT16 ticcmd_oldangleturn[MAXSPLITSCREENPLAYERS];
void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer);
// copy ticcmd_t to and fro the normal way
@ -184,16 +179,10 @@ boolean G_GametypeUsesCoopLives(void);
boolean G_GametypeUsesCoopStarposts(void);
boolean G_GametypeHasTeams(void);
boolean G_GametypeHasSpectators(void);
<<<<<<< HEAD
boolean G_BattleGametype(void);
INT16 G_SometimesGetDifferentGametype(void);
UINT8 G_GetGametypeColor(INT16 gt);
boolean G_RaceGametype(void);
=======
boolean G_RingSlingerGametype(void);
boolean G_PlatformGametype(void);
boolean G_CoopGametype(void);
>>>>>>> srb2/next
boolean G_TagGametype(void);
boolean G_CompetitionGametype(void);
boolean G_EnoughPlayersFinished(void);