Skip to content

Commit

Permalink
Fixed all games: CCmd "msgrefresh" not working.
Browse files Browse the repository at this point in the history
Changed jDoom/jDoom64/jHeretic: Renamed cvar "msg-secret" to "server-game-announce-secret".
  • Loading branch information
danij committed May 5, 2009
1 parent 6cf4cd3 commit 682e781
Show file tree
Hide file tree
Showing 19 changed files with 259 additions and 180 deletions.
21 changes: 13 additions & 8 deletions doomsday/plugins/common/include/hu_log.h
Expand Up @@ -40,16 +40,21 @@
# include "jhexen.h"
#endif

void HUMsg_Register(void);
// Log Message Flags (LMF_*), used with Hu_LogPost.
#define LMF_NOHIDE (0x1)
#define LMF_YELLOW (0x2)

void HUMsg_Start(void);
void HUMsg_PlayerMessage(int player, char* message, int tics,
boolean noHide, boolean yellow);
void HUMsg_ClearMessages(int player);
void HUMsg_Refresh(int player);
void Hu_LogRegister(void);

void HUMsg_Drawer(int player);
void HUMsg_Ticker(void);
void Hu_LogStart(int player);
void Hu_LogShutdown(void);

void Hu_LogPost(int player, byte flags, const char* msg, int tics);
void Hu_LogRefresh(int player);
void Hu_LogEmpty(int player);

void Hu_LogDrawer(int player);
void Hu_LogTicker(void);
#endif

/**\file
Expand Down
7 changes: 3 additions & 4 deletions doomsday/plugins/common/src/f_infine.c
Expand Up @@ -396,10 +396,6 @@ void FI_ClearState(void)
{
int i, c;

// Clear the message queue for all local players.
for(i = 0; i < MAXPLAYERS; ++i)
HUMsg_ClearMessages(i);

// General game state.
G_SetGameAction(GA_NONE);
if(fi->mode != FIMODE_OVERLAY)
Expand Down Expand Up @@ -588,6 +584,9 @@ void FI_Start(char *finalescript, infinemode_t mode)
// Init InFine state.
FI_NewState(finalescript);
fi->mode = mode;
// Clear the message queue for all local players.
for(i = 0; i < MAXPLAYERS; ++i)
Hu_LogEmpty(i);
FI_ClearState();

if(!IS_CLIENT)
Expand Down
4 changes: 2 additions & 2 deletions doomsday/plugins/common/src/g_game.c
Expand Up @@ -476,7 +476,7 @@ void G_CommonPreInit(void)
AM_Register(); // For the automap.
Hu_MenuRegister(); // For the menu.
HU_Register(); // For the HUD displays.
HUMsg_Register(); // For the player message logs.
Hu_LogRegister(); // For the player message logs.
Chat_Register();
Hu_MsgRegister(); // For the game messages.
ST_Register(); // For the hud/statusbar.
Expand Down Expand Up @@ -1183,7 +1183,7 @@ void G_PlayerLeaveMap(int player)
p->poisonCount = 0;
#endif

HUMsg_ClearMessages(p - players);
Hu_LogEmpty(p - players);
}

/**
Expand Down

0 comments on commit 682e781

Please sign in to comment.