X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=steam.h;h=52b7a4fe6f8c9d9c9ddd8647a5c9567fc2354b9f;hb=bc40c302f1b8313bdd3c773fcfa2f850511c4634;hp=7bd0ab84a42bed5ae86d7695066cd306d2ef12ce;hpb=f99902f513b0ad606437bf32de47405dd4ea5f98;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/steam.h b/steam.h index 7bd0ab8..52b7a4f 100644 --- a/steam.h +++ b/steam.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved + * Copyright (C) 2021-2023 Mt.ZERO Software, Harry Godden - All Rights Reserved * All trademarks are property of their respective owners */ @@ -14,6 +14,7 @@ #include "vg/vg_steam_http.h" #include "vg/vg_steam_friends.h" #include "vg/vg_steam_user_stats.h" +#include "submodules/anyascii/impl/c/anyascii.c" /* * We only want to use steamworks if building for the networked version, @@ -160,8 +161,6 @@ VG_STATIC void steam_on_recieve_current_stats( CallbackMsg_t *msg ) } } -VG_STATIC ISteamInput *steam_hInput; - VG_STATIC u32 utf8_byte0_byte_count( u8 char0 ) { for( u32 k=2; k<4; k++ ){ @@ -261,10 +260,6 @@ VG_STATIC int steam_init(void) vg_console_reg_cmd( "ach_clear_all", steam_clear_all_achievements, NULL ); vg_console_reg_cmd( "ach_set", steam_set_achievemnt_test, NULL ); - steam_hInput = SteamAPI_SteamInput(); - SteamAPI_ISteamInput_Init( steam_hInput, 0 ); - SteamAPI_ISteamInput_RunFrame( steam_hInput, 0 ); - #endif /* TODO: On username update callback */ @@ -278,47 +273,6 @@ VG_STATIC void steam_update(void) { if( steam_ready ){ steamworks_event_loop( hSteamClientPipe ); - - /* TODO - * We can probably request this from SDL too - */ - if( steam_hInput ){ - SteamAPI_ISteamInput_RunFrame( steam_hInput, 0 ); - - InputHandle_t joy0 = SteamAPI_ISteamInput_GetControllerForGamepadIndex( - steam_hInput, 0 ); - - vg_input.controller_should_use_trackpad_look = 0; - if( joy0 != 0 ){ - ESteamInputType type = SteamAPI_ISteamInput_GetInputTypeForHandle( - steam_hInput, joy0 ); - - if( type == k_ESteamInputType_SteamController ){ - vg_input.controller_should_use_trackpad_look = 1; - menu_display_controller = k_menu_controller_type_steam; - } - else if( type == k_ESteamInputType_SteamDeckController ){ - menu_display_controller = k_menu_controller_type_steam_deck; - } - else if( type == k_ESteamInputType_PS3Controller || - type == k_ESteamInputType_PS4Controller || - type == k_ESteamInputType_PS5Controller ) - { - menu_display_controller = k_menu_controller_type_playstation; - } - else if( type == k_ESteamInputType_XBox360Controller || - type == k_ESteamInputType_XBoxOneController ) - { - menu_display_controller = k_menu_controller_type_xbox; - } - else{ - /* currently unsupported controller */ - menu_display_controller = k_menu_controller_type_xbox; - } - } - else - menu_display_controller = k_menu_controller_type_keyboard; - } } }