Merge branch 'master' into newplasma

This commit is contained in:
Martin Haye 2017-09-13 08:17:50 -07:00
commit 91638a6bfc

View File

@ -272,7 +272,7 @@ def _buyFromStore(storeCode, profitPercent)#1
pageNum--
elsif choice == '>' and pageNum+1 < nPages
pageNum++
elsif choice >= '1' and (choice-'1') <= playerCount and (choice-'1') <> playerNum
elsif choice >= '1' and (choice-'1') < playerCount and (choice-'1') <> playerNum
playerNum = choice - '1'
pPlayer = index(global=>p_players, playerNum)
elsif choice >= 'A' and (choice-'A' < nItemsOnPage)