MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🏷️ Add 'PickRandomlyAmong' function that picks one value from a set of values randomly

Browse source 
This will be used in a few places where we previously used a raw integer random to index into a local array for selection, simplifying that type of logic to a single statement.
This commit is contained in:
Juliano Leal Goncalves 2021-09-06 22:22:05 -03:00 • committed by Anders Jenbo
commit 5607c58daa
2 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Source/objects.cpp
View file

@ -3966,26 +3966,11 @@ bool OperateFountains(int pnum, int i)
void OperateWeaponRack(int pnum, int i, bool sendmsg)
{
ItemType weaponType { ItemType::ITYPE_NONE };
if (Objects[i]._oSelFlag == 0)
return;
SetRndSeed(Objects[i]._oRndSeed);
switch (GenerateRnd(4) + ITYPE_SWORD) {
case ITYPE_SWORD:
weaponType = ITYPE_SWORD;
break;
case ITYPE_AXE:
weaponType = ITYPE_AXE;
break;
case ITYPE_BOW:
weaponType = ITYPE_BOW;
break;
case ITYPE_MACE:
weaponType = ITYPE_MACE;
break;
}
ItemType weaponType { PickRandomlyAmong({ ITYPE_SWORD, ITYPE_AXE, ITYPE_BOW, ITYPE_MACE }) };
Objects[i]._oSelFlag = 0;
Objects[i]._oAnimFrame++;