WIP first pass event logging

Author: ensiform

code/game/CMakeLists.txt

@@ -59,6 +59,8 @@ add_library(qagame MODULE
 	"g_q3f_controllable.c"
 	"g_q3f_crc.c"
 	"g_q3f_engineer.c"
+	"g_q3f_eventlog.c"
+	"g_q3f_eventlog.h"
 	"g_q3f_flag.c"
 	"g_q3f_flag.h"
 	"g_q3f_grenades.c"

code/game/g_client.c

@@ -37,6 +37,7 @@ If you have questions concerning this license or the applicable additional terms
 #include "g_q3f_admin.h"
 #include "g_q3f_team.h"
 #include "g_q3f_flag.h"
+#include "g_q3f_eventlog.h"
 
 #include "g_bot_interface.h"
 #ifdef BUILD_LUA
@@ -1574,6 +1575,7 @@ qboolean ClientSpawn(gentity_t *ent) {
 	int					flags, savedPing, i;
 	g_q3f_playerclass_t	*cls;
 	qboolean			beginclass = qfalse;
+	int					oldclass = Q3F_CLASS_NULL;
 	g_q3f_location_t	*deathloc, *gren1loc, *gren2loc;
 	int					eventSequence;
 	char				userinfo[MAX_INFO_STRING];
@@ -1587,6 +1589,7 @@ qboolean ClientSpawn(gentity_t *ent) {
 	// Golliwog: If class has changed, perform class term/init functions
 	if( client->ps.persistant[PERS_CURRCLASS] != client->sess.sessionClass )
 	{
+		oldclass = client->ps.persistant[PERS_CURRCLASS];
 		// RR2DO2: check for classlimits
 		if( g_q3f_teamlist[ent->client->sess.sessionTeam].classmaximums[client->sess.sessionClass] == -1 ||
 			g_q3f_teamlist[ent->client->sess.sessionTeam].classmaximums[client->sess.sessionClass] > G_Q3F_ClassCount(ent->client->sess.sessionTeam, client->sess.sessionClass) ||
@@ -1783,6 +1786,15 @@ qboolean ClientSpawn(gentity_t *ent) {
 	G_LuaHook_ClientSpawn(ent - g_entities);
 #endif
 
+	if (!Q3F_IsSpectator(client)) {
+		G_EventLog_PlayerStart(ent);
+		if (beginclass) {
+			int timeplayed = client->pers.class_time > 0 ? level.time - client->pers.class_time : 0;
+			G_EventLog_ChangeClass(ent, oldclass, client->ps.persistant[PERS_CURRCLASS], timeplayed);
+			client->pers.class_time = level.time;
+		}
+	}
+
 	// run a client frame to drop exactly to the floor,
 	// initialize animations and other things
 	client->ps.commandTime = level.time - 100;

code/game/g_cmds.c

@@ -41,6 +41,7 @@ If you have questions concerning this license or the applicable additional terms
 #include "g_q3f_admin.h"
 #include "bg_q3f_util.h"
 #include "g_q3f_mapselect.h"
+#include "g_q3f_eventlog.h"
 
 #include "g_bot_interface.h"
 #ifdef BUILD_LUA
@@ -610,6 +611,7 @@ void Cmd_Kill_f( gentity_t *ent ) {
 			AddScore(ent->client->diseaseEnt, ent->client->diseaseEnt->r.currentOrigin, G_Q3F_IsAllied( ent->client->diseaseEnt, ent ) ? -1 : 1 );
 	}
 	// RR2DO2
+	G_EventLog_Death(ent, ent, ent, MOD_SUICIDE);
 	player_die (ent, ent, ent, 100000, MOD_SUICIDE);
 
 	// no suicide delay in warmup
@@ -774,6 +776,7 @@ qboolean SetTeam( gentity_t *ent, const char *s ) {
 		// Kill him (makes sure he loses flags, etc)
 		ent->flags &= ~FL_GODMODE;
 		ent->client->ps.stats[STAT_HEALTH] = ent->health = 0;
+		G_EventLog_Death(ent, ent, ent, MOD_SWITCHTEAM);
 		player_die (ent, ent, ent, 100000, MOD_SWITCHTEAM);
 
 		/* Ensiform - Adding this because 'keepondeath' items should not still be carried across team changes */

code/game/g_combat.c

@@ -40,6 +40,7 @@ If you have questions concerning this license or the applicable additional terms
 #include "g_q3f_weapon.h"
 #include "g_q3f_team.h"
 #include "g_q3f_admin.h"
+#include "g_q3f_eventlog.h"
 
 #define __STDC_FORMAT_MACROS // older compilers need this
 #include <inttypes.h>
@@ -1034,13 +1035,16 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
 
 	// do the damage
 	if (take) {
+		if ( (attacker->s.eType == ET_PLAYER || targ->s.eType == ET_PLAYER) && (take + asave > 0) )
+			G_EventLog_Damage(attacker, targ, inflictor, mod, take > (int)targ->health ? (int)targ->health : Q_ftol(take + asave));
 		targ->health = (int) targ->health - take;
 
 		if ( targ->client ) {
 			targ->client->ps.stats[STAT_HEALTH] = targ->health;
 		}
 
 		if ( targ->health <= 0 ) {
+			G_EventLog_Death(attacker, targ, inflictor, mod);
 			if ( targ->client )
 				targ->flags |= FL_NO_KNOCKBACK;
 

code/game/g_local.h

@@ -361,6 +361,8 @@ typedef struct {
 	qboolean	initializing;		// Golliwog: true if the client is initializing.
 	int			gender;
 	qboolean	isReady;			// RR2DO2: for ready-startup
+	int			class_time;
+	int			goal_time;
 
 //unlagged - these correspond with variables in the userinfo string
 	int			unlagged;

code/game/g_main.c

@@ -39,6 +39,7 @@ If you have questions concerning this license or the applicable additional terms
 #include "g_q3f_flag.h"
 #include "g_q3f_admin.h"
 #include "g_q3f_mapselect.h"
+#include "g_q3f_eventlog.h"
 
 #include "g_bot_interface.h"
 
@@ -861,6 +862,8 @@ void G_InitGame( int levelTime, int randomSeed, int restart ) {
 	G_DebugLog( "Started map.\n" );
 #endif
 
+	G_EventLog_Init();
+
 #ifdef BUILD_LUA
 	G_LuaHook_InitGame( levelTime, randomSeed, restart );
 #endif // BUILD_LUA
@@ -893,8 +896,11 @@ void G_ShutdownGame( int restart )
 		G_LogPrintf("ShutdownGame:\n" );
 		G_LogPrintf("------------------------------------------------------------\n" );
 		trap_FS_FCloseFile( level.logFile );
+		level.logFile = NULL_FILE;
 	}
 
+	G_EventLog_Shutdown();
+
 	if (!restart) 
 	{
 		G_SetMatchState( MATCH_STATE_NORMAL );