From: hgn <hgodden00@gmail.com>
Date: Mon, 18 Dec 2023 00:20:23 +0000 (+0000)
Subject: network release 9
X-Git-Url: https://harrygodden.com/git/?p=carveJwlIkooP6JGAAIwe30JlM.git;a=commitdiff_plain;h=7b4f1548e85202dd34e4f849e56e042d73dbb6f2

network release 9
---

diff --git a/input.h b/input.h
index 2a19b40..275c6a4 100644
--- a/input.h
+++ b/input.h
@@ -107,7 +107,8 @@ static vg_input_op *input_button_list[] = {
 [k_srbind_sit]   = INPUT_BASIC( SDLK_z, SDL_CONTROLLER_BUTTON_B ),
 [k_srbind_lobby] = INPUT_BASIC( SDLK_TAB, SDL_CONTROLLER_BUTTON_DPAD_LEFT ),
 [k_srbind_chat ] = (vg_input_op[]){ vg_keyboard, SDLK_y, vg_end },
-[k_srbind_run ] = INPUT_BASIC( SDLK_LSHIFT, SDL_CONTROLLER_BUTTON_X ),
+[k_srbind_run ] = (vg_input_op[]){ vg_keyboard, SDLK_LSHIFT, 
+   vg_joy_axis, SDL_CONTROLLER_AXIS_TRIGGERLEFT, vg_end },
 
 [k_srbind_miniworld_resume]  = (vg_input_op[]){
    vg_keyboard, SDLK_RETURN, vg_gui_visible, 0,
diff --git a/models_src/rs_menu.mdl b/models_src/rs_menu.mdl
index 24f30b0..58cf126 100644
Binary files a/models_src/rs_menu.mdl and b/models_src/rs_menu.mdl differ
diff --git a/network_common.h b/network_common.h
index 8840247..d40ba25 100644
--- a/network_common.h
+++ b/network_common.h
@@ -10,7 +10,7 @@
 #define NETWORK_BUFFERFRAMES 6
 #define NETWORK_MAX_CHAT 128
 #define NETWORK_REGION_MAX 32
-#define NETWORK_SKATERIFT_VERSION 8
+#define NETWORK_SKATERIFT_VERSION 9
 #define NETWORK_REQUEST_MAX 2048
 
 #define NETWORK_LEADERBOARD_ALLTIME 0
diff --git a/player_skate.c b/player_skate.c
index 191c708..91265ce 100644
--- a/player_skate.c
+++ b/player_skate.c
@@ -3561,6 +3561,7 @@ static void player__skate_animator_exchange( bitpack_ctx *ctx, void *data ){
 
    bitpack_qf32( ctx, 16,  0.0f, 120.0f, &animator->push_time );
    bitpack_qf32( ctx, 16,  0.0f, 120.0f, &animator->jump_time );
+   bitpack_qf32( ctx, 16,  0.0f, 4.0f, &animator->handplant_t );
    bitpack_qv3f( ctx, 16, -100.0f, 100.0f, animator->root_v );
    bitpack_bytes( ctx, 1, &animator->activity );
 }
diff --git a/player_walk.c b/player_walk.c
index 040426b..eacdeeb 100644
--- a/player_walk.c
+++ b/player_walk.c
@@ -264,6 +264,7 @@ static void player_walk_pre_ground(void){
    if( button_down(k_srbind_sit) ){
       v3_zero( localplayer.rb.v );
       w->state.activity = k_walk_activity_sit;
+      w->state.transition_t = 0.0f;
       return;
    }
 
@@ -1124,8 +1125,7 @@ static void player__walk_animator_exchange( bitpack_ctx *ctx, void *data ){
    bitpack_qv3f( ctx, 24, -1024.0f, 1024.0f, animator->root_co );
    bitpack_qquat( ctx, animator->root_q );
    bitpack_qf32( ctx, 8, 0.0f, 1.0f, &animator->fly );
-   bitpack_qf32( ctx, 8, 0.0f, 1.0f, &animator->run );
-   bitpack_qf32( ctx, 8, 0.0f, 1.0f, &animator->walk );
+   bitpack_qf32( ctx, 8, 0.0f, k_runspeed, &animator->run );
    bitpack_qf32( ctx, 16, 0.0f, 120.0f, &animator->walk_timer );
 
    for( int i=0; i<1; i++ ){ /* without this you get a warning from gcc. lol */
diff --git a/skaterift.c b/skaterift.c
index 1700dc7..5ae3042 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -176,6 +176,7 @@ static void skaterift_load_world_content(void){
    skaterift_mount_world_unloadable( "maps/mp_mtzero", 
          ADDON_REG_MTZERO|ADDON_REG_PREMIUM );
    skaterift_mount_world_unloadable( "maps/dev_tutorial", 0 );
+   skaterift_mount_world_unloadable( "maps/dev_flatworld", 0 );
 
    world_static.load_state = k_world_loader_load;