Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-05-10 12:36:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Actor health must be above to 0 for NPC to count

Browse source
This commit is contained in:
smallmodel 2023-10-30 23:01:43 +01:00
parent c741591a36
commit abd757f3bc
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
1 changed files with 34 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

64
code/fgame/g_main.cpp
View file

@ -1,24 +1,25 @@
/* /*
=========================================================================== ===========================================================================
Copyright (C) 1999-2005 Id Software, Inc. Copyright (C) 2023 the OpenMoHAA team
This file is part of Quake III Arena source code. This file is part of OpenMoHAA source code.
Quake III Arena source code is free software; you can redistribute it OpenMoHAA source code is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public License as and/or modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the License, published by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version. or (at your option) any later version.
Quake III Arena source code is distributed in the hope that it will be OpenMoHAA source code is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied warranty of useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with Quake III Arena source code; if not, write to the Free Software along with OpenMoHAA source code; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
// //
#include "g_local.h" #include "g_local.h"
@ -475,7 +476,7 @@ void G_RunFrame(int levelTime, int frameTime)
gi.DPrintf2("====SERVER FRAME==========================================================================\n"); gi.DPrintf2("====SERVER FRAME==========================================================================\n");
} }
g_bBeforeThinks = true; g_bBeforeThinks = true;
Director.AllowPause(false); Director.AllowPause(false);
// Process most of the events before the physics are run // Process most of the events before the physics are run
@ -657,35 +658,38 @@ void G_RunFrame(int levelTime, int frameTime)
g_shownpc->integer--; g_shownpc->integer--;
} else { } else {
int numActiveAllies = 0; int numActiveAllies = 0;
int numActiveAxis = 0; int numActiveAxis = 0;
int numAllies = 0; int numAllies = 0;
int numAxis = 0; int numAxis = 0;
for (edict = active_edicts.next; edict != &active_edicts; edict = edict->next) { for (edict = active_edicts.next; edict != &active_edicts; edict = edict->next) {
Actor* actor; Actor *actor;
if (edict->entity->IsSubclassOfActor()) { if (edict->entity->IsSubclassOfActor()) {
actor = static_cast<Actor*>(edict->entity); actor = static_cast<Actor *>(edict->entity);
if (actor->health) { if (actor->health > 0) {
continue; if (actor->m_Team == TEAM_AMERICAN) {
} numAllies++;
if (actor->m_bDoAI) {
if (actor->m_Team == TEAM_AMERICAN) { numActiveAllies++;
numAllies++; }
if (actor->m_bDoAI) { } else {
numActiveAllies++; numAxis++;
} if (actor->m_bDoAI) {
} else { numActiveAxis++;
numAxis++; }
if (actor->m_bDoAI) {
numActiveAxis++;
} }
} }
} }
} }
gi.locationprintf(&g_entities[0], 94, 28, va("NPCS: Allies %d(%d) Axis %d(%d)", numActiveAllies, numAllies, numActiveAxis, numAxis)); gi.locationprintf(
&g_entities[0],
94,
28,
va("NPCS: Allies %d(%d) Axis %d(%d)", numActiveAllies, numAllies, numActiveAxis, numAxis)
);
g_shownpc->integer = 60; g_shownpc->integer = 60;
} }
} }
@ -737,7 +741,8 @@ void G_ClientDrawBoundingBoxes(void)
G_ClientDrawTags G_ClientDrawTags
================= =================
*/ */
void G_ClientDrawTags(void) { void G_ClientDrawTags(void)
{
// FIXME: unimplemented // FIXME: unimplemented
} }
@ -1336,7 +1341,7 @@ qboolean G_ArchiveLevel(const char *filename, qboolean autosave, qboolean loadin
arc.ArchiveObject(world); arc.ArchiveObject(world);
for (i = 0; i < globals.num_entities; i++) { for (i = 0; i < globals.num_entities; i++) {
edict = &g_entities[i]; edict = &g_entities[i];
if (edict->inuse && edict->entity && !(edict->entity->flags & FL_DONTSAVE)) { if (edict->inuse && edict->entity && !(edict->entity->flags & FL_DONTSAVE)) {
arc.ArchiveObject(edict->entity); arc.ArchiveObject(edict->entity);
} }
@ -1709,12 +1714,11 @@ void G_ExitLevel(void)
// Stay on the same map since no nextmap was set // Stay on the same map since no nextmap was set
Com_sprintf(command, sizeof(command), "restart\n"); Com_sprintf(command, sizeof(command), "restart\n");
gi.SendConsoleCommand(command); gi.SendConsoleCommand(command);
} } else if (level.nextmap == level.mapname) {
else if (level.nextmap == level.mapname) {
// Stay on the same map if it's the same as the current map // Stay on the same map if it's the same as the current map
Com_sprintf(command, sizeof(command), "restart\n"); Com_sprintf(command, sizeof(command), "restart\n");
gi.SendConsoleCommand(command); gi.SendConsoleCommand(command);
} else if (!Q_stricmpn(level.nextmap, "vstr", 4) ) { } else if (!Q_stricmpn(level.nextmap, "vstr", 4)) {
// alias on another map // alias on another map
strcpy(command, level.nextmap); strcpy(command, level.nextmap);
gi.SendConsoleCommand(command); gi.SendConsoleCommand(command);