From fdc5e8760fb7ac0af8e7ebb98a2076db15e31082 Mon Sep 17 00:00:00 2001 From: aura Date: Mon, 16 Mar 2026 10:15:01 +0100 Subject: giga refactor, fix ALL the leaks --- src/game/world/map.cpp | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'src/game/world/map.cpp') diff --git a/src/game/world/map.cpp b/src/game/world/map.cpp index a44f191..5f1f5d7 100644 --- a/src/game/world/map.cpp +++ b/src/game/world/map.cpp @@ -1,4 +1,4 @@ -#include +#include #include "map.h" #include "../../game.h" @@ -83,7 +83,7 @@ STAT map_polygon_verts_from_section( WORLD_MAP* m, MAP_POLYGON* p, CFG_SECTION* sprintf( vertsec, "%d", i ); CFG_SECTION* v = cfg_section( vertices, vertsec ); if( !v ) { - dlog( "map_polygon_verts_from_section() : missing vertex %d in polygon with propid %d in map %s\n", i, p->propid, m->name ); + dlog( "map_polygon_verts_from_section() : missing vertex %d in polygon with propid %d in map %s\n", i, p->propid.id, m->name.data ); continue; } @@ -92,7 +92,7 @@ STAT map_polygon_verts_from_section( WORLD_MAP* m, MAP_POLYGON* p, CFG_SECTION* CFG_CLR* clr = cfg_clr( v, "clr" ); if( !pos ) { - dlog( "map_polygon_verts_from_section() : missing pos for vertex %d in polygon with propid %d in map %s\n", i, p->propid, m->name ); + dlog( "map_polygon_verts_from_section() : missing pos for vertex %d in polygon with propid %d in map %s\n", i, p->propid.id, m->name.data ); return STAT_ERR; } @@ -104,7 +104,7 @@ STAT map_polygon_verts_from_section( WORLD_MAP* m, MAP_POLYGON* p, CFG_SECTION* } if( !p->vertices.size ) { - dlog( "map_polygon_verts_from_section() : invalid vertex count for polygon with propid %d in map %s\n", p->propid, m->name ); + dlog( "map_polygon_verts_from_section() : invalid vertex count for polygon with propid %d in map %s\n", p->propid.id, m->name.data ); return STAT_ERR; } @@ -126,7 +126,7 @@ void map_polygon_calc_bounds( MAP_POLYGON* p ) { STAT map_polygons_from_section( WORLD_MAP* m, GAME_DATA* g, CFG_SECTION* polygons, U32 polyc ) { if( !polyc ) { - dlog( "map_polygons_from_section() : no polygons in %s\n", m->name ); + dlog( "map_polygons_from_section() : no polygons in %s\n", m->name.data ); return STAT_OK; } @@ -138,20 +138,20 @@ STAT map_polygons_from_section( WORLD_MAP* m, GAME_DATA* g, CFG_SECTION* polygon sprintf( polysec, "%d", i ); CFG_SECTION* p = cfg_section( polygons, polysec ); if( !p ) { - dlog( "map_polygons_from_section() : missing polygon %d in %s\n", i, m->name ); + dlog( "map_polygons_from_section() : missing polygon %d in %s\n", i, m->name.data ); continue; } CFG_INT* propid = cfg_int( p, "propid" ); if( !propid ) { - dlog( "map_polygons_from_section() : missing propid for polygon %d in map %s\n", i, m->name ); + dlog( "map_polygons_from_section() : missing propid for polygon %d in map %s\n", i, m->name.data ); continue; } poly.propid = propid->value; CFG_INT* polytype = cfg_int( p, "type" ); if( !polytype ) { - dlog( "map_polygons_from_section() : missing polygon type for polygon %d in %s\n", i, m->name ); + dlog( "map_polygons_from_section() : missing polygon type for polygon %d in %s\n", i, m->name.data ); continue; } @@ -159,13 +159,13 @@ STAT map_polygons_from_section( WORLD_MAP* m, GAME_DATA* g, CFG_SECTION* polygon CFG_INT* vertc = cfg_int( p, "vertcount" ); if( !vertc || !vertc->value ) { - dlog( "map_polygons_from_section() : missing vertex count for polygon %d in %s\n", i, m->name ); + dlog( "map_polygons_from_section() : missing vertex count for polygon %d in %s\n", i, m->name.data ); continue; } CFG_SECTION* vertices = cfg_section( p, "vertices" ); if( !vertices ) { - dlog( "map_polygons_from_section() : missing vertices for polygon %d in %s", i, m->name ); + dlog( "map_polygons_from_section() : missing vertices for polygon %d in %s", i, m->name.data ); continue; } @@ -182,7 +182,7 @@ STAT map_polygons_from_section( WORLD_MAP* m, GAME_DATA* g, CFG_SECTION* polygon STAT map_walls_from_section( WORLD_MAP* m, GAME_DATA* g, CFG_SECTION* walls, U32 wallc ) { if( !wallc ) { - dlog( "map_walls_from_section() : no walls in %s\n", m->name ); + dlog( "map_walls_from_section() : no walls in %s\n", m->name.data ); return STAT_OK; } @@ -194,7 +194,7 @@ STAT map_walls_from_section( WORLD_MAP* m, GAME_DATA* g, CFG_SECTION* walls, U32 sprintf( wallsec, "%d", i ); CFG_SECTION* w = cfg_section( walls, wallsec ); if( !w ) { - dlog( "map_walls_from_section() : missing wall %d in %s\n", i, m->name ); + dlog( "map_walls_from_section() : missing wall %d in %s\n", i, m->name.data ); continue; } @@ -203,7 +203,7 @@ STAT map_walls_from_section( WORLD_MAP* m, GAME_DATA* g, CFG_SECTION* walls, U32 CFG_INT* prop = cfg_int( w, "propid" ); if( !start || !end || !prop ) { - dlog( "map_walls_from_section() : bad wall definition in %s idx %d [%p %p %p]\n", m->name, i, start, end, prop ); + dlog( "map_walls_from_section() : bad wall definition in %s idx %d [%p %p %p]\n", m->name.data, i, start, end, prop ); continue; } @@ -221,7 +221,7 @@ STAT map_walls_from_section( WORLD_MAP* m, GAME_DATA* g, CFG_SECTION* walls, U32 STAT map_props_from_section( WORLD_MAP* m, GAME_DATA* g, CFG_SECTION* props, U32 propc ) { if( !propc ) { - dlog( "map_props_from_section() : no props in %s\n", m->name ); + dlog( "map_props_from_section() : no props in %s\n", m->name.data ); return STAT_ERR; } @@ -233,7 +233,7 @@ STAT map_props_from_section( WORLD_MAP* m, GAME_DATA* g, CFG_SECTION* props, U32 sprintf( propsec, "%d", i ); CFG_SECTION* p = cfg_section( props, propsec ); if( !p ) { - dlog( "map_props_from_section() : missing prop %d in %s\n", i, m->name ); + dlog( "map_props_from_section() : missing prop %d in %s\n", i, m->name.data ); continue; } @@ -261,7 +261,7 @@ STAT map_props_from_section( WORLD_MAP* m, GAME_DATA* g, CFG_SECTION* props, U32 STAT map_sprites_from_section( WORLD_MAP* m, GAME_DATA* g, CFG_SECTION* sprites, U32 spritec ) { if( !spritec ) { - dlog( "map_sprites_from_section() : no sprites in %s\n", m->name ); + dlog( "map_sprites_from_section() : no sprites in %s\n", m->name.data ); return STAT_OK; } @@ -273,7 +273,7 @@ STAT map_sprites_from_section( WORLD_MAP* m, GAME_DATA* g, CFG_SECTION* sprites, sprintf( spritesec, "%d", i ); CFG_SECTION* s = cfg_section( sprites, spritesec ); if( !s ) { - dlog( "map_sprites_from_section() : missing sprite %d in %s\n", i, m->name ); + dlog( "map_sprites_from_section() : missing sprite %d in %s\n", i, m->name.data ); continue; } @@ -283,7 +283,7 @@ STAT map_sprites_from_section( WORLD_MAP* m, GAME_DATA* g, CFG_SECTION* sprites, CFG_VEC2* size = cfg_vec2( s, "size" ); if( !tex || !pos || !size ) { - dlog( "map_sprites_from_section() : invalid sprite %d in %s\n", i, m->name ); + dlog( "map_sprites_from_section() : invalid sprite %d in %s\n", i, m->name.data ); continue; } @@ -305,7 +305,7 @@ STAT map_sprites_from_section( WORLD_MAP* m, GAME_DATA* g, CFG_SECTION* sprites, STAT map_entities_from_section( WORLD_MAP* m, GAME_DATA*, CFG_SECTION* entities, U32 entityc ) { if( !entityc ) { - dlog( "map_entities_from_section() : no entities in %s\n", m->name ); + dlog( "map_entities_from_section() : no entities in %s\n", m->name.data ); return STAT_OK; } @@ -317,14 +317,14 @@ STAT map_entities_from_section( WORLD_MAP* m, GAME_DATA*, CFG_SECTION* entities, sprintf( entitysec, "%d", i ); CFG_SECTION* s = cfg_section( entities, entitysec ); if( !s ) { - dlog( "map_entities_from_section() : missing entity %d in %s\n", i, m->name ); + dlog( "map_entities_from_section() : missing entity %d in %s\n", i, m->name.data ); continue; } CFG_INT* classid = cfg_int( s, "classid" ); CFG_VEC3* pos = cfg_vec3( s, "pos" ); if( !classid || !pos ) { - dlog( "map_entities_from_section() : invalid entity %d in %s\n", i, m->name ); + dlog( "map_entities_from_section() : invalid entity %d in %s\n", i, m->name.data ); continue; } @@ -496,7 +496,7 @@ WORLD_MAP* map_from_file( GAME_DATA* game, const char* path ) { WORLD_MAP* m = new WORLD_MAP; const char* name = file_path_last_of( path ); - strcpy( m->name, name ); + m->name = name; CFG_SECTION* s = cfg_section( root, "map" ); if( !s ) { dlog( errstr, "map", path ); delete m; return 0; } -- cgit v1.2.3