zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream2' of https://github.com/Edward850/zdoom

This commit is contained in:
Christoph Oelckers 2014-06-01 09:04:37 +02:00
parent f1661f1419 3817bed0b3
commit 90ac160b70
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/g_shared/a_weapons.cpp
View File

@ -1143,7 +1143,7 @@ AWeapon *FWeaponSlots::PickNextWeapon(player_t *player)
return weap;
}
}
while ((slot != startslot || index != startindex) && slotschecked < NUM_WEAPON_SLOTS);
while ((slot != startslot || index != startindex) && slotschecked <= NUM_WEAPON_SLOTS);
}
return player->ReadyWeapon;
}
@ -1198,7 +1198,7 @@ AWeapon *FWeaponSlots::PickPrevWeapon (player_t *player)
return weap;
}
}
while ((slot != startslot || index != startindex) && slotschecked < NUM_WEAPON_SLOTS);
while ((slot != startslot || index != startindex) && slotschecked <= NUM_WEAPON_SLOTS);
}
return player->ReadyWeapon;
}