From 3062b8172693973069294d3136c67f55ab2e2db9 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Mon, 31 May 2010 09:15:50 +0000 Subject: [PATCH] menu.c (m_return_state): changed type to m_state_e (m_quit_prevstate): Likewise. menu.h (m_return_state): added extern declaration. net_dgrm.c (m_return_state): removed extern declaration. git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@172 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/menu.c | 4 ++-- Quake/menu.h | 1 + Quake/net_dgrm.c | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Quake/menu.c b/Quake/menu.c index d31e9922..41297fe0 100644 --- a/Quake/menu.c +++ b/Quake/menu.c @@ -87,7 +87,7 @@ qboolean m_entersound; // play after drawing a frame, so caching // won't disrupt the sound qboolean m_recursiveDraw; -int m_return_state; +m_state_e m_return_state; qboolean m_return_onerror; char m_return_reason [32]; @@ -1536,7 +1536,7 @@ void M_Help_Key (int key) /* QUIT MENU */ int msgNumber; -int m_quit_prevstate; +m_state_e m_quit_prevstate; qboolean wasInMenus; void M_Menu_Quit_f (void) diff --git a/Quake/menu.h b/Quake/menu.h index 8cf24c45..8f943ac6 100644 --- a/Quake/menu.h +++ b/Quake/menu.h @@ -54,6 +54,7 @@ enum m_state_e { }; extern enum m_state_e m_state; +extern enum m_state_e m_return_state; // // menus diff --git a/Quake/net_dgrm.c b/Quake/net_dgrm.c index b8f095dc..a616a371 100644 --- a/Quake/net_dgrm.c +++ b/Quake/net_dgrm.c @@ -80,7 +80,6 @@ struct byte data[MAX_DATAGRAM]; } packetBuffer; -extern int m_return_state; extern qboolean m_return_onerror; extern char m_return_reason[32];