0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-03-21 10:11:01 +00:00

Merge pull request from dotfloat/master

fixed nested for-loops using the same counter variable in d3xp's idWeapon::GetAmmoNameForNum
This commit is contained in:
Daniel Gibson 2013-08-15 14:27:20 -07:00
commit fa231898b0

View file

@ -2505,7 +2505,7 @@ idWeapon::GetAmmoNameForNum
================
*/
const char *idWeapon::GetAmmoNameForNum( ammo_t ammonum ) {
int i;
int i, j;
int num;
const idDict *ammoDict;
const idKeyValue *kv;
@ -2539,8 +2539,8 @@ const char *idWeapon::GetAmmoNameForNum( ammo_t ammonum ) {
ammoDict = gameLocal.FindEntityDefDict( va("ammo_types_%s", gamedir.c_str()), false );
if ( ammoDict ) {
num = ammoDict->GetNumKeyVals();
for( i = 0; i < num; i++ ) {
kv = ammoDict->GetKeyVal( i );
for( j = 0; j < num; j++ ) {
kv = ammoDict->GetKeyVal( j );
if ( kv->GetValue() == text ) {
return kv->GetKey();
}