mirror of
https://github.com/yquake2/rogue.git
synced 2024-11-29 15:32:33 +00:00
Cleanup g_main.c and add sanity checks
This commit is contained in:
Yamagi Burmeister
parent
ea9bd331ff
commit
be4d838f45
1 changed files with 261 additions and 237 deletions
242
src/g_main.c
242
src/g_main.c
|
|
@ -1,3 +1,9 @@
|
|||
/* =======================================================================
|
||||
*
|
||||
* Jump in into the game.so and support functions.
|
||||
*
|
||||
* =======================================================================
|
||||
*/
|
||||
|
||||
#include "header/local.h"
|
||||
|
||||
|
|
@ -52,16 +58,13 @@ cvar_t *flood_persecond;
|
|||
cvar_t *flood_waitdelay;
|
||||
|
||||
cvar_t *sv_maplist;
|
||||
cvar_t *sv_stopspeed;
|
||||
|
||||
cvar_t *sv_stopspeed; //PGM (this was a define in g_phys.c)
|
||||
|
||||
//ROGUE cvars
|
||||
cvar_t *g_showlogic;
|
||||
cvar_t *gamerules;
|
||||
cvar_t *huntercam;
|
||||
cvar_t *strong_mines;
|
||||
cvar_t *randomrespawn;
|
||||
//ROGUE
|
||||
|
||||
void SpawnEntities(char *mapname, char *entities, char *spawnpoint);
|
||||
void ClientThink(edict_t *ent, usercmd_t *cmd);
|
||||
|
|
@ -78,11 +81,10 @@ void ReadLevel (char *filename);
|
|||
void InitGame(void);
|
||||
void G_RunFrame(void);
|
||||
|
||||
/* =================================================================== */
|
||||
|
||||
//===================================================================
|
||||
|
||||
|
||||
void ShutdownGame (void)
|
||||
void
|
||||
ShutdownGame(void)
|
||||
{
|
||||
gi.dprintf("==== ShutdownGame ====\n");
|
||||
|
||||
|
|
@ -90,16 +92,12 @@ void ShutdownGame (void)
|
|||
gi.FreeTags(TAG_GAME);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
=================
|
||||
GetGameAPI
|
||||
|
||||
Returns a pointer to the structure with all entry points
|
||||
and global variables
|
||||
=================
|
||||
* Returns a pointer to the structure with
|
||||
* all entry points and global variables
|
||||
*/
|
||||
game_export_t *GetGameAPI (game_import_t *import)
|
||||
game_export_t *
|
||||
GetGameAPI(game_import_t *import)
|
||||
{
|
||||
gi = *import;
|
||||
|
||||
|
|
@ -132,9 +130,12 @@ game_export_t *GetGameAPI (game_import_t *import)
|
|||
return &globals;
|
||||
}
|
||||
|
||||
#ifndef GAME_HARD_LINKED
|
||||
// this is only here so the functions in q_shared.c and q_shwin.c can link
|
||||
void Sys_Error (char *error, ...)
|
||||
/*
|
||||
* this is only here so the functions in
|
||||
* q_shared.c and q_shwin.c can link
|
||||
*/
|
||||
void
|
||||
Sys_Error(char *error, ...)
|
||||
{
|
||||
va_list argptr;
|
||||
char text[1024];
|
||||
|
|
@ -146,7 +147,8 @@ void Sys_Error (char *error, ...)
|
|||
gi.error(ERR_FATAL, "%s", text);
|
||||
}
|
||||
|
||||
void Com_Printf (char *msg, ...)
|
||||
void
|
||||
Com_Printf(char *msg, ...)
|
||||
{
|
||||
va_list argptr;
|
||||
char text[1024];
|
||||
|
|
@ -158,44 +160,42 @@ void Com_Printf (char *msg, ...)
|
|||
gi.dprintf("%s", text);
|
||||
}
|
||||
|
||||
#endif
|
||||
/* ====================================================================== */
|
||||
|
||||
//======================================================================
|
||||
|
||||
|
||||
/*
|
||||
=================
|
||||
ClientEndServerFrames
|
||||
=================
|
||||
*/
|
||||
void ClientEndServerFrames (void)
|
||||
void
|
||||
ClientEndServerFrames(void)
|
||||
{
|
||||
int i;
|
||||
edict_t *ent;
|
||||
|
||||
// calc the player views now that all pushing
|
||||
// and damage has been added
|
||||
/* calc the player views now that all
|
||||
pushing and damage has been added */
|
||||
for (i = 0; i < maxclients->value; i++)
|
||||
{
|
||||
ent = g_edicts + 1 + i;
|
||||
|
||||
if (!ent->inuse || !ent->client)
|
||||
{
|
||||
continue;
|
||||
ClientEndServerFrame (ent);
|
||||
}
|
||||
|
||||
ClientEndServerFrame(ent);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
=================
|
||||
CreateTargetChangeLevel
|
||||
|
||||
Returns the created target changelevel
|
||||
=================
|
||||
* Returns the created target changelevel
|
||||
*/
|
||||
edict_t *CreateTargetChangeLevel(char *map)
|
||||
edict_t *
|
||||
CreateTargetChangeLevel(char *map)
|
||||
{
|
||||
edict_t *ent;
|
||||
|
||||
if (!map)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ent = G_Spawn();
|
||||
ent->classname = "target_changelevel";
|
||||
Com_sprintf(level.nextmap, sizeof(level.nextmap), "%s", map);
|
||||
|
|
@ -204,77 +204,95 @@ edict_t *CreateTargetChangeLevel(char *map)
|
|||
}
|
||||
|
||||
/*
|
||||
=================
|
||||
EndDMLevel
|
||||
|
||||
The timelimit or fraglimit has been exceeded
|
||||
=================
|
||||
* The timelimit or fraglimit has been exceeded
|
||||
*/
|
||||
void EndDMLevel (void)
|
||||
void
|
||||
EndDMLevel(void)
|
||||
{
|
||||
edict_t *ent;
|
||||
char *s, *t, *f;
|
||||
static const char *seps = " ,\n\r";
|
||||
|
||||
// stay on same level flag
|
||||
/* stay on same level flag */
|
||||
if ((int)dmflags->value & DF_SAME_LEVEL)
|
||||
{
|
||||
BeginIntermission(CreateTargetChangeLevel(level.mapname));
|
||||
return;
|
||||
}
|
||||
|
||||
// see if it's in the map list
|
||||
if (*sv_maplist->string) {
|
||||
/* see if it's in the map list */
|
||||
if (*sv_maplist->string)
|
||||
{
|
||||
s = strdup(sv_maplist->string);
|
||||
f = NULL;
|
||||
t = strtok(s, seps);
|
||||
while (t != NULL) {
|
||||
if (Q_stricmp(t, level.mapname) == 0) {
|
||||
// it's in the list, go to the next one
|
||||
|
||||
while (t != NULL)
|
||||
{
|
||||
if (Q_stricmp(t, level.mapname) == 0)
|
||||
{
|
||||
/* it's in the list, go to the next one */
|
||||
t = strtok(NULL, seps);
|
||||
if (t == NULL) { // end of list, go to first one
|
||||
if (f == NULL) // there isn't a first one, same level
|
||||
|
||||
if (t == NULL) /* end of list, go to first one */
|
||||
{
|
||||
if (f == NULL) /* there isn't a first one, same level */
|
||||
{
|
||||
BeginIntermission(CreateTargetChangeLevel(level.mapname));
|
||||
}
|
||||
else
|
||||
{
|
||||
BeginIntermission(CreateTargetChangeLevel(f));
|
||||
} else
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
BeginIntermission(CreateTargetChangeLevel(t));
|
||||
}
|
||||
|
||||
free(s);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!f)
|
||||
{
|
||||
f = t;
|
||||
}
|
||||
|
||||
t = strtok(NULL, seps);
|
||||
}
|
||||
|
||||
free(s);
|
||||
}
|
||||
|
||||
if (level.nextmap[0]) // go to a specific map
|
||||
if (level.nextmap[0]) /* go to a specific map */
|
||||
{
|
||||
BeginIntermission(CreateTargetChangeLevel(level.nextmap));
|
||||
else { // search for a changelevel
|
||||
}
|
||||
else /* search for a changelevel */
|
||||
{
|
||||
ent = G_Find(NULL, FOFS(classname), "target_changelevel");
|
||||
|
||||
if (!ent)
|
||||
{ // the map designer didn't include a changelevel,
|
||||
// so create a fake ent that goes back to the same level
|
||||
{
|
||||
/* the map designer didn't include a changelevel,
|
||||
so create a fake ent that goes back to the same
|
||||
level */
|
||||
BeginIntermission(CreateTargetChangeLevel(level.mapname));
|
||||
return;
|
||||
}
|
||||
|
||||
BeginIntermission(ent);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
=================
|
||||
CheckNeedPass
|
||||
=================
|
||||
*/
|
||||
void CheckNeedPass (void)
|
||||
void
|
||||
CheckNeedPass(void)
|
||||
{
|
||||
int need;
|
||||
|
||||
// if password or spectator_password has changed, update needpass
|
||||
// as needed
|
||||
/* if password or spectator_password has
|
||||
changed, update needpass as needed */
|
||||
if (password->modified || spectator_password->modified)
|
||||
{
|
||||
password->modified = spectator_password->modified = false;
|
||||
|
|
@ -282,39 +300,43 @@ void CheckNeedPass (void)
|
|||
need = 0;
|
||||
|
||||
if (*password->string && Q_stricmp(password->string, "none"))
|
||||
{
|
||||
need |= 1;
|
||||
if (*spectator_password->string && Q_stricmp(spectator_password->string, "none"))
|
||||
}
|
||||
|
||||
if (*spectator_password->string &&
|
||||
Q_stricmp(spectator_password->string, "none"))
|
||||
{
|
||||
need |= 2;
|
||||
}
|
||||
|
||||
gi.cvar_set("needpass", va("%d", need));
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
=================
|
||||
CheckDMRules
|
||||
=================
|
||||
*/
|
||||
void CheckDMRules (void)
|
||||
void
|
||||
CheckDMRules(void)
|
||||
{
|
||||
int i;
|
||||
gclient_t *cl;
|
||||
|
||||
if (level.intermissiontime)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (!deathmatch->value)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
//=======
|
||||
//ROGUE
|
||||
if (gamerules && gamerules->value && DMGame.CheckDMRules)
|
||||
{
|
||||
if (DMGame.CheckDMRules())
|
||||
{
|
||||
return;
|
||||
}
|
||||
//ROGUE
|
||||
//=======
|
||||
}
|
||||
|
||||
if (timelimit->value)
|
||||
{
|
||||
|
|
@ -331,8 +353,11 @@ void CheckDMRules (void)
|
|||
for (i = 0; i < maxclients->value; i++)
|
||||
{
|
||||
cl = game.clients + i;
|
||||
|
||||
if (!g_edicts[i + 1].inuse)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (cl->resp.score >= fraglimit->value)
|
||||
{
|
||||
|
|
@ -344,13 +369,8 @@ void CheckDMRules (void)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
=============
|
||||
ExitLevel
|
||||
=============
|
||||
*/
|
||||
void ExitLevel (void)
|
||||
void
|
||||
ExitLevel(void)
|
||||
{
|
||||
int i;
|
||||
edict_t *ent;
|
||||
|
|
@ -363,26 +383,28 @@ void ExitLevel (void)
|
|||
level.intermissiontime = 0;
|
||||
ClientEndServerFrames();
|
||||
|
||||
// clear some things before going to next level
|
||||
/* clear some things before going to next level */
|
||||
for (i = 0; i < maxclients->value; i++)
|
||||
{
|
||||
ent = g_edicts + 1 + i;
|
||||
|
||||
if (!ent->inuse)
|
||||
{
|
||||
continue;
|
||||
if (ent->health > ent->client->pers.max_health)
|
||||
ent->health = ent->client->pers.max_health;
|
||||
}
|
||||
|
||||
if (ent->health > ent->client->pers.max_health)
|
||||
{
|
||||
ent->health = ent->client->pers.max_health;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
================
|
||||
G_RunFrame
|
||||
|
||||
Advances the world by 0.1 seconds
|
||||
================
|
||||
* Advances the world by 0.1 seconds
|
||||
*/
|
||||
void G_RunFrame (void)
|
||||
void
|
||||
G_RunFrame(void)
|
||||
{
|
||||
int i;
|
||||
edict_t *ent;
|
||||
|
|
@ -390,42 +412,45 @@ void G_RunFrame (void)
|
|||
level.framenum++;
|
||||
level.time = level.framenum * FRAMETIME;
|
||||
|
||||
// choose a client for monsters to target this frame
|
||||
/* choose a client for monsters to target this frame */
|
||||
AI_SetSightClient();
|
||||
|
||||
// exit intermissions
|
||||
|
||||
/* exit intermissions */
|
||||
if (level.exitintermission)
|
||||
{
|
||||
ExitLevel();
|
||||
return;
|
||||
}
|
||||
|
||||
//
|
||||
// treat each object in turn
|
||||
// even the world gets a chance to think
|
||||
//
|
||||
/* treat each object in turn even the
|
||||
world gets a chance to think */
|
||||
ent = &g_edicts[0];
|
||||
|
||||
for (i = 0; i < globals.num_edicts; i++, ent++)
|
||||
{
|
||||
if (!ent->inuse)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
level.current_entity = ent;
|
||||
|
||||
VectorCopy(ent->s.origin, ent->s.old_origin);
|
||||
|
||||
// if the ground entity moved, make sure we are still on it
|
||||
if ((ent->groundentity) && (ent->groundentity->linkcount != ent->groundentity_linkcount))
|
||||
/* if the ground entity moved, make sure we are still on it */
|
||||
if ((ent->groundentity) &&
|
||||
(ent->groundentity->linkcount != ent->groundentity_linkcount))
|
||||
{
|
||||
ent->groundentity = NULL;
|
||||
if ( !(ent->flags & (FL_SWIM|FL_FLY)) && (ent->svflags & SVF_MONSTER) )
|
||||
|
||||
if (!(ent->flags & (FL_SWIM | FL_FLY)) &&
|
||||
(ent->svflags & SVF_MONSTER))
|
||||
{
|
||||
M_CheckGround(ent);
|
||||
}
|
||||
}
|
||||
|
||||
if (i > 0 && i <= maxclients->value)
|
||||
if ((i > 0) && (i <= maxclients->value))
|
||||
{
|
||||
ClientBeginServerFrame(ent);
|
||||
continue;
|
||||
|
|
@ -434,13 +459,12 @@ void G_RunFrame (void)
|
|||
G_RunEntity(ent);
|
||||
}
|
||||
|
||||
// see if it is time to end a deathmatch
|
||||
/* see if it is time to end a deathmatch */
|
||||
CheckDMRules();
|
||||
|
||||
// see if needpass needs updated
|
||||
/* see if needpass needs updated */
|
||||
CheckNeedPass();
|
||||
|
||||
// build the playerstate_t structures for all players
|
||||
/* build the playerstate_t structures for all players */
|
||||
ClientEndServerFrames();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue