ubergames/ioef
0
0
Fork 0
mirror of https://github.com/UberGames/ioef.git synced 2024-11-23 20:52:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make barrel/flash model name buffer safe

Browse source
This commit is contained in:
Zack Middleton 2015-01-12 22:33:42 -06:00
parent af617bc0e6
commit af8acbd7a9
3 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
code/cgame/cg_weapons.c
View file

@ -655,19 +655,16 @@ void CG_RegisterWeapon( int weaponNum ) {
weaponInfo->ammoModel = trap_R_RegisterModel( ammo->world_model[0] ); weaponInfo->ammoModel = trap_R_RegisterModel( ammo->world_model[0] );
} }
strcpy( path, item->world_model[0] ); COM_StripExtension( item->world_model[0], path, sizeof(path) );
COM_StripExtension(path, path, sizeof(path)); Q_strcat( path, sizeof(path), "_flash.md3" );
strcat( path, "_flash.md3" );
weaponInfo->flashModel = trap_R_RegisterModel( path ); weaponInfo->flashModel = trap_R_RegisterModel( path );
strcpy( path, item->world_model[0] ); COM_StripExtension( item->world_model[0], path, sizeof(path) );
COM_StripExtension(path, path, sizeof(path)); Q_strcat( path, sizeof(path), "_barrel.md3" );
strcat( path, "_barrel.md3" );
weaponInfo->barrelModel = trap_R_RegisterModel( path ); weaponInfo->barrelModel = trap_R_RegisterModel( path );
strcpy( path, item->world_model[0] ); COM_StripExtension( item->world_model[0], path, sizeof(path) );
COM_StripExtension(path, path, sizeof(path)); Q_strcat( path, sizeof(path), "_hand.md3" );
strcat( path, "_hand.md3" );
weaponInfo->handsModel = trap_R_RegisterModel( path ); weaponInfo->handsModel = trap_R_RegisterModel( path );
if ( !weaponInfo->handsModel ) { if ( !weaponInfo->handsModel ) {

10
code/q3_ui/ui_players.c
View file

@ -88,15 +88,13 @@ tryagain:
} }
if ( weaponNum == WP_MACHINEGUN || weaponNum == WP_GAUNTLET || weaponNum == WP_BFG ) { if ( weaponNum == WP_MACHINEGUN || weaponNum == WP_GAUNTLET || weaponNum == WP_BFG ) {
strcpy( path, item->world_model[0] ); COM_StripExtension( item->world_model[0], path, sizeof(path) );
COM_StripExtension( path, path, sizeof(path) ); Q_strcat( path, sizeof(path), "_barrel.md3" );
strcat( path, "_barrel.md3" );
pi->barrelModel = trap_R_RegisterModel( path ); pi->barrelModel = trap_R_RegisterModel( path );
} }
strcpy( path, item->world_model[0] ); COM_StripExtension( item->world_model[0], path, sizeof(path) );
COM_StripExtension( path, path, sizeof(path) ); Q_strcat( path, sizeof(path), "_flash.md3" );
strcat( path, "_flash.md3" );
pi->flashModel = trap_R_RegisterModel( path ); pi->flashModel = trap_R_RegisterModel( path );
switch( weaponNum ) { switch( weaponNum ) {

10
code/ui/ui_players.c
View file

@ -89,15 +89,13 @@ tryagain:
} }
if ( weaponNum == WP_MACHINEGUN || weaponNum == WP_GAUNTLET || weaponNum == WP_BFG ) { if ( weaponNum == WP_MACHINEGUN || weaponNum == WP_GAUNTLET || weaponNum == WP_BFG ) {
strcpy( path, item->world_model[0] ); COM_StripExtension( item->world_model[0], path, sizeof(path) );
COM_StripExtension(path, path, sizeof(path)); Q_strcat( path, sizeof(path), "_barrel.md3" );
strcat( path, "_barrel.md3" );
pi->barrelModel = trap_R_RegisterModel( path ); pi->barrelModel = trap_R_RegisterModel( path );
} }
strcpy( path, item->world_model[0] ); COM_StripExtension( item->world_model[0], path, sizeof(path) );
COM_StripExtension(path, path, sizeof(path)); Q_strcat( path, sizeof(path), "_flash.md3" );
strcat( path, "_flash.md3" );
pi->flashModel = trap_R_RegisterModel( path ); pi->flashModel = trap_R_RegisterModel( path );
switch( weaponNum ) { switch( weaponNum ) {