projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a1741ec
)
ADWAIJDWAJ
author
hgn
<hgodden00@gmail.com>
Tue, 8 Nov 2022 04:49:19 +0000
(
04:49
+0000)
committer
hgn
<hgodden00@gmail.com>
Tue, 8 Nov 2022 04:49:19 +0000
(
04:49
+0000)
menu.h
patch
|
blob
|
history
player.h
patch
|
blob
|
history
diff --git
a/menu.h
b/menu.h
index f22789e0b1540c932da5c12c4c4c94e2af6cc996..d7c422d38d2beaf66959a3a5e9f65122d2a620a7 100644
(file)
--- a/
menu.h
+++ b/
menu.h
@@
-24,6
+24,8
@@
VG_STATIC u32 menu_page = 0;
VG_STATIC int cl_menu = 0,
cl_menu_go_away = 0;
VG_STATIC int cl_menu = 0,
cl_menu_go_away = 0;
+VG_STATIC int menu_enabled(void){ return cl_menu; }
+
VG_STATIC const char *playermodels[] = { "ch_new", "ch_jordan", "ch_outlaw" };
vg_tex2d tex_menu = { .path = "textures/menu.qoi",.flags = VG_TEXTURE_NEAREST };
VG_STATIC const char *playermodels[] = { "ch_new", "ch_jordan", "ch_outlaw" };
vg_tex2d tex_menu = { .path = "textures/menu.qoi",.flags = VG_TEXTURE_NEAREST };
@@
-32,7
+34,8
@@
VG_STATIC struct input_binding input_menu_h,
input_menu_v,
input_menu_press,
input_menu_back,
input_menu_v,
input_menu_press,
input_menu_back,
- input_menu_toggle;
+ input_menu_toggle,
+ input_menu_toggle_kbm;
VG_STATIC void menu_btn_paused( int event );
VG_STATIC void menu_btn_quit( int event );
VG_STATIC void menu_btn_paused( int event );
VG_STATIC void menu_btn_quit( int event );
@@
-131,16
+134,19
@@
VG_STATIC void menu_init(void)
vg_create_unnamed_input( &input_menu_back, k_input_type_button );
vg_create_unnamed_input( &input_menu_press, k_input_type_button );
vg_create_unnamed_input( &input_menu_toggle, k_input_type_button );
vg_create_unnamed_input( &input_menu_back, k_input_type_button );
vg_create_unnamed_input( &input_menu_press, k_input_type_button );
vg_create_unnamed_input( &input_menu_toggle, k_input_type_button );
+ vg_create_unnamed_input( &input_menu_toggle_kbm, k_input_type_button );
vg_apply_bind_str( &input_menu_h, "", "gp-ls-h" );
vg_apply_bind_str( &input_menu_h, "+", "d" );
vg_apply_bind_str( &input_menu_h, "-", "a" );
vg_apply_bind_str( &input_menu_h, "", "gp-ls-h" );
vg_apply_bind_str( &input_menu_h, "+", "d" );
vg_apply_bind_str( &input_menu_h, "-", "a" );
- vg_apply_bind_str( &input_menu_v, "", "gp-ls-v" );
+ vg_apply_bind_str( &input_menu_v, "", "
-
gp-ls-v" );
vg_apply_bind_str( &input_menu_v, "+", "w" );
vg_apply_bind_str( &input_menu_v, "-", "s" );
vg_apply_bind_str( &input_menu_press, "", "gp-a" );
vg_apply_bind_str( &input_menu_v, "+", "w" );
vg_apply_bind_str( &input_menu_v, "-", "s" );
vg_apply_bind_str( &input_menu_press, "", "gp-a" );
+ vg_apply_bind_str( &input_menu_press, "", "e" );
vg_apply_bind_str( &input_menu_back, "", "gp-b" );
vg_apply_bind_str( &input_menu_back, "", "gp-b" );
- vg_apply_bind_str( &input_menu_toggle, "", "\2escape" );
+ vg_apply_bind_str( &input_menu_back, "", "\2escape" );
+ vg_apply_bind_str( &input_menu_toggle_kbm, "", "\2escape" );
vg_apply_bind_str( &input_menu_toggle, "", "\2gp-menu" );
vg_linear_clear( vg_mem.scratch );
vg_apply_bind_str( &input_menu_toggle, "", "\2gp-menu" );
vg_linear_clear( vg_mem.scratch );
@@
-192,8
+198,8
@@
VG_STATIC void menu_run_directional(void)
if( menu_input_cooldown <= 0.0f )
{
if( menu_input_cooldown <= 0.0f )
{
- v2f dir = { input_menu_h.axis.value,
- input_menu_v.axis.value };
+ v2f dir = {
input_menu_h.axis.value,
+
-
input_menu_v.axis.value };
if( v2_length2( dir ) > 0.8f*0.8f )
{
if( v2_length2( dir ) > 0.8f*0.8f )
{
@@
-319,29
+325,43
@@
VG_STATIC void menu_update(void)
vg_input_update( 1, &input_menu_back );
vg_input_update( 1, &input_menu_press );
vg_input_update( 1, &input_menu_toggle );
vg_input_update( 1, &input_menu_back );
vg_input_update( 1, &input_menu_press );
vg_input_update( 1, &input_menu_toggle );
+ vg_input_update( 1, &input_menu_toggle_kbm );
+
+ int toggle_gp = vg_input_button_down( &input_menu_toggle ),
+ toggle_kb = vg_input_button_down( &input_menu_toggle_kbm ),
+ wait_for_a_sec = 0;
- if(
vg_input_button_down( &input_menu_toggle )
)
+ if(
toggle_gp || toggle_kb
)
{
if( cl_menu )
{
{
if( cl_menu )
{
- cl_menu_go_away = 1;
- menu_page = 0;
+ if( toggle_gp )
+ {
+ cl_menu_go_away = 1;
+ menu_page = 0;
+ }
}
else
{
}
else
{
+ if( toggle_kb )
+ wait_for_a_sec = 1;
+
cl_menu = 1;
menu_page = 1;
}
}
cl_menu = 1;
menu_page = 1;
}
}
- if( menu_page == 1 )
- menu_page_main();
- else if( menu_page == 2 )
- menu_page_skater();
- else if( menu_page == 4 )
- menu_page_map();
- else if( menu_page == 8 )
- menu_page_quit();
+ if( !wait_for_a_sec )
+ {
+ if( menu_page == 1 )
+ menu_page_main();
+ else if( menu_page == 2 )
+ menu_page_skater();
+ else if( menu_page == 4 )
+ menu_page_map();
+ else if( menu_page == 8 )
+ menu_page_quit();
+ }
struct menu_button *btn = &menu_buttons[ menu_loc ];
struct menu_button *btn = &menu_buttons[ menu_loc ];
diff --git
a/player.h
b/player.h
index 1edbc6ba08981fce86b63c8904294429ac6e95e8..f426b7daad07462dc915b518c36da249b0ff5fbc 100644
(file)
--- a/
player.h
+++ b/
player.h
@@
-413,6
+413,10
@@
VG_STATIC void player_mouseview(void)
player.angles[1] = vg_clampf( player.angles[1], -VG_PIf*0.5f, VG_PIf*0.5f );
}
player.angles[1] = vg_clampf( player.angles[1], -VG_PIf*0.5f, VG_PIf*0.5f );
}
+/* disaster */
+VG_STATIC int menu_enabled(void);
+#include "menu.h"
+
/* Deal with input etc */
VG_STATIC void player_update_pre(void)
{
/* Deal with input etc */
VG_STATIC void player_update_pre(void)
{
@@
-423,7
+427,7
@@
VG_STATIC void player_update_pre(void)
return;
}
return;
}
- if( vg_input_button_down( player.input_reset ) )
+ if( vg_input_button_down( player.input_reset )
&& !menu_enabled()
)
{
if( player.is_dead )
{
{
if( player.is_dead )
{
@@
-487,7
+491,7
@@
VG_STATIC void player_update_pre(void)
}
}
}
}
- if( vg_input_button_down( player.input_switch_mode ) )
+ if( vg_input_button_down( player.input_switch_mode )
&& !menu_enabled()
)
{
phys->on_board ^= 0x1;
{
phys->on_board ^= 0x1;
@@
-509,7
+513,7
@@
VG_STATIC void player_update_pre(void)
player_mouseview();
}
player_mouseview();
}
-VG_STATIC void player_update_fixed(void)
/* 2 */
+VG_STATIC void player_update_fixed(void) /* 2 */
{
if( player.rewinding )
return;
{
if( player.rewinding )
return;