projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gameserver optimisations
[carveJwlIkooP6JGAAIwe30JlM.git]
/
menu.h
diff --git
a/menu.h
b/menu.h
index 3bbaf7c56ce1dcb859e20eab04a97b0a523c00cb..aa8e609b31c0cfbf119f4d5d6a3bfb3bef24223a 100644
(file)
--- a/
menu.h
+++ b/
menu.h
@@
-246,12
+246,18
@@
static void menu_trigger_item( ent_menuitem *item ){
vg.window_should_close = 1;
}
vg.window_should_close = 1;
}
- else if( MDL_CONST_PSTREQ( &menu.model, q, "
reset
" ) ){
- srinput.state = k_input_state_resume;
+ else if( MDL_CONST_PSTREQ( &menu.model, q, "
map
" ) ){
+
menu_close();
menu_close();
- ent_miniworld_goback();
+ respawn_begin_chooser();
+ }
+ else if( MDL_CONST_PSTREQ( &menu.model, q, "hub" ) ){
+ if( world_static.active_instance == k_world_purpose_client ){
+ srinput.state = k_input_state_resume;
+ menu_close();
+ ent_miniworld_goback();
+ }
}
}
-
else if( MDL_CONST_PSTREQ( &menu.model, q, "credits" ) ){
menu.credits_open = 1;
}
else if( MDL_CONST_PSTREQ( &menu.model, q, "credits" ) ){
menu.credits_open = 1;
}