aboutsummaryrefslogtreecommitdiffstats
path: root/code/q3_ui
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2005-10-05 14:50:45 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2005-10-05 14:50:45 +0000
commit8305a120fda7c4039d3b8e4f40ceb6cc14015f21 (patch)
treec6ee92856084840379d374af04c3895b7e4442b1 /code/q3_ui
parent6f0ade1fc81015a421ee97c38b9896c2f0f60854 (diff)
downloadioquake3-aero-8305a120fda7c4039d3b8e4f40ceb6cc14015f21.tar.gz
ioquake3-aero-8305a120fda7c4039d3b8e4f40ceb6cc14015f21.zip
* Fixed some vm build warnings
git-svn-id: svn://svn.icculus.org/quake3/trunk@140 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/q3_ui')
-rw-r--r--code/q3_ui/ui_atoms.c4
-rw-r--r--code/q3_ui/ui_ingame.c4
-rw-r--r--code/q3_ui/ui_menu.c2
-rw-r--r--code/q3_ui/ui_servers2.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/code/q3_ui/ui_atoms.c b/code/q3_ui/ui_atoms.c
index ae4cbb9..b74ad7f 100644
--- a/code/q3_ui/ui_atoms.c
+++ b/code/q3_ui/ui_atoms.c
@@ -821,10 +821,10 @@ void UI_SetActiveMenu( uiMenuCommand_t menu ) {
UI_MainMenu();
return;
case UIMENU_NEED_CD:
- UI_ConfirmMenu( "Insert the CD", (voidfunc_f)NULL, NeedCDAction );
+ UI_ConfirmMenu( "Insert the CD", 0, NeedCDAction );
return;
case UIMENU_BAD_CD_KEY:
- UI_ConfirmMenu( "Bad CD Key", (voidfunc_f)NULL, NeedCDKeyAction );
+ UI_ConfirmMenu( "Bad CD Key", 0, NeedCDKeyAction );
return;
case UIMENU_INGAME:
/*
diff --git a/code/q3_ui/ui_ingame.c b/code/q3_ui/ui_ingame.c
index 9b58c11..2ec053e 100644
--- a/code/q3_ui/ui_ingame.c
+++ b/code/q3_ui/ui_ingame.c
@@ -120,11 +120,11 @@ void InGame_Event( void *ptr, int notification ) {
break;
case ID_RESTART:
- UI_ConfirmMenu( "RESTART ARENA?", (voidfunc_f)NULL, InGame_RestartAction );
+ UI_ConfirmMenu( "RESTART ARENA?", 0, InGame_RestartAction );
break;
case ID_QUIT:
- UI_ConfirmMenu( "EXIT GAME?", (voidfunc_f)NULL, InGame_QuitAction );
+ UI_ConfirmMenu( "EXIT GAME?", 0, InGame_QuitAction );
break;
case ID_SERVERINFO:
diff --git a/code/q3_ui/ui_menu.c b/code/q3_ui/ui_menu.c
index 6722435..1850464 100644
--- a/code/q3_ui/ui_menu.c
+++ b/code/q3_ui/ui_menu.c
@@ -126,7 +126,7 @@ void Main_MenuEvent (void* ptr, int event) {
break;
case ID_EXIT:
- UI_ConfirmMenu( "EXIT GAME?", NULL, MainMenu_ExitAction );
+ UI_ConfirmMenu( "EXIT GAME?", 0, MainMenu_ExitAction );
break;
}
}
diff --git a/code/q3_ui/ui_servers2.c b/code/q3_ui/ui_servers2.c
index 2067354..d7fae72 100644
--- a/code/q3_ui/ui_servers2.c
+++ b/code/q3_ui/ui_servers2.c
@@ -1265,11 +1265,11 @@ static void ArenaServers_Event( void* ptr, int event ) {
case ID_PUNKBUSTER:
if (g_arenaservers.punkbuster.curvalue)
{
- UI_ConfirmMenu_Style( "Enable Punkbuster?", UI_CENTER|UI_INVERSE|UI_SMALLFONT, (voidfunc_f)NULL, Punkbuster_ConfirmEnable );
+ UI_ConfirmMenu_Style( "Enable Punkbuster?", UI_CENTER|UI_INVERSE|UI_SMALLFONT, 0, Punkbuster_ConfirmEnable );
}
else
{
- UI_ConfirmMenu_Style( "Disable Punkbuster?", UI_CENTER|UI_INVERSE|UI_SMALLFONT, (voidfunc_f)NULL, Punkbuster_ConfirmDisable );
+ UI_ConfirmMenu_Style( "Disable Punkbuster?", UI_CENTER|UI_INVERSE|UI_SMALLFONT, 0, Punkbuster_ConfirmDisable );
}
break;
}