Skip to content

Commit

Permalink
In-game dialogs close one by one instead of exiting the server
Browse files Browse the repository at this point in the history
  • Loading branch information
@pelya
pelya committed Mar 13, 2016
1 parent 841ec76 commit 2dc9273
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 1 deletion.
6 changes: 5 additions & 1 deletion code/q3_ui/ui_qmenu.c
View file
Expand Up @@ -1604,7 +1604,11 @@ sfxHandle_t Menu_DefaultKey( menuframework_s *m, int key )
UI_PopMenu();
}
} else {
trap_Cmd_ExecuteText( EXEC_APPEND, "disconnect\n" );
if (uis.menusp == 1) {
trap_Cmd_ExecuteText( EXEC_APPEND, "disconnect\n" );
} else {
UI_PopMenu();
}
}
return menu_out_sound;
}
Expand Down
6 changes: 6 additions & 0 deletions code/q3_ui/ui_votemenu.c
View file
Expand Up @@ -148,21 +148,25 @@ static void VoteMenu_Event( void* ptr, int event )
case ID_NEXTMAP:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote nextmap" );
UI_PopMenu();
UI_PopMenu();
break;
case ID_RESTART:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote map_restart" );
UI_PopMenu();
UI_PopMenu();
break;
case ID_DOWARMUP:
if(s_votemenu.g_doWarmupEnabled)
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote g_doWarmup 0" );
else
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote g_doWarmup 1" );
UI_PopMenu();
UI_PopMenu();
break;
case ID_SHUFFLE:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote shuffle" );
UI_PopMenu();
UI_PopMenu();
break;
case ID_FRAG:
UI_VoteFraglimitMenu();
Expand Down Expand Up @@ -191,10 +195,12 @@ static void VoteMenu_Event( void* ptr, int event )
case ID_YES:
trap_Cmd_ExecuteText( EXEC_APPEND, "vote yes" );
UI_PopMenu();
UI_PopMenu();
break;
case ID_NO:
trap_Cmd_ExecuteText( EXEC_APPEND, "vote no" );
UI_PopMenu();
UI_PopMenu();
break;
/*
};
Expand Down
1 change: 1 addition & 0 deletions code/q3_ui/ui_votemenu_custom.c
View file
Expand Up @@ -96,6 +96,7 @@ static void VoteMenu_custom_Event( void* ptr, int event )
trap_Cmd_ExecuteText( EXEC_APPEND, va("callvote custom %s",s_votemenu_custom.bEntry[s_votemenu_custom.selection-ID_CUSTOM0].string ) );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
}

Expand Down
7 changes: 7 additions & 0 deletions code/q3_ui/ui_votemenu_fraglimit.c
View file
Expand Up @@ -103,36 +103,43 @@ static void VoteMenu_Fraglimit_Event( void* ptr, int event )
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote fraglimit 10" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_15:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote fraglimit 15" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_20:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote fraglimit 20" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_30:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote fraglimit 30" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_40:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote fraglimit 40" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_50:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote fraglimit 50" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_INF:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote fraglimit 0" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
/*
};
Expand Down
12 changes: 12 additions & 0 deletions code/q3_ui/ui_votemenu_gametype.c
View file
Expand Up @@ -124,61 +124,73 @@ static void VoteMenu_Gametype_Event( void* ptr, int event )
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote g_gametype 0" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_Tourney:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote g_gametype 1" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_TDM:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote g_gametype 3" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_CTF:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote g_gametype 4" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_1FCTF:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote g_gametype 5" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_Overload:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote g_gametype 6" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_Harvester:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote g_gametype 7" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_Elimination:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote g_gametype 8" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_CTFe:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote g_gametype 9" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_LMS:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote g_gametype 10" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_DOUBLED:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote g_gametype 11" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_DOM:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote g_gametype 12" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
/*
};
Expand Down
1 change: 1 addition & 0 deletions code/q3_ui/ui_votemenu_kick.c
View file
Expand Up @@ -126,6 +126,7 @@ static void VoteKickMenu_Event( void* ptr, int event )
trap_Cmd_ExecuteText( EXEC_APPEND, va("callvote clientkick %d",s_votemenu_kick.players_profiles[(s_votemenu_kick.selected-20)+s_votemenu_kick.startIndex].id) );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
}
}
Expand Down
1 change: 1 addition & 0 deletions code/q3_ui/ui_votemenu_map.c
View file
Expand Up @@ -103,6 +103,7 @@ static void VoteMapMenu_Event( void* ptr, int event )
trap_Cmd_ExecuteText( EXEC_APPEND, va("callvote map %s", mappage.mapname[s_votemenu_map.selected-ID_MAPNAME0]) );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
}
}
Expand Down
7 changes: 7 additions & 0 deletions code/q3_ui/ui_votemenu_timelimit.c
View file
Expand Up @@ -102,36 +102,43 @@ static void VoteMenu_Timelimit_Event( void* ptr, int event )
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote timelimit 10" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_15:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote timelimit 15" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_20:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote timelimit 20" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_30:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote timelimit 30" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_40:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote timelimit 40" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_50:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote timelimit 50" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
case ID_INF:
trap_Cmd_ExecuteText( EXEC_APPEND, "callvote timelimit 0" );
UI_PopMenu();
UI_PopMenu();
UI_PopMenu();
break;
/*
};
Expand Down

0 comments on commit 2dc9273

Please sign in to comment.