mirror of
https://github.com/fabiangreffrath/woof.git
synced 2025-09-23 03:52:12 -04:00
replace the useless -statcopy parameter with -statdump from Chocolate Doom
Fixes #36
This commit is contained in:
Fabian Greffrath
parent
51b138b026
commit
6039293aca
@ -73,6 +73,7 @@ winmbf_SOURCES = \
|
||||
r_things.c r_things.h \
|
||||
s_sound.c s_sound.h \
|
||||
sounds.c sounds.h \
|
||||
statdump.c statdump.h \
|
||||
st_lib.c st_lib.h \
|
||||
st_stuff.c st_stuff.h \
|
||||
tables.c tables.h \
|
||||
|
||||
@ -66,6 +66,7 @@
|
||||
#include "d_main.h"
|
||||
#include "d_iwad.h" // [FG] BuildIWADDirList()
|
||||
#include "d_deh.h" // Ty 04/08/98 - Externalizations
|
||||
#include "statdump.h" // [FG] StatDump()
|
||||
|
||||
// DEHacked support - Ty 03/09/97
|
||||
// killough 10/98:
|
||||
@ -1728,15 +1729,9 @@ void D_DoomMain(void)
|
||||
idmusnum = -1; //jff 3/17/98 insure idmus number is blank
|
||||
|
||||
// check for a driver that wants intermission stats
|
||||
if ((p = M_CheckParm ("-statcopy")) && p<myargc-1)
|
||||
if ((p = M_CheckParm ("-statdump")) && p<myargc-1)
|
||||
{
|
||||
// for statistics driver
|
||||
extern void* statcopy;
|
||||
|
||||
// killough 5/2/98: this takes a memory
|
||||
// address as an integer on the command line!
|
||||
|
||||
statcopy = (void*)(intptr_t) atoi(myargv[p+1]);
|
||||
atexit(StatDump);
|
||||
puts("External statistics registered.");
|
||||
}
|
||||
|
||||
|
||||
@ -57,6 +57,7 @@
|
||||
#include "d_deh.h" // Ty 3/27/98 deh declarations
|
||||
#include "p_inter.h"
|
||||
#include "g_game.h"
|
||||
#include "statdump.h" // [FG] StatCopy()
|
||||
|
||||
#define SAVEGAMESIZE 0x20000
|
||||
#define SAVESTRINGSIZE 24
|
||||
@ -236,8 +237,6 @@ int defaultskill; //note 1-based
|
||||
// killough 2/8/98: make corpse queue variable in size
|
||||
int bodyqueslot, bodyquesize, default_bodyquesize; // killough 2/8/98, 10/98
|
||||
|
||||
void *statcopy; // for statistics driver
|
||||
|
||||
// Set to -1 or +1 to switch to the previous or next weapon.
|
||||
|
||||
static int next_weapon = 0;
|
||||
@ -1083,8 +1082,10 @@ static void G_DoCompleted(void)
|
||||
viewactive = false;
|
||||
automapactive = false;
|
||||
|
||||
if (statcopy)
|
||||
memcpy (statcopy, &wminfo, sizeof(wminfo));
|
||||
if (gamemode == commercial || gamemap != 8)
|
||||
{
|
||||
StatCopy(&wminfo);
|
||||
}
|
||||
|
||||
WI_Start (&wminfo);
|
||||
}
|
||||
|
||||
356
Source/statdump.c
Normal file
356
Source/statdump.c
Normal file
@ -0,0 +1,356 @@
|
||||
/*
|
||||
|
||||
Copyright(C) 2005-2014 Simon Howard
|
||||
|
||||
This program is free software; you can redistribute it 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, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
--
|
||||
|
||||
Functions for presenting the information captured from the statistics
|
||||
buffer to a file.
|
||||
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "doomdef.h"
|
||||
#include "d_player.h"
|
||||
#include "m_argv.h"
|
||||
|
||||
#include "statdump.h"
|
||||
|
||||
/* Par times for E1M1-E1M9. */
|
||||
static const int doom1_par_times[] =
|
||||
{
|
||||
30, 75, 120, 90, 165, 180, 180, 30, 165,
|
||||
};
|
||||
|
||||
/* Par times for MAP01-MAP09. */
|
||||
static const int doom2_par_times[] =
|
||||
{
|
||||
30, 90, 120, 120, 90, 150, 120, 120, 270,
|
||||
};
|
||||
|
||||
/* Player colors. */
|
||||
static const char *player_colors[] =
|
||||
{
|
||||
"Green", "Indigo", "Brown", "Red"
|
||||
};
|
||||
|
||||
// Array of end-of-level statistics that have been captured.
|
||||
|
||||
#define MAX_CAPTURES 32
|
||||
static wbstartstruct_t captured_stats[MAX_CAPTURES];
|
||||
static int num_captured_stats = 0;
|
||||
|
||||
static GameMission_t discovered_gamemission = none;
|
||||
|
||||
/* Try to work out whether this is a Doom 1 or Doom 2 game, by looking
|
||||
* at the episode and map, and the par times. This is used to decide
|
||||
* how to format the level name. Unfortunately, in some cases it is
|
||||
* impossible to determine whether this is Doom 1 or Doom 2. */
|
||||
|
||||
static void DiscoverGamemode(wbstartstruct_t *stats, int num_stats)
|
||||
{
|
||||
int partime;
|
||||
int level;
|
||||
int i;
|
||||
|
||||
if (discovered_gamemission != none)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
for (i=0; i<num_stats; ++i)
|
||||
{
|
||||
level = stats[i].last;
|
||||
|
||||
/* If episode 2, 3 or 4, this is Doom 1. */
|
||||
|
||||
if (stats[i].epsd > 0)
|
||||
{
|
||||
discovered_gamemission = doom;
|
||||
return;
|
||||
}
|
||||
|
||||
/* This is episode 1. If this is level 10 or higher,
|
||||
it must be Doom 2. */
|
||||
|
||||
if (level >= 9)
|
||||
{
|
||||
discovered_gamemission = doom2;
|
||||
return;
|
||||
}
|
||||
|
||||
/* Try to work out if this is Doom 1 or Doom 2 by looking
|
||||
at the par time. */
|
||||
|
||||
partime = stats[i].partime;
|
||||
|
||||
if (partime == doom1_par_times[level] * TICRATE
|
||||
&& partime != doom2_par_times[level] * TICRATE)
|
||||
{
|
||||
discovered_gamemission = doom;
|
||||
return;
|
||||
}
|
||||
|
||||
if (partime != doom1_par_times[level] * TICRATE
|
||||
&& partime == doom2_par_times[level] * TICRATE)
|
||||
{
|
||||
discovered_gamemission = doom2;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Returns the number of players active in the given stats buffer. */
|
||||
|
||||
static int GetNumPlayers(wbstartstruct_t *stats)
|
||||
{
|
||||
int i;
|
||||
int num_players = 0;
|
||||
|
||||
for (i=0; i<MAXPLAYERS; ++i)
|
||||
{
|
||||
if (stats->plyr[i].in)
|
||||
{
|
||||
++num_players;
|
||||
}
|
||||
}
|
||||
|
||||
return num_players;
|
||||
}
|
||||
|
||||
static void PrintBanner(FILE *stream)
|
||||
{
|
||||
fprintf(stream, "===========================================\n");
|
||||
}
|
||||
|
||||
static void PrintPercentage(FILE *stream, int amount, int total)
|
||||
{
|
||||
if (total == 0)
|
||||
{
|
||||
fprintf(stream, "0");
|
||||
}
|
||||
else
|
||||
{
|
||||
fprintf(stream, "%i / %i", amount, total);
|
||||
|
||||
// statdump.exe is a 16-bit program, so very occasionally an
|
||||
// integer overflow can occur when doing this calculation with
|
||||
// a large value. Therefore, cast to short to give the same
|
||||
// output.
|
||||
|
||||
fprintf(stream, " (%i%%)", (short) (amount * 100) / total);
|
||||
}
|
||||
}
|
||||
|
||||
/* Display statistics for a single player. */
|
||||
|
||||
static void PrintPlayerStats(FILE *stream, wbstartstruct_t *stats,
|
||||
int player_num)
|
||||
{
|
||||
wbplayerstruct_t *player = &stats->plyr[player_num];
|
||||
|
||||
fprintf(stream, "Player %i (%s):\n", player_num + 1,
|
||||
player_colors[player_num]);
|
||||
|
||||
/* Kills percentage */
|
||||
|
||||
fprintf(stream, "\tKills: ");
|
||||
PrintPercentage(stream, player->skills, stats->maxkills);
|
||||
fprintf(stream, "\n");
|
||||
|
||||
/* Items percentage */
|
||||
|
||||
fprintf(stream, "\tItems: ");
|
||||
PrintPercentage(stream, player->sitems, stats->maxitems);
|
||||
fprintf(stream, "\n");
|
||||
|
||||
/* Secrets percentage */
|
||||
|
||||
fprintf(stream, "\tSecrets: ");
|
||||
PrintPercentage(stream, player->ssecret, stats->maxsecret);
|
||||
fprintf(stream, "\n");
|
||||
}
|
||||
|
||||
/* Frags table for multiplayer games. */
|
||||
|
||||
static void PrintFragsTable(FILE *stream, wbstartstruct_t *stats)
|
||||
{
|
||||
int x, y;
|
||||
|
||||
fprintf(stream, "Frags:\n");
|
||||
|
||||
/* Print header */
|
||||
|
||||
fprintf(stream, "\t\t");
|
||||
|
||||
for (x=0; x<MAXPLAYERS; ++x)
|
||||
{
|
||||
|
||||
if (!stats->plyr[x].in)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
fprintf(stream, "%s\t", player_colors[x]);
|
||||
}
|
||||
|
||||
fprintf(stream, "\n");
|
||||
|
||||
fprintf(stream, "\t\t-------------------------------- VICTIMS\n");
|
||||
|
||||
/* Print table */
|
||||
|
||||
for (y=0; y<MAXPLAYERS; ++y)
|
||||
{
|
||||
if (!stats->plyr[y].in)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
fprintf(stream, "\t%s\t|", player_colors[y]);
|
||||
|
||||
for (x=0; x<MAXPLAYERS; ++x)
|
||||
{
|
||||
if (!stats->plyr[x].in)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
fprintf(stream, "%i\t", stats->plyr[y].frags[x]);
|
||||
}
|
||||
|
||||
fprintf(stream, "\n");
|
||||
}
|
||||
|
||||
fprintf(stream, "\t\t|\n");
|
||||
fprintf(stream, "\t KILLERS\n");
|
||||
}
|
||||
|
||||
/* Displays the level name: MAPxy or ExMy, depending on game mode. */
|
||||
|
||||
static void PrintLevelName(FILE *stream, int episode, int level)
|
||||
{
|
||||
PrintBanner(stream);
|
||||
|
||||
switch (discovered_gamemission)
|
||||
{
|
||||
|
||||
case doom:
|
||||
fprintf(stream, "E%iM%i\n", episode + 1, level + 1);
|
||||
break;
|
||||
case doom2:
|
||||
fprintf(stream, "MAP%02i\n", level + 1);
|
||||
break;
|
||||
default:
|
||||
case none:
|
||||
fprintf(stream, "E%iM%i / MAP%02i\n",
|
||||
episode + 1, level + 1, level + 1);
|
||||
break;
|
||||
}
|
||||
|
||||
PrintBanner(stream);
|
||||
}
|
||||
|
||||
/* Print details of a statistics buffer to the given file. */
|
||||
|
||||
static void PrintStats(FILE *stream, wbstartstruct_t *stats)
|
||||
{
|
||||
short leveltime, partime;
|
||||
int i;
|
||||
|
||||
PrintLevelName(stream, stats->epsd, stats->last);
|
||||
fprintf(stream, "\n");
|
||||
|
||||
leveltime = stats->plyr[0].stime / TICRATE;
|
||||
partime = stats->partime / TICRATE;
|
||||
fprintf(stream, "Time: %i:%02i", leveltime / 60, leveltime % 60);
|
||||
fprintf(stream, " (par: %i:%02i)\n", partime / 60, partime % 60);
|
||||
fprintf(stream, "\n");
|
||||
|
||||
for (i=0; i<MAXPLAYERS; ++i)
|
||||
{
|
||||
if (stats->plyr[i].in)
|
||||
{
|
||||
PrintPlayerStats(stream, stats, i);
|
||||
}
|
||||
}
|
||||
|
||||
if (GetNumPlayers(stats) >= 2)
|
||||
{
|
||||
PrintFragsTable(stream, stats);
|
||||
}
|
||||
|
||||
fprintf(stream, "\n");
|
||||
}
|
||||
|
||||
void StatCopy(wbstartstruct_t *stats)
|
||||
{
|
||||
if (M_CheckParm("-statdump") && num_captured_stats < MAX_CAPTURES)
|
||||
{
|
||||
memcpy(&captured_stats[num_captured_stats], stats,
|
||||
sizeof(wbstartstruct_t));
|
||||
++num_captured_stats;
|
||||
}
|
||||
}
|
||||
|
||||
void StatDump(void)
|
||||
{
|
||||
FILE *dumpfile;
|
||||
int i;
|
||||
|
||||
//!
|
||||
// @category compat
|
||||
// @arg <filename>
|
||||
//
|
||||
// Dump statistics information to the specified file on the levels
|
||||
// that were played. The output from this option matches the output
|
||||
// from statdump.exe (see ctrlapi.zip in the /idgames archive).
|
||||
//
|
||||
|
||||
i = M_CheckParm("-statdump");
|
||||
|
||||
if (i > 0 && i < myargc-1)
|
||||
{
|
||||
printf("Statistics captured for %i level(s)\n", num_captured_stats);
|
||||
|
||||
// We actually know what the real gamemission is, but this has
|
||||
// to match the output from statdump.exe.
|
||||
|
||||
DiscoverGamemode(captured_stats, num_captured_stats);
|
||||
|
||||
// Allow "-" as output file, for stdout.
|
||||
|
||||
if (strcmp(myargv[i + 1], "-") != 0)
|
||||
{
|
||||
dumpfile = fopen(myargv[i + 1], "w");
|
||||
}
|
||||
else
|
||||
{
|
||||
dumpfile = NULL;
|
||||
}
|
||||
|
||||
for (i = 0; i < num_captured_stats; ++i)
|
||||
{
|
||||
PrintStats(dumpfile, &captured_stats[i]);
|
||||
}
|
||||
|
||||
if (dumpfile != NULL)
|
||||
{
|
||||
fclose(dumpfile);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
23
Source/statdump.h
Normal file
23
Source/statdump.h
Normal file
@ -0,0 +1,23 @@
|
||||
/*
|
||||
|
||||
Copyright(C) 2005-2014 Simon Howard
|
||||
|
||||
This program is free software; you can redistribute it 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, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
*/
|
||||
|
||||
#ifndef DOOM_STATDUMP_H
|
||||
#define DOOM_STATDUMP_H
|
||||
|
||||
void StatCopy(wbstartstruct_t *stats);
|
||||
void StatDump(void);
|
||||
|
||||
#endif /* #ifndef DOOM_STATDUMP_H */
|
||||
Loading…
x
Reference in New Issue
Block a user