medfall

commit 1ed4354275a69b30e6ffad2f5f37f0dc44733aee
parent 3e3cd8bfe5aef6c3f0ac2ba7864b5b816fe3dbfa
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Sun Oct 30 22:59:00 +0200

ASSERT/ARRAY_COUNT

Diffstat:
bsp.cc
 | 
6
+++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/bsp.cc b/bsp.cc
@@ -89,7 +89,7 @@ void BSP::load_lump( u32 & num_ts, T *& ts, const BSP_Lump lump ) {
 	const BSP_Header * const header = reinterpret_cast< BSP_Header * >( contents );
 	const BSP_HeaderLump & hl = header->lumps[ lump ];
 
-	assert( hl.len % sizeof( T ) == 0 );
+	ASSERT( hl.len % sizeof( T ) == 0 );
 
 	num_ts = hl.len / sizeof( T );
 	ts = reinterpret_cast< T * >( contents + hl.off );
@@ -103,7 +103,7 @@ void BSP::load_vis() {
 
 	vis = reinterpret_cast< BSP_Vis * >( contents + hl.off );
 
-	assert( hl.len == 2 * sizeof( u32 ) + vis->num_clusters * vis->cluster_size );
+	ASSERT( hl.len == 2 * sizeof( u32 ) + vis->num_clusters * vis->cluster_size );
 
 	printf( "%d: ok. off %u len %u num %u\n", LUMP_VISIBILITY, hl.off, hl.len, vis->num_clusters * vis->cluster_size );
 }
@@ -348,7 +348,7 @@ extern "C" GAME_FRAME( game_frame ) {
 	render_state.ubs[ 0 ] = test_ub;
 	bspr_render( &game->bspr, GLMV3( game->pos ), render_state );
 
-	immediate_init( &imm, triangles, array_count( triangles ) );
+	immediate_init( &imm, triangles, ARRAY_COUNT( triangles ) );
 	immediate_sphere( &imm, glm::vec3( 0, 0, 0 ), 128, glm::vec4( 1, 1, 0, 1 ) );
 
 	if( input->keys[ 't' ] ) {