remove sub-world concept

[carveJwlIkooP6JGAAIwe30JlM.git] / world_sfd.c

diff --git a/world_sfd.c b/world_sfd.c
index b40d57a5896cf8ffad66360d4af238fc993b42da..9310aee6a52e21f54040b1f46a8f559e81010570 100644 (file)
--- a/world_sfd.c
+++ b/world_sfd.c
@@ -40,8 +40,7 @@ static f32 sfd_encode_glyph( char c ){
    return (float)value;
 }
 
-static void sfd_encode( u32 row, const char *str )
-{
+static void sfd_encode( u32 row, const char *str ){
    int end=0;
    u32 row_h = world_sfd.h -1 -row;
 
@@ -80,9 +79,8 @@ static void world_sfd_update( world_instance *world, v3f pos ){
          world_sfd.active_route_board = closest;
          ent_route *route = mdl_arritm( &world->ent_route, closest );
 
-         addon_reg *world_reg = world_static.addon_hub;
-         if( world_static.active_instance )
-            world_reg = world_static.addon_client;
+         addon_reg *world_reg = 
+            world_static.instance_addons[ world_static.active_instance ];
 
          char mod_uid[ ADDON_UID_MAX ];
          addon_alias_uid( &world_reg->alias, mod_uid );
@@ -91,21 +89,6 @@ static void world_sfd_update( world_instance *world, v3f pos ){
                mod_uid, 
                mdl_pstr( &world->meta, route->pstr_name ),
                0 );
-#if 0
-         u32 id = route->anon.official_track_id;
-
-         if( id != 0xffffffff ){
-            struct netmsg_board *local_board = 
-               &scoreboard_client_data.boards[id];
-
-            for( int i=0; i<13; i++ ){
-               sfd_encode( i, &local_board->data[27*i] );
-            }
-         }else{
-            sfd_encode( 0, mdl_pstr( &world->meta, route->pstr_name ) );
-            sfd_encode( 1, "No data" );
-         }
-#endif
       }
    }