scoreboards

diff --git a/highscores.h b/highscores.h
index d99710e480cdf59f142ba126707f86995cdd740c..28662bfa0a403c2b15f9fa1f56525ab828a71881 100644 (file)
--- a/highscores.h
+++ b/highscores.h
@@ -568,7 +568,7 @@ static void highscores_board_generate( char *buf, u32 id, u32 count )
 
    highscore_strc ( buf+w*0, inf->name, w,w );
    highscore_clear( buf+w*1, '-', w );
 
    highscore_strc ( buf+w*0, inf->name, w,w );
    highscore_clear( buf+w*1, '-', w );

-   highscore_strl ( buf+w*2, " #|  Player  | Time  | Pts", 27 );
+   highscore_strl ( buf+w*2, " #|     Player     | Time  ", 27 );

 
    for( int i=0; i<count; i++ )
    {
 
    for( int i=0; i<count; i++ )
    {


@@ -589,13 +589,13 @@ static void highscores_board_generate( char *buf, u32 id, u32 count )
       
       /* Player name */
       if( info_ptr == AATREE_PTR_NIL )
       
       /* Player name */
       if( info_ptr == AATREE_PTR_NIL )

-         highscore_strl( line+3, "unknown", 10 );
+         highscore_strl( line+3, "unknown", 16 );

       else
       {
          highscore_playerinfo *inf = aatree_get_data( 
                &sys->aainfo_playerinfo_playerid, info_ptr );
 
       else
       {
          highscore_playerinfo *inf = aatree_get_data( 
                &sys->aainfo_playerinfo_playerid, info_ptr );
 

-         highscore_strl( line+3, inf->nickname, 10 );
+         highscore_strl( line+3, inf->nickname, 16 );

       }
 
       u16 centiseconds = record->time,
       }
 
       u16 centiseconds = record->time,


@@ -609,14 +609,16 @@ static void highscores_board_generate( char *buf, u32 id, u32 count )
       if( minutes > 9 ) minutes = 9;
       
       /* Timer */
       if( minutes > 9 ) minutes = 9;
       
       /* Timer */

-      highscore_intr( line+14, minutes, 1, '0' );
-      line[15] = ':';
-      highscore_intr( line+16, seconds, 2, '0' );
-      line[18] = '.';
-      highscore_intr( line+19, centiseconds, 2, '0' );
+      highscore_intr( line+20, minutes, 1, '0' );
+      line[21] = ':';
+      highscore_intr( line+22, seconds, 2, '0' );
+      line[24] = '.';
+      highscore_intr( line+25, centiseconds, 2, '0' );

 
 

+#if 0

       /* Score */
       highscore_intl( line+22, record->points, 5 );
       /* Score */
       highscore_intl( line+22, record->points, 5 );

+#endif

       it = aatree_next( &sys->aainfo_time, it );
    }
 }
       it = aatree_next( &sys->aainfo_time, it );
    }
 }

diff --git a/network_msg.h b/network_msg.h
index 221e6ef1260d2b7050191f46b15a805574c36ce4..1e3e4754adefe39499a01b51697710e4d27f90e5 100644 (file)
--- a/network_msg.h
+++ b/network_msg.h
@@ -55,7 +55,7 @@ typedef struct netmsg_set_nickname netmsg_set_nickname;
 struct netmsg_set_nickname
 {
    u32 inetmsg_id;
 struct netmsg_set_nickname
 {
    u32 inetmsg_id;

-   char nickname[10];
+   char nickname[16];

 };
 enum{ k_inetmsg_set_nickname = 4 };
 
 };
 enum{ k_inetmsg_set_nickname = 4 };
 

diff --git a/shaders/scoretext.h b/shaders/scoretext.h
index 99b702c088c0f418bcbac3a54ad68ad8e190a205..4f1dc8f9546775c85f7cc0eed1f516a015e9a63f 100644 (file)
--- a/shaders/scoretext.h
+++ b/shaders/scoretext.h
@@ -36,7 +36,7 @@ static struct vg_shader _shader_scoretext = {
 "   float s = -sin(w*0.2);\n"
 "   float r = 0.2;\n"
 "\n"
 "   float s = -sin(w*0.2);\n"
 "   float r = 0.2;\n"
 "\n"

-"   float w1 = clamp( w*4.0 - a_co.y*10.0, -1.0, 1.0 ) *(3.14159265*0.5);\n"
+"   float w1 = clamp( w*4.0 - a_co.y*10.0, -1.0, 1.0 ) * (3.14159265*2.5);\n"

 "   float c1 = cos(w1);\n"
 "   float s1 = sin(w1);\n"
 "\n"
 "   float c1 = cos(w1);\n"
 "   float s1 = sin(w1);\n"
 "\n"

diff --git a/shaders/scoretext.vs b/shaders/scoretext.vs
index f8a940cc7386c96a23b9e74e262cd4eb131c07e5..bcd5b9507cb55af555f53b81a796e48c5a8e6dbb 100644 (file)
--- a/shaders/scoretext.vs
+++ b/shaders/scoretext.vs
@@ -18,7 +18,7 @@ void main()
    float s = -sin(w*0.2);
    float r = 0.2;
 
    float s = -sin(w*0.2);
    float r = 0.2;
 

-   float w1 = clamp( w*4.0 - a_co.y*10.0, -1.0, 1.0 ) *(3.14159265*0.5);
+   float w1 = clamp( w*4.0 - a_co.y*10.0, -1.0, 1.0 ) * (3.14159265*0.5);

    float c1 = cos(w1);
    float s1 = sin(w1);
 
    float c1 = cos(w1);
    float s1 = sin(w1);
 

diff --git a/upload_to_steam.sh b/upload_to_steam.sh
old mode 100644 (file)
new mode 100755 (executable)
index 9db81a2..9e7d7f1
--- a/upload_to_steam.sh
+++ b/upload_to_steam.sh
@@ -1 +1 @@
-steamworks_sdk/tools/ContentBuilder/builder_linux/steamcmd.sh +login $1 $2 +run_app_build steam_build_script.vdf
+steamworks_sdk/tools/ContentBuilder/builder_linux/steamcmd.sh +login $1 $2 +run_app_build ~/Documents/carve/steam_build_script.vdf

diff --git a/world_sfd.h b/world_sfd.h
index 71e8a94afdb738937ffbbabb2bd9d7c6a0a99781..29244e8c843caf70dfcb3ad73b3e60323b3a6035 100644 (file)
--- a/world_sfd.h
+++ b/world_sfd.h
@@ -180,7 +180,7 @@ static void world_sfd_init(void)
    m4x3f identity;
    m4x3_identity( identity );
 
    m4x3f identity;
    m4x3_identity( identity );
 

-   for( int i=0;i<8;i++ )
+   for( int i=4;i<6;i++ )

    {
       u32 vert_start = sfd->mesh.vertex_count;
       scene_add_submesh( &sfd->mesh, mboard, card, identity );
    {
       u32 vert_start = sfd->mesh.vertex_count;
       scene_add_submesh( &sfd->mesh, mboard, card, identity );