buggssss

diff --git a/build.c b/build.c
index d219024ffd3f152e99e7e646644440534d4a451f..731bc10f56e2cd2fc51af6ae332dd4694ecefb49 100644 (file)
--- a/build.c
+++ b/build.c
@@ -505,6 +505,24 @@ void s_dbtest_build(void)
 int main( int argc, const char *argv[] )
 {
    vg_log_init();
+
+#if 0
+   vg_stack_allocator s0;
+   vg_stack_init( &s0, NULL, VG_MB(2), NULL );
+   u32 size0;
+   void *buf0 = vg_file_read( &s0, "content_skaterift/textures/prem.qoi", &size0, 0 );
+   vg_mem_dumphex( stdout, buf0, 0, 1024 );
+
+   vg_stack_allocator s1;
+   vg_stack_init( &s1, NULL, VG_MB(2), NULL );
+   u32 size1;
+   void *buf1 = vg_file_read( &s1, "content_skaterift/textures/guide_pump.qoi", &size1, 0 );
+   
+   vg_mem_dumphex( stdout, buf1, 0, 1024 );
+
+   return 0;
+#endif
+
    _vg_opt_init( argc, argv );
 
    const char *arg;

diff --git a/src/board_maker.c b/src/board_maker.c
index e53e803007350cc460160e5c9cc6560313044e38..2a211af08c57e19dcb1f48cb0faef375a934079d 100644 (file)
--- a/src/board_maker.c
+++ b/src/board_maker.c
@@ -112,7 +112,7 @@ const char *_board_maker_template_paths[] =
 static void _board_maker_load_template( void *_ )
 {
    THREAD_1;
-   vg_stack_free( &_board_maker.template_stack );
+   vg_stack_clear( &_board_maker.template_stack );
 
    mdl_context *mdl = &_board_maker.template_mdl;
    mdl_open( mdl, _board_maker_template_paths[_board_maker.template_selection], &_board_maker.template_stack );

diff --git a/src/font.h b/src/font.h
index c5504c7863f4c3eb8e5502e20349d1be55f608f7..c1da41c5be748588388f5f61606b193ceb70fa20 100644 (file)
--- a/src/font.h
+++ b/src/font.h
@@ -83,6 +83,7 @@ struct font3d{
 
 static void font3d_load( font3d *font, const char *mdl_path, void *alloc )
 {
+   THREAD_1;
    mdl_context *mdl = &font->mdl;
    mdl_open( mdl, mdl_path, alloc );
    mdl_load_metadata_block( mdl, alloc );

diff --git a/src/gui.h b/src/gui.h
index cf506b20d9bf79f98aff0782f325db32f30bf386..51ef911a97678fdff54a85fa41aeed3e26da7d29 100644 (file)
--- a/src/gui.h
+++ b/src/gui.h
@@ -354,6 +354,7 @@ void gui_register(void)
 
 static void gui_init(void)
 {
+   THREAD_1;
    font3d_load( &gui.font, "models/rs_font.mdl", &vg.rtmem );
 
    /* load icons */

diff --git a/src/player_glide.c b/src/player_glide.c
index 6c077c3ac63f56dd7e1057e5f287ac774f57a4fe..2063040e1cb131bbac3f4681a604d34a5a82f603 100644 (file)
--- a/src/player_glide.c
+++ b/src/player_glide.c
@@ -401,6 +401,7 @@ void player_glide_register(void)
 
 void player_glide_bind(void)
 {
+   THREAD_1;
    f32 mass = 0.0f,k_density = 8.0f;
    m3x3f I;
    m3x3_zero( I );

diff --git a/src/world_entity.c b/src/world_entity.c
index a25d176a8edc03a625c3ff868b64e700317ee7bd..18d36caa2597885d55446e43aca46f9ffd8a63eb 100644 (file)
--- a/src/world_entity.c
+++ b/src/world_entity.c
@@ -45,6 +45,8 @@ static void _event_trigger( ent_event *event );
 
 void world_gen_entities_init( world_instance *world )
 {
+   THREAD_1;
+
    /* lights */
    for( u32 j=0; j<af_arrcount(&world->ent_light); j ++ )
    {

diff --git a/src/world_gate.c b/src/world_gate.c
index 9e673d211d47984be0ae9b9a36b06db109e2f555..493ea33c932067d81e500b8f3c1070df9d105048 100644 (file)
--- a/src/world_gate.c
+++ b/src/world_gate.c
@@ -48,6 +48,7 @@ void gate_transform_update( ent_gate *gate )
 
 void world_gates_init(void)
 {
+   THREAD_1;
    vg_info( "world_gates_init\n" );
    vg_stack_clear( &vg.scratch );
 

diff --git a/src/world_gen.c b/src/world_gen.c
index 5ba4b68f0293c2e0a1bdcc2286bbbc12777b1890..314ef3257e34291912de9713017ff0eabc657f7b 100644 (file)
--- a/src/world_gen.c
+++ b/src/world_gen.c
@@ -731,6 +731,7 @@ void async_world_postprocess( void *userdata )
 /* Loads textures from the pack file */
 void world_gen_load_surfaces( world_instance *world )
 {
+   THREAD_1;
    if( _world.loader_preview_mode )
    {
       world->texture_count = 0;

diff --git a/src/world_map.c b/src/world_map.c
index 4488dcaecf8b1aef26fee3ab7800158d2447ecdb..7e9f5bca4906f13597c867e92937b56a97bf326a 100644 (file)
--- a/src/world_map.c
+++ b/src/world_map.c
@@ -391,7 +391,7 @@ void render_world_map(void)
                v4_copy( route->colour, colour );
                v3_muls( colour, 1.6666f, colour );
                gui_icon_setcolour( colour );
-               respawn_map_draw_icon( &world_map.final_cam, k_gui_icon_rift_run_2d, route->anon.transform.co, 0.5f );
+               respawn_map_draw_icon( &world_map.final_cam, k_gui_icon_run, route->anon.transform.co, 0.5f );
             }
          }
       }

diff --git a/src/world_render.c b/src/world_render.c
index cc08328bbb9bd517396bef209bb545602168a220..8023f0b032abc04de75a38a48f1751d50da006ee 100644 (file)
--- a/src/world_render.c
+++ b/src/world_render.c
@@ -54,6 +54,7 @@ void world_render_register(void)
 
 void world_render_init(void)
 {
+   THREAD_1;
    vg_info( "Loading world resources\n" );
    vg_stack_clear( &vg.scratch );
 

diff --git a/src/world_sfd.c b/src/world_sfd.c
index 9a39a9a5350a9827e2c7b825aa906cdaaae134d1..04a0585f57a6dc4365f9d8d1fdd512341e8295d8 100644 (file)
--- a/src/world_sfd.c
+++ b/src/world_sfd.c
@@ -310,6 +310,7 @@ void sfd_render( world_instance *world, vg_camera *cam, m4x3f transform )
 
 void world_sfd_init(void)
 {
+   THREAD_1;
    vg_info( "world_sfd_init\n" );
    vg_stack_clear( &vg.scratch );