From 403bb2442600b86f50d842ec059eb3f54c8ca5ec Mon Sep 17 00:00:00 2001 From: hgn Date: Thu, 4 Jan 2024 13:33:41 +0000 Subject: [PATCH] add engine settings --- entity.c | 1 - input.h | 2 +- menu.h | 11 ++++++++++- models_src/rs_menu.mdl | Bin 4431864 -> 4441712 bytes workshop.h | 1 - world_entity.c | 3 ++- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/entity.c b/entity.c index 44b00df..2ff0cab 100644 --- a/entity.c +++ b/entity.c @@ -10,7 +10,6 @@ #include "ent_challenge.c" #include "ent_relay.c" #include "ent_route.c" -#include "ent_portal.c" #include "ent_miniworld.c" #include "ent_region.c" #include "ent_traffic.c" diff --git a/input.h b/input.h index 275c6a4..f957ffa 100644 --- a/input.h +++ b/input.h @@ -190,7 +190,7 @@ static srinput; static int input_filter_generic(void){ if( srinput.state != k_input_state_enabled || - vg_ui.wants_mouse || vg_console.enabled ) + vg_ui.wants_mouse || vg_console.enabled || vg.settings_open ) return 1; else return 0; diff --git a/menu.h b/menu.h index ca7cec1..73e048f 100644 --- a/menu.h +++ b/menu.h @@ -266,6 +266,9 @@ static void menu_trigger_item( ent_menuitem *item ){ else if( MDL_CONST_PSTREQ( &menu.model, q, "workshop" ) ){ workshop_submit_command(0,NULL); } + else if( MDL_CONST_PSTREQ( &menu.model, q, "engine" ) ){ + vg_settings_open(); + } else if( MDL_CONST_PSTREQ( &menu.model, q, "prem_store" ) ){ if( steam_ready ) SteamAPI_ISteamFriends_ActivateGameOverlayToStore( @@ -317,9 +320,12 @@ static void menu_update(void){ } int escape = button_down( k_srbind_mback ); - if( menu.credits_open ){ + if( menu.credits_open || vg.settings_open ){ if( escape ){ menu.credits_open = 0; + + if( vg.settings_open ) + vg_settings_close(); } return; } @@ -605,6 +611,9 @@ static void menu_render(void){ return; } + if( vg.settings_open ) + return; + if( menu.credits_open ){ ui_rect panel = { 0,0, 460, 400 }, screen = { 0,0, vg.window_x,vg.window_y }; diff --git a/models_src/rs_menu.mdl b/models_src/rs_menu.mdl index 58cf1266e1888b678672105bd68272e6fedaa3f3..56a1a9f2ce7b26cfa378e8303db4ff63508c4475 100644 GIT binary patch delta 12750 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 delta 2236 zcmZ{ke^3I>p#Afy48LkVHc|ZR~R#!yoPR zo%uZPe)oBv_j&f&ot^&Ko6PLsVdjX$zt0dt2_d^0Lv=g1?ZT_rYU(J`vrTb?Jk_yj zc?QuDf`OzEso%1rs=m505UQ)*5shu?=+M*S9cQCvRG)DiLl@y~D-zh*ShcyjJ`k#o z1`^T@l6#G zp0biq4nwfXxxBiaTk1B?Wf4;QPJb^A)BZ+HB4v7e`}f8DQ^USuA|xMr;zjP9kB~16 zgd7s#Pw@hGrizf~L_&7w0izYPv#;S(VeERy){0!iF9;b$)$ua?Kr3+WVU$?0Ap}1~ z$y|v&?v)TchbP6Oynx=TA^0<%^jnlR?2iX6Cvr1a37MsYgc~7`6SzBLG1<2VYEa(# zBO$q1=j|pqj51{=CO>~2E}(pRDJ6+Z2{E+8ibO&CyhO<*d?U}pk_1tkl1a%etg45i z1d)4)3Y#Pi$KZzv0(ViSWC~^Y7<48G+IP*A7_kXGT*BCqEJ_ZbYVL#w82gMhR;5;n zR^iILbgrcnC+Au^SQV3>^*{)F7}y_^1~{20a?__`sv-;@VygH%O7>yZw}#;n#-5s& zX<%9`a)!$>=g}*$aj~F1IWLo7FFN(Vk2QF31kNlLIL|P4h$DP70@qQ7KcwWek&sJQ z;ail|_b6F~Wlnz#SxExdjB=xfkPkkF7g3HqprjUar*6P&NrKk(WvoRXoJ|tB+7yOl zClj*obGV7lVX>sBv(sS6=wG@5 z3*-3<>o+l%-QoCPJiZE)#quI~3^aV6X z9Ks@tkSCCMM2kfI2}mNc7)e5s5goDwS&A$}Qjk<64Oxz)t9=2!@^we)1=FD1B@T|C zj(FebH+%o^Nxkneu7wX7FODbN8@PUs_&RUnpGYaX%U7`<8NcH#RZiXIZM0Usc9+*v zcBpdE;8|tn9&cgaI+GeMQBC)G17!;$PG6f+GKG;n>h38%fuVPlpZtR#q;1OjX+D>B zD!Zrozta+B(+m&nhQ2FdP#@0l+ZcLX+4L0#Jgatm#ebK&Dkg^qws&6sziqx-$%Su} zec`RW;q+eKwR3RUr;i85TT&nK$O=S{tVA-@)JLn{!!bXZ-ZJDcA|`dnA^hlT?VgQ2 z-d6)PgWt52m_@b3EWK){hn3IXFxu!x>QsgF7mj{k8QUV|x_*3fG@Sq5nD>>VzbY)P zsr#RiZ5e4F&>If<(k6Snk(z&nd#_y#D~c;1l~GA)4@leSjPfubRnc7Kg{{&>`n9@b zo3wcmy{Yc5mwwLDYijB)>2XTjNZQFF#s4>>qfunction == k_ent_function_trigger ){ u32 index = mdl_entity_id_id( call->id ); ent_ccmd *ccmd = mdl_arritm( &world->ent_ccmd, index ); - vg_execute_console_input( mdl_pstr(&world->meta, ccmd->pstr_command) ); + vg_execute_console_input( mdl_pstr(&world->meta, ccmd->pstr_command), + 0 ); } } -- 2.25.1