iikorni/quakespasm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Overhaul to console structure, a bit

Browse Source
This commit is contained in:
iikorni
2026-08-30 00:50:23 -05:00
parent de75b014b3
commit 216dd1aecd
70 changed files with 2081 additions and 2260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Quake/pr_edict.cpp
+23 -23
View File
@@ -487,11 +487,11 @@ void ED_Print (edict_t *ed)
if (ed->free)
{
Con_Printf ("FREE\n");
console::info ("FREE\n");
return;
}
Con_SafePrintf("\nEDICT %i:\n", NUM_FOR_EDICT(ed)); //johnfitz -- was Con_Printf
console::safe_print("\nEDICT %i:\n", NUM_FOR_EDICT(ed)); //johnfitz -- was console::info
for (i = 1; i < progs->numfielddefs; i++)
{
d = &pr_fielddefs[i];
@@ -516,11 +516,11 @@ void ED_Print (edict_t *ed)
if (j == type_size[type])
continue;
Con_SafePrintf ("%s", name); //johnfitz -- was Con_Printf
console::safe_print ("%s", name); //johnfitz -- was console::info
while (l++ < 15)
Con_SafePrintf (" "); //johnfitz -- was Con_Printf
console::safe_print (" "); //johnfitz -- was console::info
Con_SafePrintf ("%s\n", PR_ValueString(d->type, (eval_t *)v)); //johnfitz -- was Con_Printf
console::safe_print ("%s\n", PR_ValueString(d->type, (eval_t *)v)); //johnfitz -- was console::info
}
}
@@ -602,7 +602,7 @@ void ED_PrintEdicts (void)
if (!sv.active)
return;
Con_Printf ("%i entities\n", sv.num_edicts);
console::info ("%i entities\n", sv.num_edicts);
for (i = 0; i < sv.num_edicts; i++)
ED_PrintNum (i);
}
@@ -624,7 +624,7 @@ static void ED_PrintEdict_f (void)
i = std::atoi (command::argv(1).value_or("").c_str());
if (i < 0 || i >= sv.num_edicts)
{
Con_Printf("Bad edict number\n");
console::info("Bad edict number\n");
return;
}
ED_PrintNum (i);
@@ -660,11 +660,11 @@ static void ED_Count (void)
step++;
}
Con_Printf ("num_edicts:%3i\n", sv.num_edicts);
Con_Printf ("active :%3i\n", active);
Con_Printf ("view :%3i\n", models);
Con_Printf ("touch :%3i\n", solid);
Con_Printf ("step :%3i\n", step);
console::info ("num_edicts:%3i\n", sv.num_edicts);
console::info ("active :%3i\n", active);
console::info ("view :%3i\n", models);
console::info ("touch :%3i\n", solid);
console::info ("step :%3i\n", step);
}
@@ -743,7 +743,7 @@ void ED_ParseGlobals (std::istringstream &ss)
key = ED_FindGlobal (keyname.c_str());
if (!key)
{
Con_Printf ("'%s' is not a global\n", keyname.c_str());
console::info ("'%s' is not a global\n", keyname.c_str());
continue;
}
@@ -836,7 +836,7 @@ static bool ED_ParseEpair (void *base, ddef_t *key, const char *s)
// before reading 3 floats.
if (i < 3)
{
Con_DWarning ("Avoided reading garbage for \"%s\" \"%s\"\n", PR_GetString(key->s_name), s);
console::dev_warn ("Avoided reading garbage for \"%s\" \"%s\"\n", PR_GetString(key->s_name), s);
for (; i < 3; i++)
((float *)d)[i] = 0.0f;
}
@@ -852,7 +852,7 @@ static bool ED_ParseEpair (void *base, ddef_t *key, const char *s)
{
//johnfitz -- HACK -- suppress error becuase fog/sky fields might not be mentioned in defs.qc
if (strncmp(s, "sky", 3) && strcmp(s, "fog"))
Con_DPrintf ("Can't find field %s\n", s);
console::debug ("Can't find field %s\n", s);
return false;
}
*(int *)d = G_INT(def->ofs);
@@ -862,7 +862,7 @@ static bool ED_ParseEpair (void *base, ddef_t *key, const char *s)
func = ED_FindFunction (s);
if (!func)
{
Con_Printf ("Can't find function %s\n", s);
console::info ("Can't find function %s\n", s);
return false;
}
*(func_t *)d = func - pr_functions;
@@ -962,7 +962,7 @@ void ED_ParseEdict(std::istringstream &ss, edict_t *ent)
{
//johnfitz -- HACK -- suppress error becuase fog/sky/alpha fields might not be mentioned in defs.qc
if (keyname != "sky" && keyname != "fog" && keyname != "alpha")
Con_DPrintf ("\"%s\" is not a field\n", keyname.c_str()); //johnfitz -- was Con_Printf
console::debug ("\"%s\" is not a field\n", keyname.c_str()); //johnfitz -- was console::info
continue;
}
@@ -1046,7 +1046,7 @@ void ED_LoadFromFile (const char *data)
//
if (!ent->v.classname)
{
Con_SafePrintf ("No classname for:\n"); //johnfitz -- was Con_Printf
console::safe_print ("No classname for:\n"); //johnfitz -- was console::info
ED_Print (ent);
ED_Free (ent);
continue;
@@ -1057,7 +1057,7 @@ void ED_LoadFromFile (const char *data)
if (!func)
{
Con_SafePrintf ("No spawn function for:\n"); //johnfitz -- was Con_Printf
console::safe_print ("No spawn function for:\n"); //johnfitz -- was console::info
ED_Print (ent);
ED_Free (ent);
continue;
@@ -1069,7 +1069,7 @@ void ED_LoadFromFile (const char *data)
PR_ExecuteProgram (func - pr_functions);
}
Con_DPrintf ("%i entities inhibited\n", inhibit);
console::debug ("%i entities inhibited\n", inhibit);
}
@@ -1178,7 +1178,7 @@ void PR_LoadProgs (void)
progs = (dprograms_t *)COM_LoadHunkFile ("progs.dat", NULL);
if (!progs)
Host_Error ("PR_LoadProgs: couldn't load progs.dat");
Con_DPrintf ("Programs occupy %iK.\n", com_filesize/1024);
console::debug ("Programs occupy %iK.\n", com_filesize/1024);
for (i = 0; i < com_filesize; i++)
CRC_ProcessByte (&pr_crc, ((byte *)progs)[i]);
@@ -1322,7 +1322,7 @@ int NUM_FOR_EDICT(edict_t *e)
static void PR_AllocStringSlots (void)
{
pr_maxknownstrings += PR_STRING_ALLOCSLOTS;
Con_DPrintf2("PR_AllocStringSlots: realloc'ing for %d slots\n", pr_maxknownstrings);
console::trace("PR_AllocStringSlots: realloc'ing for %d slots\n", pr_maxknownstrings);
pr_knownstrings = (const char **) Z_Realloc ((void *)pr_knownstrings, pr_maxknownstrings * sizeof(char *));
}
@@ -1365,7 +1365,7 @@ int PR_SetEngineString (const char *s)
return -1 - i;
}
// new unknown engine string
//Con_DPrintf ("PR_SetEngineString: new engine string %p\n", s);
//console::debug ("PR_SetEngineString: new engine string %p\n", s);
#if 0
for (i = 0; i < pr_numknownstrings; i++)
{