projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some refactors before the storm
[carveJwlIkooP6JGAAIwe30JlM.git]
/
menu.h
diff --git
a/menu.h
b/menu.h
index cb823b4ea6208a0291142717bc0cfa3ac2900e1e..ca7cec188289979a340f960bffe58bab16525cb6 100644
(file)
--- a/
menu.h
+++ b/
menu.h
@@
-9,7
+9,7
@@
#include "audio.h"
#include "input.h"
#include "workshop.h"
#include "audio.h"
#include "input.h"
#include "workshop.h"
-#include "
respawn
.h"
+#include "
world_map
.h"
#include "gui.h"
#include "ent_miniworld.h"
#include "gui.h"
#include "ent_miniworld.h"
@@
-250,11
+250,9
@@
static void menu_trigger_item( ent_menuitem *item ){
if( MDL_CONST_PSTREQ( &menu.model, q, "quit" ) ){
vg.window_should_close = 1;
}
if( MDL_CONST_PSTREQ( &menu.model, q, "quit" ) ){
vg.window_should_close = 1;
}
-
else if( MDL_CONST_PSTREQ( &menu.model, q, "map" ) ){
else if( MDL_CONST_PSTREQ( &menu.model, q, "map" ) ){
-
menu_close();
menu_close();
-
respawn_begin_choos
er();
+
world_map_ent
er();
}
else if( MDL_CONST_PSTREQ( &menu.model, q, "hub" ) ){
if( world_static.active_instance == k_world_purpose_client ){
}
else if( MDL_CONST_PSTREQ( &menu.model, q, "hub" ) ){
if( world_static.active_instance == k_world_purpose_client ){