X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=steam.h;h=dcfc1c8bb970335eaad43809b92311a9c6e6e76e;hb=5f5d02725031cad23f1cab3290b8a9d661c89728;hp=52b7a4fe6f8c9d9c9ddd8647a5c9567fc2354b9f;hpb=b3ca3b7a45eec11c46eb19772e10021177665adb;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/steam.h b/steam.h
index 52b7a4f..dcfc1c8 100644
--- a/steam.h
+++ b/steam.h
@@ -27,9 +27,9 @@
  * nothing.
  */
 
-VG_STATIC char steam_username_at_startup[128];
+static char steam_username_at_startup[128] = "Unassigned";
 
-VG_STATIC void recv_steam_warning( int severity, const char *msg )
+static void recv_steam_warning( int severity, const char *msg )
 {
    if( severity == 0 )
       vg_low( "%s\n", msg );
@@ -37,34 +37,42 @@ VG_STATIC void recv_steam_warning( int severity, const char *msg )
       vg_info( "%s\n", msg );
 }
 
-VG_STATIC int steam_ready = 0,
-           steam_stats_ready = 0;
+static int steam_ready = 0,
+              steam_stats_ready = 0;
 
-VG_STATIC void *hSteamNetworkingSockets,
+static void *hSteamNetworkingSockets,
             *hSteamUser;
 
-VG_STATIC ISteamUserStats *hSteamUserStats;
-VG_STATIC HSteamPipe hSteamClientPipe;
+static ISteamUserStats *hSteamUserStats;
+static HSteamPipe hSteamClientPipe;
 
-VG_STATIC const char *steam_achievement_names[] = 
+static const char *steam_achievement_names[] = 
 {
    "ALBERT", "MARC", 
    "ROUTE_MPY", "ROUTE_MPG", "ROUTE_MPB", "ROUTE_MPR",
    "ROUTE_TO", "ROUTE_TC"
 };
 
-VG_STATIC void steam_store_achievements(void)
+static void steam_store_achievements(void)
 {
    if( steam_ready && steam_stats_ready ){
       SteamAPI_ISteamUserStats_StoreStats( hSteamUserStats );
    }
 }
 
-VG_STATIC void steam_set_achievement( const char *name )
-{
+static void update_ach_models(void);
+static void steam_set_achievement( const char *name ){
+   /* hack lol */
+   if( !strcmp(name,"MARC") ) skaterift.achievements |= 0x1;
+   if( !strcmp(name,"ALBERT") ) skaterift.achievements |= 0x2;
+   if( !strcmp(name,"JANET") ) skaterift.achievements |= 0x4;
+   if( !strcmp(name,"BERNADETTA") ) skaterift.achievements |= 0x8;
+   update_ach_models();
+
    if( steam_ready && steam_stats_ready ){
       if( SteamAPI_ISteamUserStats_SetAchievement( hSteamUserStats, name ) ){
          vg_success( "Achievement set! '%s'\n", name );
+
       }
       else{
          vg_warn( "Failed to set achievement: %s\n", name );
@@ -75,7 +83,7 @@ VG_STATIC void steam_set_achievement( const char *name )
    }
 }
 
-VG_STATIC void steam_clear_achievement( const char *name )
+static void steam_clear_achievement( const char *name )
 {
    if( steam_ready && steam_stats_ready ){
       if( SteamAPI_ISteamUserStats_ClearAchievement( hSteamUserStats, name ) ){
@@ -91,13 +99,12 @@ VG_STATIC void steam_clear_achievement( const char *name )
 }
 
 
-VG_STATIC int steam_list_achievements( int argc, char const *argv[] )
-{
+static void steam_print_all_achievements(void){
    vg_info( "Achievements: \n" );
 
    if( steam_ready && steam_stats_ready ){
       for( int i=0; i<vg_list_size(steam_achievement_names); i++ ){
-         int set = 0;
+         steamapi_bool set = 0;
          const char *name = steam_achievement_names[i];
 
          if( SteamAPI_ISteamUserStats_GetAchievement( 
@@ -113,41 +120,42 @@ VG_STATIC int steam_list_achievements( int argc, char const *argv[] )
    else{
       vg_warn( "  Steam is not initialized, no results\n" );
    }
-
-   return 0;
 }
 
-VG_STATIC int steam_clear_all_achievements( int argc, char const *argv[] )
+static int steam_achievement_ccmd( int argc, char const *argv[] )
 {
-   if( steam_ready && steam_stats_ready ){
-      for( int i=0; i<vg_list_size(steam_achievement_names); i++ ){
-         steam_clear_achievement( steam_achievement_names[i] );
+   if( !(steam_ready && steam_stats_ready) ) return 1;
+
+   if( argc == 1 ){
+      if( !strcmp( argv[0], "list" ) ){
+         steam_print_all_achievements();
+         return 0;
+      }
+      else if( !strcmp( argv[0], "clearall" )){
+         for( int i=0; i<vg_list_size(steam_achievement_names); i++ )
+            steam_clear_achievement( steam_achievement_names[i] );
+         
+         steam_store_achievements();
       }
-      
-      steam_store_achievements();
-   }
-   else{
-      vg_warn( "steam is not initialized, cannot clear\n" );
    }
 
-   return 0;
-}
-
-VG_STATIC int steam_set_achievemnt_test( int argc, char const *argv[] )
-{
-   if( argc < 2 )
-      return 0;
-
-   if( strcmp( argv[0], "monkey_island" ) )
-      return 0;
-
-   steam_set_achievement( argv[1] );
-   steam_store_achievements();
+   if( argc == 2 ){
+      if( !strcmp( argv[0], "set" ) ){
+         steam_set_achievement( argv[1] );
+         steam_store_achievements();
+         return 0;
+      }
+      else if( strcmp( argv[0], "clear" ) ){
+         steam_clear_achievement( argv[1] );
+         steam_store_achievements();
+         return 0;
+      }
+   }
 
-   return 0;
+   return 1;
 }
 
-VG_STATIC void steam_on_recieve_current_stats( CallbackMsg_t *msg )
+static void steam_on_recieve_current_stats( CallbackMsg_t *msg )
 {
    UserStatsReceived_t *rec = (UserStatsReceived_t *)msg->m_pubParam;
 
@@ -155,13 +163,32 @@ VG_STATIC void steam_on_recieve_current_stats( CallbackMsg_t *msg )
       vg_info( "Recieved stats for: %lu (user: %lu)\n", rec->m_nGameID,
                                                         rec->m_steamIDUser );
       steam_stats_ready = 1;
+
+      steamapi_bool set = 0;
+      if( SteamAPI_ISteamUserStats_GetAchievement( 
+               hSteamUserStats, "MARC", &set ) ){
+         if( set ) skaterift.achievements |= 0x1;
+      }
+      if( SteamAPI_ISteamUserStats_GetAchievement( 
+               hSteamUserStats, "ALBERT", &set ) ){
+         if( set ) skaterift.achievements |= 0x2;
+      }
+      if( SteamAPI_ISteamUserStats_GetAchievement( 
+               hSteamUserStats, "JANET", &set ) ){
+         if( set ) skaterift.achievements |= 0x4;
+      }
+      if( SteamAPI_ISteamUserStats_GetAchievement( 
+               hSteamUserStats, "BERNADETTA", &set ) ){
+         if( set ) skaterift.achievements |= 0x8;
+      }
+      update_ach_models();
    }
    else{
       vg_error( "Error recieveing stats for user (%u)\n", rec->m_eResult );
    }
 }
 
-VG_STATIC u32 utf8_byte0_byte_count( u8 char0 )
+static u32 utf8_byte0_byte_count( u8 char0 )
 {
    for( u32 k=2; k<4; k++ ){
       if( !(char0 & (0x80 >> k)) )
@@ -171,13 +198,12 @@ VG_STATIC u32 utf8_byte0_byte_count( u8 char0 )
    return 0;
 }
 
-VG_STATIC void str_utf8_collapse( const char *str, char *buf, u32 length )
-{
+static u32 str_utf8_collapse( const char *str, char *buf, u32 length ){
    u8 *ustr = (u8 *)str;
    u32 utf32_code = 0x00000000;
    u32 i=0, j=0, utf32_byte_ct=0;
 
-   for(;i < length-1;){
+   for(;j < length-1;){
       if( ustr[i] == 0x00 )
          break;
       
@@ -210,11 +236,11 @@ VG_STATIC void str_utf8_collapse( const char *str, char *buf, u32 length )
    }
 
    buf[j] = 0x00;
+   return j;
 }
 
-VG_STATIC int steam_init(void)
-{
-   const char *username = NULL;
+static int steam_init(void){
+   const char *username = "offline player";
 
 #ifdef SR_NETWORKED
    vg_info( "Initializing steamworks\n" );
@@ -248,7 +274,6 @@ VG_STATIC int steam_init(void)
     * --------------------------------------------------------
     */
    hSteamUserStats = SteamAPI_SteamUserStats();
-
    steam_register_callback( k_iUserStatsReceived,
                             steam_on_recieve_current_stats );
 
@@ -256,9 +281,7 @@ VG_STATIC int steam_init(void)
       vg_warn( "No Steam Logon: Cannot request stats\n" );
 
 
-   vg_console_reg_cmd( "ach_list", steam_list_achievements, NULL );
-   vg_console_reg_cmd( "ach_clear_all", steam_clear_all_achievements, NULL );
-   vg_console_reg_cmd( "ach_set", steam_set_achievemnt_test, NULL );
+   vg_console_reg_cmd( "ach", steam_achievement_ccmd, NULL );
 
 #endif
 
@@ -269,14 +292,14 @@ VG_STATIC int steam_init(void)
    return 1;
 }
 
-VG_STATIC void steam_update(void)
+static void steam_update(void)
 {
    if( steam_ready ){
       steamworks_event_loop( hSteamClientPipe );
    }
 }
 
-VG_STATIC void steam_end(void)
+static void steam_end(void)
 {
    if( steam_ready ){
       vg_info( "Shutting down\n..." );