projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
quite a lot of changes
[carveJwlIkooP6JGAAIwe30JlM.git]
/
menu.h
diff --git
a/menu.h
b/menu.h
index 32291c1c6e2a10855779c1377366181336a2cf8a..b8f509e7e4d805a466250edd107a593c726088e0 100644
(file)
--- a/
menu.h
+++ b/
menu.h
@@
-5,7
+5,6
@@
#include "model.h"
#include "world_render.h"
#include "player.h"
#include "model.h"
#include "world_render.h"
#include "player.h"
-#include "conf.h"
#include "shaders/model_menu.h"
#include "audio.h"
#include "input.h"
#include "shaders/model_menu.h"
#include "audio.h"
#include "input.h"
@@
-521,7
+520,8
@@
VG_STATIC void menu_render(void)
shader_blitcolour_uColour( colour );
render_fsquad();
shader_blitcolour_uColour( colour );
render_fsquad();
- if( workshop_form.page != k_workshop_form_hidden ){
+ if( (workshop_form.page != k_workshop_form_hidden) ||
+ (vg_ui.focused_control_type != k_ui_control_none) ){
return;
}
return;
}