AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-22 11:22:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix pickup messages in multiplayer (#1098)

Browse Source 
* add `togglemsg()`, macronize and simplify `doomprintf()`

* fix whitespace

* rename playermsg->doomprintf, doomprintf->displaymsg
This commit is contained in:
Roman Fomin 2023-06-11 17:51:44 +07:00 committed by GitHub
parent b347ca9aba
commit 9b26d8d805
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 168 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/am_map.c
View File

@ -867,28 +867,28 @@ boolean AM_Responder
followplayer = !followplayer; followplayer = !followplayer;
memset(buttons_state, 0, sizeof(buttons_state)); memset(buttons_state, 0, sizeof(buttons_state));
// Ty 03/27/98 - externalized // Ty 03/27/98 - externalized
doomprintf(MESSAGES_NONE, "%s", followplayer ? s_AMSTR_FOLLOWON : s_AMSTR_FOLLOWOFF); displaymsg("%s", followplayer ? s_AMSTR_FOLLOWON : s_AMSTR_FOLLOWOFF);
} }
else if (M_InputActivated(input_map_grid)) else if (M_InputActivated(input_map_grid))
{ {
automap_grid = !automap_grid; // killough 2/28/98 automap_grid = !automap_grid; // killough 2/28/98
// Ty 03/27/98 - *not* externalized // Ty 03/27/98 - *not* externalized
doomprintf(MESSAGES_NONE, "%s", automap_grid ? s_AMSTR_GRIDON : s_AMSTR_GRIDOFF); displaymsg("%s", automap_grid ? s_AMSTR_GRIDON : s_AMSTR_GRIDOFF);
} }
else if (M_InputActivated(input_map_mark)) else if (M_InputActivated(input_map_mark))
{ {
// Ty 03/27/98 - *not* externalized // Ty 03/27/98 - *not* externalized
doomprintf(MESSAGES_NONE, "%s %d", s_AMSTR_MARKEDSPOT, markpointnum); displaymsg("%s %d", s_AMSTR_MARKEDSPOT, markpointnum);
AM_addMark(); AM_addMark();
} }
else if (M_InputActivated(input_map_clear)) else if (M_InputActivated(input_map_clear))
{ {
// [Alaux] Clear just the last mark // [Alaux] Clear just the last mark
if (!markpointnum) if (!markpointnum)
doomprintf(MESSAGES_NONE, "%s", s_AMSTR_MARKSCLEARED); displaymsg("%s", s_AMSTR_MARKSCLEARED);
else { else {
AM_clearLastMark(); AM_clearLastMark();
doomprintf(MESSAGES_NONE, "Cleared spot %d", markpointnum); displaymsg("Cleared spot %d", markpointnum);
} }
} }
else else
@ -899,9 +899,9 @@ boolean AM_Responder
switch (automapoverlay) switch (automapoverlay)
{ {
case 2: doomprintf(MESSAGES_NONE, "Dark Overlay On"); break; case 2: displaymsg("Dark Overlay On"); break;
case 1: doomprintf(MESSAGES_NONE, "%s", s_AMSTR_OVERLAYON); break; case 1: displaymsg("%s", s_AMSTR_OVERLAYON); break;
default: doomprintf(MESSAGES_NONE, "%s", s_AMSTR_OVERLAYOFF); break; default: displaymsg("%s", s_AMSTR_OVERLAYOFF); break;
} }
if (automapoverlay && scaledviewheight == SCREENHEIGHT) if (automapoverlay && scaledviewheight == SCREENHEIGHT)
@ -915,9 +915,9 @@ boolean AM_Responder
{ {
automaprotate = !automaprotate; automaprotate = !automaprotate;
if (automaprotate) if (automaprotate)
doomprintf(MESSAGES_NONE, "%s", s_AMSTR_ROTATEON); displaymsg("%s", s_AMSTR_ROTATEON);
else else
doomprintf(MESSAGES_NONE, "%s", s_AMSTR_ROTATEOFF); displaymsg("%s", s_AMSTR_ROTATEOFF);
} }
else else
{ {

2
src/d_net.c
View File

@ -55,7 +55,7 @@ static void PlayerQuitGame(player_t *player)
exitmsg[7] += player_num; exitmsg[7] += player_num;
playeringame[player_num] = false; playeringame[player_num] = false;
doomprintf(MESSAGES_NONE, "%s", exitmsg); displaymsg("%s", exitmsg);
// [crispy] don't interpolate players who left the game // [crispy] don't interpolate players who left the game
player->mo->interp = false; player->mo->interp = false;

14
src/doomstat.h
View File

@ -442,6 +442,20 @@ extern int center_weapon;
extern int cosmetic_bobbing; extern int cosmetic_bobbing;
// Doom-style printf
typedef enum {
MESSAGES_NONE,
MESSAGES_TOGGLE,
MESSAGES_PICKUP,
} msg_category_t;
void doomprintf(player_t *player, msg_category_t category,
const char *, ...) PRINTF_ATTR(3, 4);
#define displaymsg(...) doomprintf(NULL, MESSAGES_NONE, __VA_ARGS__)
#define pickupmsg(player, ...) doomprintf(player, MESSAGES_PICKUP, __VA_ARGS__)
#define togglemsg(...) doomprintf(NULL, MESSAGES_TOGGLE, __VA_ARGS__)
#endif #endif
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

25
src/g_game.c
View File

@ -1092,7 +1092,7 @@ static void G_JoinDemo(void)
// clear progress demo bar // clear progress demo bar
ST_Start(); ST_Start();
doomprintf(MESSAGES_NONE, "Demo recording: %s", demoname); displaymsg("Demo recording: %s", demoname);
} }
static void G_ReadDemoTiccmd(ticcmd_t *cmd) static void G_ReadDemoTiccmd(ticcmd_t *cmd)
@ -1124,7 +1124,7 @@ static void G_ReadDemoTiccmd(ticcmd_t *cmd)
cmd->buttons & BTS_SAVEGAME) cmd->buttons & BTS_SAVEGAME)
{ {
cmd->buttons &= ~BT_SPECIALMASK; cmd->buttons &= ~BT_SPECIALMASK;
doomprintf(MESSAGES_NONE, "Game Saved (Suppressed)"); displaymsg("Game Saved (Suppressed)");
} }
} }
} }
@ -2006,9 +2006,9 @@ static void G_DoSaveGame(void)
length = save_p - savebuffer; length = save_p - savebuffer;
if (!M_WriteFile(name, savebuffer, length)) if (!M_WriteFile(name, savebuffer, length))
doomprintf(MESSAGES_NONE, "%s", errno ? strerror(errno) : "Could not save game: Error unknown"); displaymsg("%s", errno ? strerror(errno) : "Could not save game: Error unknown");
else else
doomprintf(MESSAGES_NONE, "%s", s_GGSAVED); // Ty 03/27/98 - externalized displaymsg("%s", s_GGSAVED); // Ty 03/27/98 - externalized
Z_Free(savebuffer); // killough Z_Free(savebuffer); // killough
savebuffer = save_p = NULL; savebuffer = save_p = NULL;
@ -2364,7 +2364,7 @@ void G_Ticker(void)
!(gametic&31) && ((gametic>>5)&3) == i ) !(gametic&31) && ((gametic>>5)&3) == i )
{ {
extern char **player_names[]; extern char **player_names[];
doomprintf(MESSAGES_NONE, "%s is turbo!", *player_names[i]); // killough 9/29/98 displaymsg("%s is turbo!", *player_names[i]); // killough 9/29/98
} }
if (netgame && !netdemo && !(gametic%ticdup) ) if (netgame && !netdemo && !(gametic%ticdup) )
@ -3793,7 +3793,7 @@ void G_BeginRecording(void)
*demo_p++ = playeringame[i]; *demo_p++ = playeringame[i];
} }
doomprintf(MESSAGES_NONE, "Demo Recording: %s", M_BaseName(demoname)); displaymsg("Demo Recording: %s", M_BaseName(demoname));
} }
// //
@ -3993,7 +3993,7 @@ boolean G_CheckDemoStatus(void)
cmd->buttons |= BT_JOIN; cmd->buttons |= BT_JOIN;
} }
doomprintf(MESSAGES_NONE, "Demo Recording: %s", M_BaseName(demoname)); displaymsg("Demo Recording: %s", M_BaseName(demoname));
return true; return true;
} }
@ -4051,11 +4051,12 @@ boolean G_CheckDemoStatus(void)
#define MAX_MESSAGE_SIZE 1024 #define MAX_MESSAGE_SIZE 1024
void doomprintf(int category, const char *s, ...) extern int show_toggle_messages, show_pickup_messages;
void doomprintf(player_t *player, msg_category_t category, const char *s, ...)
{ {
static char msg[MAX_MESSAGE_SIZE]; static char msg[MAX_MESSAGE_SIZE];
va_list v; va_list v;
extern int show_toggle_messages, show_pickup_messages;
if ((category == MESSAGES_TOGGLE && !show_toggle_messages) || if ((category == MESSAGES_TOGGLE && !show_toggle_messages) ||
(category == MESSAGES_PICKUP && !show_pickup_messages)) (category == MESSAGES_PICKUP && !show_pickup_messages))
@ -4064,7 +4065,11 @@ void doomprintf(int category, const char *s, ...)
va_start(v,s); va_start(v,s);
vsprintf(msg,s,v); // print message in buffer vsprintf(msg,s,v); // print message in buffer
va_end(v); va_end(v);
players[displayplayer].message = msg; // set new message
if (player)
player->message = msg;
else
players[displayplayer].message = msg; // set new message
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

8
src/hu_stuff.c
View File

@ -1675,7 +1675,7 @@ static int tail = 0;
void HU_queueChatChar(char c) void HU_queueChatChar(char c)
{ {
if (((head + 1) & (QUEUESIZE-1)) == tail) if (((head + 1) & (QUEUESIZE-1)) == tail)
doomprintf(MESSAGES_NONE, "%s", HUSTR_MSGU); displaymsg("%s", HUSTR_MSGU);
else else
{ {
chatchars[head++] = c; chatchars[head++] = c;
@ -1796,7 +1796,7 @@ boolean HU_Responder(event_t *ev)
if (M_InputActivated(input_chat_dest0 + i)) if (M_InputActivated(input_chat_dest0 + i))
{ {
if (i == consoleplayer) if (i == consoleplayer)
doomprintf(MESSAGES_NONE, "%s", displaymsg("%s",
++num_nobrainers < 3 ? HUSTR_TALKTOSELF1 : ++num_nobrainers < 3 ? HUSTR_TALKTOSELF1 :
num_nobrainers < 6 ? HUSTR_TALKTOSELF2 : num_nobrainers < 6 ? HUSTR_TALKTOSELF2 :
num_nobrainers < 9 ? HUSTR_TALKTOSELF3 : num_nobrainers < 9 ? HUSTR_TALKTOSELF3 :
@ -1840,7 +1840,7 @@ boolean HU_Responder(event_t *ev)
// leave chat mode and notify that it was sent // leave chat mode and notify that it was sent
chat_on = false; chat_on = false;
strcpy(lastmessage, chat_macros[c]); strcpy(lastmessage, chat_macros[c]);
doomprintf(MESSAGES_NONE, "%s", lastmessage); displaymsg("%s", lastmessage);
eatkey = true; eatkey = true;
} }
else else
@ -1857,7 +1857,7 @@ boolean HU_Responder(event_t *ev)
if (w_chat.l.len) if (w_chat.l.len)
{ {
strcpy(lastmessage, w_chat.l.l); strcpy(lastmessage, w_chat.l.l);
doomprintf(MESSAGES_NONE, "%s", lastmessage); displaymsg("%s", lastmessage);
} }
} }
else else

106
src/m_cheat.c
View File

@ -324,7 +324,7 @@ static void cheat_showfps()
static void cheat_autoaim() static void cheat_autoaim()
{ {
extern int autoaim; extern int autoaim;
doomprintf(MESSAGES_NONE, (autoaim=!autoaim) ? displaymsg((autoaim=!autoaim) ?
"Projectile autoaiming on" : "Projectile autoaiming on" :
"Projectile autoaiming off"); "Projectile autoaiming off");
} }
@ -340,7 +340,7 @@ static void cheat_mus(char *buf)
if (!isdigit(buf[0]) || !isdigit(buf[1])) if (!isdigit(buf[0]) || !isdigit(buf[1]))
return; return;
doomprintf(MESSAGES_NONE, "%s", s_STSTR_MUS); // Ty 03/27/98 - externalized displaymsg("%s", s_STSTR_MUS); // Ty 03/27/98 - externalized
// First check if we have a mapinfo entry for the requested level. // First check if we have a mapinfo entry for the requested level.
if (gamemode == commercial) if (gamemode == commercial)
@ -353,7 +353,7 @@ static void cheat_mus(char *buf)
musnum = W_CheckNumForName(entry->music); musnum = W_CheckNumForName(entry->music);
if (musnum == -1) if (musnum == -1)
doomprintf(MESSAGES_NONE, "%s", s_STSTR_NOMUS); displaymsg("%s", s_STSTR_NOMUS);
else else
{ {
S_ChangeMusInfoMusic(musnum, 1); S_ChangeMusInfoMusic(musnum, 1);
@ -368,7 +368,7 @@ static void cheat_mus(char *buf)
//jff 4/11/98 prevent IDMUS00 in DOOMII and IDMUS36 or greater //jff 4/11/98 prevent IDMUS00 in DOOMII and IDMUS36 or greater
if (musnum < mus_runnin || musnum >= NUMMUSIC) if (musnum < mus_runnin || musnum >= NUMMUSIC)
doomprintf(MESSAGES_NONE, "%s", s_STSTR_NOMUS); // Ty 03/27/98 - externalized displaymsg("%s", s_STSTR_NOMUS); // Ty 03/27/98 - externalized
else else
{ {
S_ChangeMusic(musnum, 1); S_ChangeMusic(musnum, 1);
@ -381,7 +381,7 @@ static void cheat_mus(char *buf)
//jff 4/11/98 prevent IDMUS0x IDMUSx0 in DOOMI and greater than introa //jff 4/11/98 prevent IDMUS0x IDMUSx0 in DOOMI and greater than introa
if (musnum < mus_e1m1 || musnum >= mus_runnin) if (musnum < mus_e1m1 || musnum >= mus_runnin)
doomprintf(MESSAGES_NONE, "%s", s_STSTR_NOMUS); // Ty 03/27/98 - externalized displaymsg("%s", s_STSTR_NOMUS); // Ty 03/27/98 - externalized
else else
{ {
S_ChangeMusic(musnum, 1); S_ChangeMusic(musnum, 1);
@ -395,7 +395,7 @@ static void cheat_choppers()
{ {
plyr->weaponowned[wp_chainsaw] = true; plyr->weaponowned[wp_chainsaw] = true;
plyr->powers[pw_invulnerability] = true; plyr->powers[pw_invulnerability] = true;
doomprintf(MESSAGES_NONE, "%s", s_STSTR_CHOPPERS); // Ty 03/27/98 - externalized displaymsg("%s", s_STSTR_CHOPPERS); // Ty 03/27/98 - externalized
} }
static void cheat_god() static void cheat_god()
@ -428,28 +428,28 @@ static void cheat_god()
plyr->mo->health = god_health; // Ty 03/09/98 - deh plyr->mo->health = god_health; // Ty 03/09/98 - deh
plyr->health = god_health; plyr->health = god_health;
doomprintf(MESSAGES_NONE, "%s", s_STSTR_DQDON); // Ty 03/27/98 - externalized displaymsg("%s", s_STSTR_DQDON); // Ty 03/27/98 - externalized
} }
else else
doomprintf(MESSAGES_NONE, "%s", s_STSTR_DQDOFF); // Ty 03/27/98 - externalized displaymsg("%s", s_STSTR_DQDOFF); // Ty 03/27/98 - externalized
} }
static void cheat_buddha() static void cheat_buddha()
{ {
plyr->cheats ^= CF_BUDDHA; plyr->cheats ^= CF_BUDDHA;
if (plyr->cheats & CF_BUDDHA) if (plyr->cheats & CF_BUDDHA)
doomprintf(MESSAGES_NONE, "Buddha Mode ON"); displaymsg("Buddha Mode ON");
else else
doomprintf(MESSAGES_NONE, "Buddha Mode OFF"); displaymsg("Buddha Mode OFF");
} }
static void cheat_notarget() static void cheat_notarget()
{ {
plyr->cheats ^= CF_NOTARGET; plyr->cheats ^= CF_NOTARGET;
if (plyr->cheats & CF_NOTARGET) if (plyr->cheats & CF_NOTARGET)
doomprintf(MESSAGES_NONE, "Notarget ON"); displaymsg("Notarget ON");
else else
doomprintf(MESSAGES_NONE, "Notarget OFF"); displaymsg("Notarget OFF");
} }
boolean frozen_mode; boolean frozen_mode;
@ -458,9 +458,9 @@ static void cheat_freeze()
{ {
frozen_mode = !frozen_mode; frozen_mode = !frozen_mode;
if (frozen_mode) if (frozen_mode)
doomprintf(MESSAGES_NONE, "Freeze ON"); displaymsg("Freeze ON");
else else
doomprintf(MESSAGES_NONE, "Freeze OFF"); displaymsg("Freeze OFF");
} }
static void cheat_avj() static void cheat_avj()
@ -479,7 +479,7 @@ static void cheat_health()
if (plyr->mo) if (plyr->mo)
plyr->mo->health = mega_health; plyr->mo->health = mega_health;
plyr->health = mega_health; plyr->health = mega_health;
doomprintf(MESSAGES_NONE, "%s", s_STSTR_BEHOLDX); // Ty 03/27/98 - externalized displaymsg("%s", s_STSTR_BEHOLDX); // Ty 03/27/98 - externalized
} }
} }
@ -487,13 +487,13 @@ static void cheat_megaarmour()
{ {
plyr->armorpoints = idfa_armor; // Ty 03/09/98 - deh plyr->armorpoints = idfa_armor; // Ty 03/09/98 - deh
plyr->armortype = idfa_armor_class; // Ty 03/09/98 - deh plyr->armortype = idfa_armor_class; // Ty 03/09/98 - deh
doomprintf(MESSAGES_NONE, "%s", s_STSTR_BEHOLDX); // Ty 03/27/98 - externalized displaymsg("%s", s_STSTR_BEHOLDX); // Ty 03/27/98 - externalized
} }
static void cheat_tst() static void cheat_tst()
{ // killough 10/98: same as iddqd except for message { // killough 10/98: same as iddqd except for message
cheat_god(); cheat_god();
doomprintf(MESSAGES_NONE, plyr->cheats & CF_GODMODE ? "God Mode On" : "God Mode Off"); displaymsg(plyr->cheats & CF_GODMODE ? "God Mode On" : "God Mode Off");
} }
static void cheat_fa() static void cheat_fa()
@ -520,7 +520,7 @@ static void cheat_fa()
if (i!=am_cell || gamemode!=shareware) if (i!=am_cell || gamemode!=shareware)
plyr->ammo[i] = plyr->maxammo[i]; plyr->ammo[i] = plyr->maxammo[i];
doomprintf(MESSAGES_NONE, "%s", s_STSTR_FAADDED); displaymsg("%s", s_STSTR_FAADDED);
} }
static void cheat_k() static void cheat_k()
@ -530,7 +530,7 @@ static void cheat_k()
if (!plyr->cards[i]) // only print message if at least one key added if (!plyr->cards[i]) // only print message if at least one key added
{ // however, caller may overwrite message anyway { // however, caller may overwrite message anyway
plyr->cards[i] = true; plyr->cards[i] = true;
doomprintf(MESSAGES_NONE, "Keys Added"); displaymsg("Keys Added");
} }
} }
@ -538,7 +538,7 @@ static void cheat_kfa()
{ {
cheat_k(); cheat_k();
cheat_fa(); cheat_fa();
doomprintf(MESSAGES_NONE, "%s", s_STSTR_KFAADDED); displaymsg("%s", s_STSTR_KFAADDED);
} }
static void cheat_noclip() static void cheat_noclip()
@ -546,7 +546,7 @@ static void cheat_noclip()
// Simplified, accepting both "noclip" and "idspispopd". // Simplified, accepting both "noclip" and "idspispopd".
// no clipping mode cheat // no clipping mode cheat
doomprintf(MESSAGES_NONE, "%s", (plyr->cheats ^= CF_NOCLIP) & CF_NOCLIP ? displaymsg("%s", (plyr->cheats ^= CF_NOCLIP) & CF_NOCLIP ?
s_STSTR_NCON : s_STSTR_NCOFF); // Ty 03/27/98 - externalized s_STSTR_NCON : s_STSTR_NCOFF); // Ty 03/27/98 - externalized
} }
@ -567,13 +567,13 @@ static void cheat_pw(int pw)
if (pw != pw_strength && !comp[comp_infcheat]) if (pw != pw_strength && !comp[comp_infcheat])
plyr->powers[pw] = -1; // infinite duration -- killough plyr->powers[pw] = -1; // infinite duration -- killough
} }
doomprintf(MESSAGES_NONE, "%s", s_STSTR_BEHOLDX); // Ty 03/27/98 - externalized displaymsg("%s", s_STSTR_BEHOLDX); // Ty 03/27/98 - externalized
} }
// 'behold' power-up menu // 'behold' power-up menu
static void cheat_behold() static void cheat_behold()
{ {
doomprintf(MESSAGES_NONE, "%s", s_STSTR_BEHOLD); // Ty 03/27/98 - externalized displaymsg("%s", s_STSTR_BEHOLD); // Ty 03/27/98 - externalized
} }
// 'clev' change-level cheat // 'clev' change-level cheat
@ -589,9 +589,9 @@ static void cheat_clev0()
next = MAPNAME(epsd, map); next = MAPNAME(epsd, map);
if (W_CheckNumForName(next) != -1) if (W_CheckNumForName(next) != -1)
doomprintf(MESSAGES_NONE, "Current: %s, Next: %s", cur, next); displaymsg("Current: %s, Next: %s", cur, next);
else else
doomprintf(MESSAGES_NONE, "Current: %s", cur); displaymsg("Current: %s", cur);
free(cur); free(cur);
} }
@ -641,7 +641,7 @@ static void cheat_clev(char *buf)
} }
else else
{ {
doomprintf(MESSAGES_NONE, "IDCLEV target not found: %s", next); displaymsg("IDCLEV target not found: %s", next);
return; return;
} }
} }
@ -651,7 +651,7 @@ static void cheat_clev(char *buf)
idmusnum = -1; //jff 3/17/98 revert to normal level music on IDCLEV idmusnum = -1; //jff 3/17/98 revert to normal level music on IDCLEV
doomprintf(MESSAGES_NONE, "%s", s_STSTR_CLEV); // Ty 03/27/98 - externalized displaymsg("%s", s_STSTR_CLEV); // Ty 03/27/98 - externalized
G_DeferedInitNew(gameskill, epsd, map); G_DeferedInitNew(gameskill, epsd, map);
} }
@ -667,7 +667,7 @@ static void cheat_mypos()
void cheat_mypos_print() void cheat_mypos_print()
{ {
doomprintf(MESSAGES_NONE, "X=%.10f Y=%.10f A=%-.0f", displaymsg("X=%.10f Y=%.10f A=%-.0f",
(double)players[consoleplayer].mo->x / FRACUNIT, (double)players[consoleplayer].mo->x / FRACUNIT,
(double)players[consoleplayer].mo->y / FRACUNIT, (double)players[consoleplayer].mo->y / FRACUNIT,
players[consoleplayer].mo->angle * (90.0/ANG90)); players[consoleplayer].mo->angle * (90.0/ANG90));
@ -677,7 +677,7 @@ void cheat_mypos_print()
static void cheat_comp0() static void cheat_comp0()
{ {
doomprintf(MESSAGES_NONE, "Complevel: %s", G_GetCurrentComplevelName()); displaymsg("Complevel: %s", G_GetCurrentComplevelName());
} }
static void cheat_comp(char *buf) static void cheat_comp(char *buf)
@ -695,14 +695,14 @@ static void cheat_comp(char *buf)
{ {
demo_version = new_demover; demo_version = new_demover;
G_ReloadDefaults(true); G_ReloadDefaults(true);
doomprintf(MESSAGES_NONE, "New Complevel: %s", G_GetCurrentComplevelName()); displaymsg("New Complevel: %s", G_GetCurrentComplevelName());
} }
} }
// variable friction cheat // variable friction cheat
static void cheat_friction() static void cheat_friction()
{ {
doomprintf(MESSAGES_NONE, // Ty 03/27/98 - *not* externalized displaymsg( // Ty 03/27/98 - *not* externalized
(variable_friction = !variable_friction) ? "Variable Friction enabled" : (variable_friction = !variable_friction) ? "Variable Friction enabled" :
"Variable Friction disabled"); "Variable Friction disabled");
} }
@ -711,7 +711,7 @@ extern const char *default_skill_strings[];
static void cheat_skill0() static void cheat_skill0()
{ {
doomprintf(MESSAGES_NONE, "Skill: %s", default_skill_strings[gameskill + 1]); displaymsg("Skill: %s", default_skill_strings[gameskill + 1]);
} }
static void cheat_skill(char *buf) static void cheat_skill(char *buf)
@ -721,7 +721,7 @@ static void cheat_skill(char *buf)
if (skill >= 1 && skill <= 5) if (skill >= 1 && skill <= 5)
{ {
gameskill = skill - 1; gameskill = skill - 1;
doomprintf(MESSAGES_NONE, "Next Level Skill: %s", default_skill_strings[gameskill + 1]); displaymsg("Next Level Skill: %s", default_skill_strings[gameskill + 1]);
G_SetFastParms(fastparm || gameskill == sk_nightmare); G_SetFastParms(fastparm || gameskill == sk_nightmare);
respawnmonsters = gameskill == sk_nightmare || respawnparm; respawnmonsters = gameskill == sk_nightmare || respawnparm;
@ -732,14 +732,14 @@ static void cheat_skill(char *buf)
// phares 3/10/98 // phares 3/10/98
static void cheat_pushers() static void cheat_pushers()
{ {
doomprintf(MESSAGES_NONE, // Ty 03/27/98 - *not* externalized displaymsg( // Ty 03/27/98 - *not* externalized
(allow_pushers = !allow_pushers) ? "Pushers enabled" : "Pushers disabled"); (allow_pushers = !allow_pushers) ? "Pushers enabled" : "Pushers disabled");
} }
// translucency cheat // translucency cheat
static void cheat_tran() static void cheat_tran()
{ {
doomprintf(MESSAGES_NONE, // Ty 03/27/98 - *not* externalized displaymsg( // Ty 03/27/98 - *not* externalized
(translucency = !translucency) ? "Translucency enabled" : "Translucency disabled"); (translucency = !translucency) ? "Translucency enabled" : "Translucency disabled");
D_SetPredefinedTranslucency(); D_SetPredefinedTranslucency();
} }
@ -780,7 +780,7 @@ static void cheat_massacre() // jff 2/01/98 kill all monsters
P_MapEnd(); P_MapEnd();
// killough 3/22/98: make more intelligent about plural // killough 3/22/98: make more intelligent about plural
// Ty 03/27/98 - string(s) *not* externalized // Ty 03/27/98 - string(s) *not* externalized
doomprintf(MESSAGES_NONE, "%d Monster%s Killed", killcount, killcount==1 ? "" : "s"); displaymsg("%d Monster%s Killed", killcount, killcount==1 ? "" : "s");
} }
static void cheat_spechits() static void cheat_spechits()
@ -926,7 +926,7 @@ static void cheat_spechits()
speciallines += EV_DoDoor(&dummy, doorOpen); speciallines += EV_DoDoor(&dummy, doorOpen);
} }
doomprintf(MESSAGES_NONE, "%d Special Action%s Triggered", speciallines, speciallines == 1 ? "" : "s"); displaymsg("%d Special Action%s Triggered", speciallines, speciallines == 1 ? "" : "s");
} }
// killough 2/7/98: move iddt cheat from am_map.c to here // killough 2/7/98: move iddt cheat from am_map.c to here
@ -1041,14 +1041,14 @@ static void cheat_reveal_item()
static void cheat_hom() static void cheat_hom()
{ {
extern int autodetect_hom; // Ty 03/27/98 - *not* externalized extern int autodetect_hom; // Ty 03/27/98 - *not* externalized
doomprintf(MESSAGES_NONE, (autodetect_hom = !autodetect_hom) ? "HOM Detection On" : displaymsg((autodetect_hom = !autodetect_hom) ? "HOM Detection On" :
"HOM Detection Off"); "HOM Detection Off");
} }
// killough 3/6/98: -fast parameter toggle // killough 3/6/98: -fast parameter toggle
static void cheat_fast() static void cheat_fast()
{ {
doomprintf(MESSAGES_NONE, (fastparm = !fastparm) ? "Fast Monsters On" : displaymsg((fastparm = !fastparm) ? "Fast Monsters On" :
"Fast Monsters Off"); // Ty 03/27/98 - *not* externalized "Fast Monsters Off"); // Ty 03/27/98 - *not* externalized
G_SetFastParms(fastparm); // killough 4/10/98: set -fast parameter correctly G_SetFastParms(fastparm); // killough 4/10/98: set -fast parameter correctly
} }
@ -1056,17 +1056,17 @@ static void cheat_fast()
// killough 2/16/98: keycard/skullkey cheat functions // killough 2/16/98: keycard/skullkey cheat functions
static void cheat_key() static void cheat_key()
{ {
doomprintf(MESSAGES_NONE, "Red, Yellow, Blue"); // Ty 03/27/98 - *not* externalized displaymsg("Red, Yellow, Blue"); // Ty 03/27/98 - *not* externalized
} }
static void cheat_keyx() static void cheat_keyx()
{ {
doomprintf(MESSAGES_NONE, "Card, Skull"); // Ty 03/27/98 - *not* externalized displaymsg("Card, Skull"); // Ty 03/27/98 - *not* externalized
} }
static void cheat_keyxx(int key) static void cheat_keyxx(int key)
{ {
doomprintf(MESSAGES_NONE, (plyr->cards[key] = !plyr->cards[key]) ? displaymsg((plyr->cards[key] = !plyr->cards[key]) ?
"Key Added" : "Key Removed"); // Ty 03/27/98 - *not* externalized "Key Added" : "Key Removed"); // Ty 03/27/98 - *not* externalized
} }
@ -1074,7 +1074,7 @@ static void cheat_keyxx(int key)
static void cheat_weap() static void cheat_weap()
{ // Ty 03/27/98 - *not* externalized { // Ty 03/27/98 - *not* externalized
doomprintf(MESSAGES_NONE, have_ssg ? // killough 2/28/98 displaymsg(have_ssg ? // killough 2/28/98
"Weapon number 1-9" : "Weapon number 1-8"); "Weapon number 1-9" : "Weapon number 1-8");
} }
@ -1092,10 +1092,10 @@ static void cheat_weapx(char *buf)
if (w >= 0 && w < NUMWEAPONS) if (w >= 0 && w < NUMWEAPONS)
{ {
if ((plyr->weaponowned[w] = !plyr->weaponowned[w])) if ((plyr->weaponowned[w] = !plyr->weaponowned[w]))
doomprintf(MESSAGES_NONE, "Weapon Added"); // Ty 03/27/98 - *not* externalized displaymsg("Weapon Added"); // Ty 03/27/98 - *not* externalized
else else
{ {
doomprintf(MESSAGES_NONE, "Weapon Removed"); // Ty 03/27/98 - *not* externalized displaymsg("Weapon Removed"); // Ty 03/27/98 - *not* externalized
if (w==plyr->readyweapon) // maybe switch if weapon removed if (w==plyr->readyweapon) // maybe switch if weapon removed
plyr->pendingweapon = P_SwitchWeapon(plyr); plyr->pendingweapon = P_SwitchWeapon(plyr);
} }
@ -1105,7 +1105,7 @@ static void cheat_weapx(char *buf)
// killough 2/16/98: generalized ammo cheats // killough 2/16/98: generalized ammo cheats
static void cheat_ammo() static void cheat_ammo()
{ {
doomprintf(MESSAGES_NONE, "Ammo 1-4, Backpack"); // Ty 03/27/98 - *not* externalized displaymsg("Ammo 1-4, Backpack"); // Ty 03/27/98 - *not* externalized
} }
static void cheat_ammox(char *buf) static void cheat_ammox(char *buf)
@ -1113,10 +1113,10 @@ static void cheat_ammox(char *buf)
int a = *buf - '1'; int a = *buf - '1';
if (*buf == 'b') // Ty 03/27/98 - strings *not* externalized if (*buf == 'b') // Ty 03/27/98 - strings *not* externalized
if ((plyr->backpack = !plyr->backpack)) if ((plyr->backpack = !plyr->backpack))
for (doomprintf(MESSAGES_NONE, "Backpack Added"), a=0 ; a<NUMAMMO ; a++) for (displaymsg("Backpack Added"), a=0 ; a<NUMAMMO ; a++)
plyr->maxammo[a] <<= 1; plyr->maxammo[a] <<= 1;
else else
for (doomprintf(MESSAGES_NONE, "Backpack Removed"), a=0 ; a<NUMAMMO ; a++) for (displaymsg("Backpack Removed"), a=0 ; a<NUMAMMO ; a++)
{ {
if (plyr->ammo[a] > (plyr->maxammo[a] >>= 1)) if (plyr->ammo[a] > (plyr->maxammo[a] >>= 1))
plyr->ammo[a] = plyr->maxammo[a]; plyr->ammo[a] = plyr->maxammo[a];
@ -1128,29 +1128,29 @@ static void cheat_ammox(char *buf)
if ((plyr->ammo[a] = !plyr->ammo[a])) if ((plyr->ammo[a] = !plyr->ammo[a]))
{ {
plyr->ammo[a] = plyr->maxammo[a]; plyr->ammo[a] = plyr->maxammo[a];
doomprintf(MESSAGES_NONE, "Ammo Added"); displaymsg("Ammo Added");
} }
else else
doomprintf(MESSAGES_NONE, "Ammo Removed"); displaymsg("Ammo Removed");
} }
} }
static void cheat_smart() static void cheat_smart()
{ {
doomprintf(MESSAGES_NONE, (monsters_remember = !monsters_remember) ? displaymsg((monsters_remember = !monsters_remember) ?
"Smart Monsters Enabled" : "Smart Monsters Disabled"); "Smart Monsters Enabled" : "Smart Monsters Disabled");
} }
static void cheat_pitch() static void cheat_pitch()
{ {
doomprintf(MESSAGES_NONE, (pitched_sounds = !pitched_sounds) ? "Pitch Effects Enabled" : displaymsg((pitched_sounds = !pitched_sounds) ? "Pitch Effects Enabled" :
"Pitch Effects Disabled"); "Pitch Effects Disabled");
} }
static void cheat_nuke() static void cheat_nuke()
{ {
extern int disable_nuke; extern int disable_nuke;
doomprintf(MESSAGES_NONE, (disable_nuke = !disable_nuke) ? "Nukage Disabled" : displaymsg((disable_nuke = !disable_nuke) ? "Nukage Disabled" :
"Nukage Enabled"); "Nukage Enabled");
} }

22
src/m_menu.c
View File

@ -1685,9 +1685,9 @@ void M_ChangeMessages(int choice)
showMessages = 1 - showMessages; showMessages = 1 - showMessages;
if (!showMessages) if (!showMessages)
doomprintf(MESSAGES_NONE, "%s", s_MSGOFF); // Ty 03/27/98 - externalized displaymsg("%s", s_MSGOFF); // Ty 03/27/98 - externalized
else else
doomprintf(MESSAGES_NONE, "%s", s_MSGON); // Ty 03/27/98 - externalized displaymsg("%s", s_MSGON); // Ty 03/27/98 - externalized
message_dontfuckwithme = true; message_dontfuckwithme = true;
} }
@ -2736,7 +2736,7 @@ int G_GotoNextLevel(int *pEpi, int *pMap)
char *name = MAPNAME(epsd, map); char *name = MAPNAME(epsd, map);
if (W_CheckNumForName(name) == -1) if (W_CheckNumForName(name) == -1)
doomprintf(MESSAGES_NONE, "Next level not found: %s", name); displaymsg("Next level not found: %s", name);
else else
{ {
G_DeferedInitNew(gameskill, epsd, map); G_DeferedInitNew(gameskill, epsd, map);
@ -5521,21 +5521,21 @@ boolean M_Responder (event_t* ev)
if (M_InputActivated(input_autorun)) // Autorun // V if (M_InputActivated(input_autorun)) // Autorun // V
{ {
autorun = !autorun; autorun = !autorun;
doomprintf(MESSAGES_TOGGLE, "Always Run %s", autorun ? "On" : "Off"); togglemsg("Always Run %s", autorun ? "On" : "Off");
// return true; // [FG] don't let toggles eat keys // return true; // [FG] don't let toggles eat keys
} }
if (M_InputActivated(input_novert)) if (M_InputActivated(input_novert))
{ {
novert = !novert; novert = !novert;
doomprintf(MESSAGES_TOGGLE, "Vertical Mouse %s", !novert ? "On" : "Off"); togglemsg("Vertical Mouse %s", !novert ? "On" : "Off");
// return true; // [FG] don't let toggles eat keys // return true; // [FG] don't let toggles eat keys
} }
if (M_InputActivated(input_mouselook)) if (M_InputActivated(input_mouselook))
{ {
mouselook = !mouselook; mouselook = !mouselook;
doomprintf(MESSAGES_TOGGLE, "Mouselook %s", mouselook ? "On" : "Off"); togglemsg("Mouselook %s", mouselook ? "On" : "Off");
M_UpdateMouseLook(); M_UpdateMouseLook();
// return true; // [FG] don't let toggles eat keys // return true; // [FG] don't let toggles eat keys
} }
@ -5543,7 +5543,7 @@ boolean M_Responder (event_t* ev)
if (M_InputActivated(input_padlook)) if (M_InputActivated(input_padlook))
{ {
padlook = !padlook; padlook = !padlook;
doomprintf(MESSAGES_TOGGLE, "Padlook %s", padlook ? "On" : "Off"); togglemsg("Padlook %s", padlook ? "On" : "Off");
M_UpdateMouseLook(); M_UpdateMouseLook();
// return true; // [FG] don't let toggles eat keys // return true; // [FG] don't let toggles eat keys
} }
@ -5624,7 +5624,7 @@ boolean M_Responder (event_t* ev)
gamma2++; gamma2++;
if (gamma2 > 17) if (gamma2 > 17)
gamma2 = 0; gamma2 = 0;
doomprintf(MESSAGES_TOGGLE, "Gamma correction level %s", gamma_strings[gamma2]); togglemsg("Gamma correction level %s", gamma_strings[gamma2]);
M_ResetGamma(); M_ResetGamma();
return true; return true;
} }
@ -5703,7 +5703,7 @@ boolean M_Responder (event_t* ev)
{ {
realtic_clock_rate += 10; realtic_clock_rate += 10;
realtic_clock_rate = BETWEEN(10, 1000, realtic_clock_rate); realtic_clock_rate = BETWEEN(10, 1000, realtic_clock_rate);
doomprintf(MESSAGES_NONE, "Game Speed: %d", realtic_clock_rate); displaymsg("Game Speed: %d", realtic_clock_rate);
I_SetTimeScale(realtic_clock_rate); I_SetTimeScale(realtic_clock_rate);
} }
@ -5712,7 +5712,7 @@ boolean M_Responder (event_t* ev)
{ {
realtic_clock_rate -= 10; realtic_clock_rate -= 10;
realtic_clock_rate = BETWEEN(10, 1000, realtic_clock_rate); realtic_clock_rate = BETWEEN(10, 1000, realtic_clock_rate);
doomprintf(MESSAGES_NONE, "Game Speed: %d", realtic_clock_rate); displaymsg("Game Speed: %d", realtic_clock_rate);
I_SetTimeScale(realtic_clock_rate); I_SetTimeScale(realtic_clock_rate);
} }
@ -5720,7 +5720,7 @@ boolean M_Responder (event_t* ev)
&& !strictmode) && !strictmode)
{ {
realtic_clock_rate = 100; realtic_clock_rate = 100;
doomprintf(MESSAGES_NONE, "Game Speed: %d", realtic_clock_rate); displaymsg("Game Speed: %d", realtic_clock_rate);
I_SetTimeScale(realtic_clock_rate); I_SetTimeScale(realtic_clock_rate);
} }
} }

2
src/m_misc.c
View File

@ -3321,7 +3321,7 @@ void M_ScreenShot (void)
// players[consoleplayer].message = "screen shot" // players[consoleplayer].message = "screen shot"
// killough 10/98: print error message and change sound effect if error // killough 10/98: print error message and change sound effect if error
S_StartSound(NULL, !success ? doomprintf(MESSAGES_NONE, "%s", errno ? strerror(errno) : S_StartSound(NULL, !success ? displaymsg("%s", errno ? strerror(errno) :
"Could not take screenshot"), sfx_oof : "Could not take screenshot"), sfx_oof :
gamemode==commercial ? sfx_radio : sfx_tink); gamemode==commercial ? sfx_radio : sfx_tink);

12
src/p_doors.c
View File

@ -248,7 +248,7 @@ int EV_DoLockedDoor(line_t *line, vldoor_e type, mobj_t *thing)
case 133: case 133:
if (!p->cards[it_bluecard] && !p->cards[it_blueskull]) if (!p->cards[it_bluecard] && !p->cards[it_blueskull])
{ {
doomprintf(MESSAGES_NONE, "%s", s_PD_BLUEO); // Ty 03/27/98 - externalized displaymsg("%s", s_PD_BLUEO); // Ty 03/27/98 - externalized
S_StartSound(p->mo,sfx_oof); // killough 3/20/98 S_StartSound(p->mo,sfx_oof); // killough 3/20/98
return 0; return 0;
} }
@ -258,7 +258,7 @@ int EV_DoLockedDoor(line_t *line, vldoor_e type, mobj_t *thing)
case 135: case 135:
if (!p->cards[it_redcard] && !p->cards[it_redskull]) if (!p->cards[it_redcard] && !p->cards[it_redskull])
{ {
doomprintf(MESSAGES_NONE, "%s", s_PD_REDO); // Ty 03/27/98 - externalized displaymsg("%s", s_PD_REDO); // Ty 03/27/98 - externalized
S_StartSound(p->mo,sfx_oof); // killough 3/20/98 S_StartSound(p->mo,sfx_oof); // killough 3/20/98
return 0; return 0;
} }
@ -268,7 +268,7 @@ int EV_DoLockedDoor(line_t *line, vldoor_e type, mobj_t *thing)
case 137: case 137:
if (!p->cards[it_yellowcard] && !p->cards[it_yellowskull]) if (!p->cards[it_yellowcard] && !p->cards[it_yellowskull])
{ {
doomprintf(MESSAGES_NONE, "%s", s_PD_YELLOWO); // Ty 03/27/98 - externalized displaymsg("%s", s_PD_YELLOWO); // Ty 03/27/98 - externalized
S_StartSound(p->mo,sfx_oof); // killough 3/20/98 S_StartSound(p->mo,sfx_oof); // killough 3/20/98
return 0; return 0;
} }
@ -395,7 +395,7 @@ int EV_VerticalDoor(line_t *line, mobj_t *thing)
return 0; return 0;
if (!player->cards[it_bluecard] && !player->cards[it_blueskull]) if (!player->cards[it_bluecard] && !player->cards[it_blueskull])
{ {
doomprintf(MESSAGES_NONE, "%s", s_PD_BLUEK); // Ty 03/27/98 - externalized displaymsg("%s", s_PD_BLUEK); // Ty 03/27/98 - externalized
S_StartSound(player->mo,sfx_oof); // killough 3/20/98 S_StartSound(player->mo,sfx_oof); // killough 3/20/98
return 0; return 0;
} }
@ -407,7 +407,7 @@ int EV_VerticalDoor(line_t *line, mobj_t *thing)
return 0; return 0;
if (!player->cards[it_yellowcard] && !player->cards[it_yellowskull]) if (!player->cards[it_yellowcard] && !player->cards[it_yellowskull])
{ {
doomprintf(MESSAGES_NONE, "%s", s_PD_YELLOWK); // Ty 03/27/98 - externalized displaymsg("%s", s_PD_YELLOWK); // Ty 03/27/98 - externalized
S_StartSound(player->mo,sfx_oof); // killough 3/20/98 S_StartSound(player->mo,sfx_oof); // killough 3/20/98
return 0; return 0;
} }
@ -419,7 +419,7 @@ int EV_VerticalDoor(line_t *line, mobj_t *thing)
return 0; return 0;
if (!player->cards[it_redcard] && !player->cards[it_redskull]) if (!player->cards[it_redcard] && !player->cards[it_redskull])
{ {
doomprintf(MESSAGES_NONE, "%s", s_PD_REDK); // Ty 03/27/98 - externalized displaymsg("%s", s_PD_REDK); // Ty 03/27/98 - externalized
S_StartSound(player->mo,sfx_oof); // killough 3/20/98 S_StartSound(player->mo,sfx_oof); // killough 3/20/98
return 0; return 0;
} }

84
src/p_inter.c
View File

@ -315,13 +315,13 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
case SPR_ARM1: case SPR_ARM1:
if (!P_GiveArmor (player, green_armor_class)) if (!P_GiveArmor (player, green_armor_class))
return; return;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTARMOR); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTARMOR); // Ty 03/22/98 - externalized
break; break;
case SPR_ARM2: case SPR_ARM2:
if (!P_GiveArmor (player, blue_armor_class)) if (!P_GiveArmor (player, blue_armor_class))
return; return;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTMEGA); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTMEGA); // Ty 03/22/98 - externalized
break; break;
// bonus items // bonus items
@ -329,7 +329,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
if (beta_emulation) if (beta_emulation)
{ // killough 7/11/98: beta version items did not have any effect { // killough 7/11/98: beta version items did not have any effect
doomprintf(MESSAGES_PICKUP, "You pick up a demonic dagger."); pickupmsg(player, "You pick up a demonic dagger.");
break; break;
} }
@ -337,14 +337,14 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
if (player->health > (maxhealth * 2)) if (player->health > (maxhealth * 2))
player->health = (maxhealth * 2); player->health = (maxhealth * 2);
player->mo->health = player->health; player->mo->health = player->health;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTHTHBONUS); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTHTHBONUS); // Ty 03/22/98 - externalized
break; break;
case SPR_BON2: case SPR_BON2:
if (beta_emulation) if (beta_emulation)
{ // killough 7/11/98: beta version items did not have any effect { // killough 7/11/98: beta version items did not have any effect
doomprintf(MESSAGES_PICKUP, "You pick up a skullchest."); pickupmsg(player, "You pick up a skullchest.");
break; break;
} }
@ -353,15 +353,15 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
player->armorpoints = max_armor; player->armorpoints = max_armor;
if (!player->armortype) if (!player->armortype)
player->armortype = green_armor_class; player->armortype = green_armor_class;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTARMBONUS); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTARMBONUS); // Ty 03/22/98 - externalized
break; break;
case SPR_BON3: // killough 7/11/98: evil sceptre from beta version case SPR_BON3: // killough 7/11/98: evil sceptre from beta version
doomprintf(MESSAGES_PICKUP, "Picked up an evil sceptre"); pickupmsg(player, "Picked up an evil sceptre");
break; break;
case SPR_BON4: // killough 7/11/98: unholy bible from beta version case SPR_BON4: // killough 7/11/98: unholy bible from beta version
doomprintf(MESSAGES_PICKUP, "Picked up an unholy bible"); pickupmsg(player, "Picked up an unholy bible");
break; break;
case SPR_SOUL: case SPR_SOUL:
@ -369,7 +369,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
if (player->health > max_soul) if (player->health > max_soul)
player->health = max_soul; player->health = max_soul;
player->mo->health = player->health; player->mo->health = player->health;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTSUPER); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTSUPER); // Ty 03/22/98 - externalized
sound = sfx_getpow; sound = sfx_getpow;
break; break;
@ -379,7 +379,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
player->health = mega_health; player->health = mega_health;
player->mo->health = player->health; player->mo->health = player->health;
P_GiveArmor (player,blue_armor_class); P_GiveArmor (player,blue_armor_class);
doomprintf(MESSAGES_PICKUP, "%s", s_GOTMSPHERE); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTMSPHERE); // Ty 03/22/98 - externalized
sound = sfx_getpow; sound = sfx_getpow;
break; break;
@ -387,7 +387,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
// leave cards for everyone // leave cards for everyone
case SPR_BKEY: case SPR_BKEY:
if (!player->cards[it_bluecard]) if (!player->cards[it_bluecard])
doomprintf(MESSAGES_PICKUP, "%s", s_GOTBLUECARD); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTBLUECARD); // Ty 03/22/98 - externalized
P_GiveCard (player, it_bluecard); P_GiveCard (player, it_bluecard);
if (!netgame) if (!netgame)
break; break;
@ -395,7 +395,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
case SPR_YKEY: case SPR_YKEY:
if (!player->cards[it_yellowcard]) if (!player->cards[it_yellowcard])
doomprintf(MESSAGES_PICKUP, "%s", s_GOTYELWCARD); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTYELWCARD); // Ty 03/22/98 - externalized
P_GiveCard (player, it_yellowcard); P_GiveCard (player, it_yellowcard);
if (!netgame) if (!netgame)
break; break;
@ -403,7 +403,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
case SPR_RKEY: case SPR_RKEY:
if (!player->cards[it_redcard]) if (!player->cards[it_redcard])
doomprintf(MESSAGES_PICKUP, "%s", s_GOTREDCARD); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTREDCARD); // Ty 03/22/98 - externalized
P_GiveCard (player, it_redcard); P_GiveCard (player, it_redcard);
if (!netgame) if (!netgame)
break; break;
@ -411,7 +411,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
case SPR_BSKU: case SPR_BSKU:
if (!player->cards[it_blueskull]) if (!player->cards[it_blueskull])
doomprintf(MESSAGES_PICKUP, "%s", s_GOTBLUESKUL); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTBLUESKUL); // Ty 03/22/98 - externalized
P_GiveCard (player, it_blueskull); P_GiveCard (player, it_blueskull);
if (!netgame) if (!netgame)
break; break;
@ -419,7 +419,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
case SPR_YSKU: case SPR_YSKU:
if (!player->cards[it_yellowskull]) if (!player->cards[it_yellowskull])
doomprintf(MESSAGES_PICKUP, "%s", s_GOTYELWSKUL); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTYELWSKUL); // Ty 03/22/98 - externalized
P_GiveCard (player, it_yellowskull); P_GiveCard (player, it_yellowskull);
if (!netgame) if (!netgame)
break; break;
@ -427,7 +427,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
case SPR_RSKU: case SPR_RSKU:
if (!player->cards[it_redskull]) if (!player->cards[it_redskull])
doomprintf(MESSAGES_PICKUP, "%s", s_GOTREDSKULL); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTREDSKULL); // Ty 03/22/98 - externalized
P_GiveCard (player, it_redskull); P_GiveCard (player, it_redskull);
if (!netgame) if (!netgame)
break; break;
@ -437,7 +437,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
case SPR_STIM: case SPR_STIM:
if (!P_GiveBody (player, 10)) if (!P_GiveBody (player, 10))
return; return;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTSTIM); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTSTIM); // Ty 03/22/98 - externalized
break; break;
case SPR_MEDI: case SPR_MEDI:
@ -446,9 +446,9 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
// [FG] show "Picked up a Medikit that you really need" message as intended // [FG] show "Picked up a Medikit that you really need" message as intended
if (player->health < 50) if (player->health < 50)
doomprintf(MESSAGES_PICKUP, "%s", s_GOTMEDINEED); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTMEDINEED); // Ty 03/22/98 - externalized
else else
doomprintf(MESSAGES_PICKUP, "%s", s_GOTMEDIKIT); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTMEDIKIT); // Ty 03/22/98 - externalized
break; break;
@ -456,14 +456,14 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
case SPR_PINV: case SPR_PINV:
if (!P_GivePower (player, pw_invulnerability)) if (!P_GivePower (player, pw_invulnerability))
return; return;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTINVUL); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTINVUL); // Ty 03/22/98 - externalized
sound = sfx_getpow; sound = sfx_getpow;
break; break;
case SPR_PSTR: case SPR_PSTR:
if (!P_GivePower (player, pw_strength)) if (!P_GivePower (player, pw_strength))
return; return;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTBERSERK); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTBERSERK); // Ty 03/22/98 - externalized
if (player->readyweapon != wp_fist) if (player->readyweapon != wp_fist)
if (!beta_emulation // killough 10/98: don't switch as much in -beta if (!beta_emulation // killough 10/98: don't switch as much in -beta
|| player->readyweapon == wp_pistol) || player->readyweapon == wp_pistol)
@ -474,7 +474,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
case SPR_PINS: case SPR_PINS:
if (!P_GivePower (player, pw_invisibility)) if (!P_GivePower (player, pw_invisibility))
return; return;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTINVIS); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTINVIS); // Ty 03/22/98 - externalized
sound = sfx_getpow; sound = sfx_getpow;
break; break;
@ -485,14 +485,14 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
if (beta_emulation) // killough 7/19/98: beta rad suit did not wear off if (beta_emulation) // killough 7/19/98: beta rad suit did not wear off
player->powers[pw_ironfeet] = -1; player->powers[pw_ironfeet] = -1;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTSUIT); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTSUIT); // Ty 03/22/98 - externalized
sound = sfx_getpow; sound = sfx_getpow;
break; break;
case SPR_PMAP: case SPR_PMAP:
if (!P_GivePower (player, pw_allmap)) if (!P_GivePower (player, pw_allmap))
return; return;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTMAP); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTMAP); // Ty 03/22/98 - externalized
sound = sfx_getpow; sound = sfx_getpow;
break; break;
@ -506,7 +506,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
player->powers[pw_infrared] = -1; player->powers[pw_infrared] = -1;
sound = sfx_getpow; sound = sfx_getpow;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTVISOR); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTVISOR); // Ty 03/22/98 - externalized
break; break;
// ammo // ammo
@ -521,49 +521,49 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
if (!P_GiveAmmo (player,am_clip,1)) if (!P_GiveAmmo (player,am_clip,1))
return; return;
} }
doomprintf(MESSAGES_PICKUP, "%s", s_GOTCLIP); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTCLIP); // Ty 03/22/98 - externalized
break; break;
case SPR_AMMO: case SPR_AMMO:
if (!P_GiveAmmo (player, am_clip,5)) if (!P_GiveAmmo (player, am_clip,5))
return; return;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTCLIPBOX); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTCLIPBOX); // Ty 03/22/98 - externalized
break; break;
case SPR_ROCK: case SPR_ROCK:
if (!P_GiveAmmo (player, am_misl,1)) if (!P_GiveAmmo (player, am_misl,1))
return; return;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTROCKET); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTROCKET); // Ty 03/22/98 - externalized
break; break;
case SPR_BROK: case SPR_BROK:
if (!P_GiveAmmo (player, am_misl,5)) if (!P_GiveAmmo (player, am_misl,5))
return; return;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTROCKBOX); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTROCKBOX); // Ty 03/22/98 - externalized
break; break;
case SPR_CELL: case SPR_CELL:
if (!P_GiveAmmo (player, am_cell,1)) if (!P_GiveAmmo (player, am_cell,1))
return; return;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTCELL); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTCELL); // Ty 03/22/98 - externalized
break; break;
case SPR_CELP: case SPR_CELP:
if (!P_GiveAmmo (player, am_cell,5)) if (!P_GiveAmmo (player, am_cell,5))
return; return;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTCELLBOX); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTCELLBOX); // Ty 03/22/98 - externalized
break; break;
case SPR_SHEL: case SPR_SHEL:
if (!P_GiveAmmo (player, am_shell,1)) if (!P_GiveAmmo (player, am_shell,1))
return; return;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTSHELLS); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTSHELLS); // Ty 03/22/98 - externalized
break; break;
case SPR_SBOX: case SPR_SBOX:
if (!P_GiveAmmo (player, am_shell,5)) if (!P_GiveAmmo (player, am_shell,5))
return; return;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTSHELLBOX); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTSHELLBOX); // Ty 03/22/98 - externalized
break; break;
case SPR_BPAK: case SPR_BPAK:
@ -575,7 +575,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
} }
for (i=0 ; i<NUMAMMO ; i++) for (i=0 ; i<NUMAMMO ; i++)
P_GiveAmmo (player, i, 1); P_GiveAmmo (player, i, 1);
doomprintf(MESSAGES_PICKUP, "%s", s_GOTBACKPACK); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTBACKPACK); // Ty 03/22/98 - externalized
break; break;
// weapons // weapons
@ -583,51 +583,51 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
if (!P_GiveWeapon (player, wp_bfg, false) ) if (!P_GiveWeapon (player, wp_bfg, false) )
return; return;
if (classic_bfg || beta_emulation) if (classic_bfg || beta_emulation)
doomprintf(MESSAGES_PICKUP, "You got the BFG2704! Oh, yes."); // killough 8/9/98: beta BFG pickupmsg(player, "You got the BFG2704! Oh, yes."); // killough 8/9/98: beta BFG
else else
doomprintf(MESSAGES_PICKUP, "%s", s_GOTBFG9000); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTBFG9000); // Ty 03/22/98 - externalized
sound = sfx_wpnup; sound = sfx_wpnup;
break; break;
case SPR_MGUN: case SPR_MGUN:
if (!P_GiveWeapon (player, wp_chaingun, special->flags & MF_DROPPED)) if (!P_GiveWeapon (player, wp_chaingun, special->flags & MF_DROPPED))
return; return;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTCHAINGUN); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTCHAINGUN); // Ty 03/22/98 - externalized
sound = sfx_wpnup; sound = sfx_wpnup;
break; break;
case SPR_CSAW: case SPR_CSAW:
if (!P_GiveWeapon(player, wp_chainsaw, false)) if (!P_GiveWeapon(player, wp_chainsaw, false))
return; return;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTCHAINSAW); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTCHAINSAW); // Ty 03/22/98 - externalized
sound = sfx_wpnup; sound = sfx_wpnup;
break; break;
case SPR_LAUN: case SPR_LAUN:
if (!P_GiveWeapon (player, wp_missile, false) ) if (!P_GiveWeapon (player, wp_missile, false) )
return; return;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTLAUNCHER); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTLAUNCHER); // Ty 03/22/98 - externalized
sound = sfx_wpnup; sound = sfx_wpnup;
break; break;
case SPR_PLAS: case SPR_PLAS:
if (!P_GiveWeapon(player, wp_plasma, false)) if (!P_GiveWeapon(player, wp_plasma, false))
return; return;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTPLASMA); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTPLASMA); // Ty 03/22/98 - externalized
sound = sfx_wpnup; sound = sfx_wpnup;
break; break;
case SPR_SHOT: case SPR_SHOT:
if (!P_GiveWeapon(player, wp_shotgun, special->flags & MF_DROPPED)) if (!P_GiveWeapon(player, wp_shotgun, special->flags & MF_DROPPED))
return; return;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTSHOTGUN); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTSHOTGUN); // Ty 03/22/98 - externalized
sound = sfx_wpnup; sound = sfx_wpnup;
break; break;
case SPR_SGN2: case SPR_SGN2:
if (!P_GiveWeapon(player, wp_supershotgun, special->flags & MF_DROPPED)) if (!P_GiveWeapon(player, wp_supershotgun, special->flags & MF_DROPPED))
return; return;
doomprintf(MESSAGES_PICKUP, "%s", s_GOTSHOTGUN2); // Ty 03/22/98 - externalized pickupmsg(player, "%s", s_GOTSHOTGUN2); // Ty 03/22/98 - externalized
sound = sfx_wpnup; sound = sfx_wpnup;
break; break;

2
src/p_mobj.c
View File

@ -89,7 +89,7 @@ boolean P_SetMobjState(mobj_t* mobj,statenum_t state)
while (!mobj->tics && !seenstate[state]); // killough 4/9/98 while (!mobj->tics && !seenstate[state]); // killough 4/9/98
if (ret && !mobj->tics) // killough 4/9/98: detect state cycles if (ret && !mobj->tics) // killough 4/9/98: detect state cycles
doomprintf(MESSAGES_NONE, "Warning: State Cycle Detected"); displaymsg("Warning: State Cycle Detected");
if (!--recursion) if (!--recursion)
for (;(state=seenstate[i]);i=state-1) for (;(state=seenstate[i]);i=state-1)

18
src/p_spec.c
View File

@ -800,7 +800,7 @@ boolean P_CanUnlockGenDoor(line_t *line, player_t *player)
!player->cards[it_yellowcard] && !player->cards[it_yellowcard] &&
!player->cards[it_yellowskull]) !player->cards[it_yellowskull])
{ {
doomprintf(MESSAGES_NONE, "%s", s_PD_ANY); // Ty 03/27/98 - externalized displaymsg("%s", s_PD_ANY); // Ty 03/27/98 - externalized
S_StartSound(player->mo,sfx_oof); // killough 3/20/98 S_StartSound(player->mo,sfx_oof); // killough 3/20/98
return false; return false;
} }
@ -809,7 +809,7 @@ boolean P_CanUnlockGenDoor(line_t *line, player_t *player)
if (!player->cards[it_redcard] && if (!player->cards[it_redcard] &&
(!skulliscard || !player->cards[it_redskull])) (!skulliscard || !player->cards[it_redskull]))
{ {
doomprintf(MESSAGES_NONE, "%s", skulliscard? s_PD_REDK : s_PD_REDC); // Ty 03/27/98 - externalized displaymsg("%s", skulliscard? s_PD_REDK : s_PD_REDC); // Ty 03/27/98 - externalized
S_StartSound(player->mo,sfx_oof); // killough 3/20/98 S_StartSound(player->mo,sfx_oof); // killough 3/20/98
return false; return false;
} }
@ -818,7 +818,7 @@ boolean P_CanUnlockGenDoor(line_t *line, player_t *player)
if (!player->cards[it_bluecard] && if (!player->cards[it_bluecard] &&
(!skulliscard || !player->cards[it_blueskull])) (!skulliscard || !player->cards[it_blueskull]))
{ {
doomprintf(MESSAGES_NONE, "%s", skulliscard? s_PD_BLUEK : s_PD_BLUEC); // Ty 03/27/98 - externalized displaymsg("%s", skulliscard? s_PD_BLUEK : s_PD_BLUEC); // Ty 03/27/98 - externalized
S_StartSound(player->mo,sfx_oof); // killough 3/20/98 S_StartSound(player->mo,sfx_oof); // killough 3/20/98
return false; return false;
} }
@ -827,7 +827,7 @@ boolean P_CanUnlockGenDoor(line_t *line, player_t *player)
if (!player->cards[it_yellowcard] && if (!player->cards[it_yellowcard] &&
(!skulliscard || !player->cards[it_yellowskull])) (!skulliscard || !player->cards[it_yellowskull]))
{ {
doomprintf(MESSAGES_NONE, "%s", skulliscard? s_PD_YELLOWK : s_PD_YELLOWC); // Ty 03/27/98 - externalized displaymsg("%s", skulliscard? s_PD_YELLOWK : s_PD_YELLOWC); // Ty 03/27/98 - externalized
S_StartSound(player->mo,sfx_oof); // killough 3/20/98 S_StartSound(player->mo,sfx_oof); // killough 3/20/98
return false; return false;
} }
@ -836,7 +836,7 @@ boolean P_CanUnlockGenDoor(line_t *line, player_t *player)
if (!player->cards[it_redskull] && if (!player->cards[it_redskull] &&
(!skulliscard || !player->cards[it_redcard])) (!skulliscard || !player->cards[it_redcard]))
{ {
doomprintf(MESSAGES_NONE, "%s", skulliscard? s_PD_REDK : s_PD_REDS); // Ty 03/27/98 - externalized displaymsg("%s", skulliscard? s_PD_REDK : s_PD_REDS); // Ty 03/27/98 - externalized
S_StartSound(player->mo,sfx_oof); // killough 3/20/98 S_StartSound(player->mo,sfx_oof); // killough 3/20/98
return false; return false;
} }
@ -845,7 +845,7 @@ boolean P_CanUnlockGenDoor(line_t *line, player_t *player)
if (!player->cards[it_blueskull] && if (!player->cards[it_blueskull] &&
(!skulliscard || !player->cards[it_bluecard])) (!skulliscard || !player->cards[it_bluecard]))
{ {
doomprintf(MESSAGES_NONE, "%s", skulliscard? s_PD_BLUEK : s_PD_BLUES); // Ty 03/27/98 - externalized displaymsg("%s", skulliscard? s_PD_BLUEK : s_PD_BLUES); // Ty 03/27/98 - externalized
S_StartSound(player->mo,sfx_oof); // killough 3/20/98 S_StartSound(player->mo,sfx_oof); // killough 3/20/98
return false; return false;
} }
@ -854,7 +854,7 @@ boolean P_CanUnlockGenDoor(line_t *line, player_t *player)
if (!player->cards[it_yellowskull] && if (!player->cards[it_yellowskull] &&
(!skulliscard || !player->cards[it_yellowcard])) (!skulliscard || !player->cards[it_yellowcard]))
{ {
doomprintf(MESSAGES_NONE, "%s", skulliscard? s_PD_YELLOWK : s_PD_YELLOWS); // Ty 03/27/98 - externalized displaymsg("%s", skulliscard? s_PD_YELLOWK : s_PD_YELLOWS); // Ty 03/27/98 - externalized
S_StartSound(player->mo,sfx_oof); // killough 3/20/98 S_StartSound(player->mo,sfx_oof); // killough 3/20/98
return false; return false;
} }
@ -868,7 +868,7 @@ boolean P_CanUnlockGenDoor(line_t *line, player_t *player)
!player->cards[it_yellowcard] || !player->cards[it_yellowcard] ||
!player->cards[it_yellowskull])) !player->cards[it_yellowskull]))
{ {
doomprintf(MESSAGES_NONE, "%s", s_PD_ALL6); // Ty 03/27/98 - externalized displaymsg("%s", s_PD_ALL6); // Ty 03/27/98 - externalized
S_StartSound(player->mo,sfx_oof); // killough 3/20/98 S_StartSound(player->mo,sfx_oof); // killough 3/20/98
return false; return false;
} }
@ -879,7 +879,7 @@ boolean P_CanUnlockGenDoor(line_t *line, player_t *player)
// http://prboom.sourceforge.net/mbf-bugs.html // http://prboom.sourceforge.net/mbf-bugs.html
!(player->cards[it_yellowcard] | (demo_version == 203 ? !player->cards[it_yellowskull] : player->cards[it_yellowskull])))) !(player->cards[it_yellowcard] | (demo_version == 203 ? !player->cards[it_yellowskull] : player->cards[it_yellowskull]))))
{ {
doomprintf(MESSAGES_NONE, "%s", s_PD_ALL3); // Ty 03/27/98 - externalized displaymsg("%s", s_PD_ALL3); // Ty 03/27/98 - externalized
S_StartSound(player->mo,sfx_oof); // killough 3/20/98 S_StartSound(player->mo,sfx_oof); // killough 3/20/98
return false; return false;
} }

2
src/r_main.c
View File

@ -709,7 +709,7 @@ int rendered_visplanes, rendered_segs, rendered_vissprites;
void R_ShowRenderingStats(void) void R_ShowRenderingStats(void)
{ {
extern int fps; extern int fps;
doomprintf(MESSAGES_NONE, "Segs %d, Visplanes %d, Sprites %d, FPS %d", displaymsg("Segs %d, Visplanes %d, Sprites %d, FPS %d",
rendered_segs, rendered_visplanes, rendered_vissprites, fps); rendered_segs, rendered_visplanes, rendered_vissprites, fps);
} }

10
src/z_zone.h
View File

@ -55,16 +55,6 @@ void Z_ChangeTag(void *ptr, pu_tag tag);
void *Z_Calloc(size_t n, size_t n2, pu_tag tag, void **user); void *Z_Calloc(size_t n, size_t n2, pu_tag tag, void **user);
void *Z_Realloc(void *p, size_t n, pu_tag tag, void **user); void *Z_Realloc(void *p, size_t n, pu_tag tag, void **user);
// Doom-style printf
enum {
MESSAGES_NONE,
MESSAGES_TOGGLE,
MESSAGES_PICKUP,
};
void doomprintf(int category, const char *, ...) PRINTF_ATTR(2, 3);
#endif #endif
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------