mirror of
https://github.com/curioustorvald/Terrarum.git
synced 2026-06-11 19:14:05 +09:00
using kotlin's newfangled 'x in xs.indices' instead of 'x in 0 until xs.size'
This commit is contained in:
@@ -307,7 +307,7 @@ package net.torvald.terrarum.modulebasegame.ui
|
||||
inventorySortList.sortBy { it.item.name }
|
||||
|
||||
// map sortList to item list
|
||||
for (k in 0 until items.size) {
|
||||
for (k in items.indices) {
|
||||
// we have an item
|
||||
try {
|
||||
val sortListItem = inventorySortList[k + itemPage * items.size]
|
||||
|
||||
@@ -353,7 +353,7 @@ class UIItemInventoryDynamicList(
|
||||
inventorySortList.sortBy { ItemCodex[it.item]!!.name }
|
||||
|
||||
// map sortList to item list
|
||||
for (k in 0 until items.size) {
|
||||
for (k in items.indices) {
|
||||
// we have an item
|
||||
try {
|
||||
val sortListItem = inventorySortList[k + itemPage * items.size]
|
||||
@@ -372,7 +372,7 @@ class UIItemInventoryDynamicList(
|
||||
}
|
||||
|
||||
// set equippedslot number
|
||||
for (eq in 0 until inventory.itemEquipped.size) {
|
||||
for (eq in inventory.itemEquipped.indices) {
|
||||
if (eq < inventory.itemEquipped.size) {
|
||||
if (inventory.itemEquipped[eq] == items[k].item?.dynamicID) {
|
||||
items[k].equippedSlot = eq
|
||||
|
||||
@@ -118,7 +118,7 @@ class UIItemInventoryEquippedView(
|
||||
// sort by equip position
|
||||
|
||||
// fill the grid from fastest index, make no gap in-between of slots
|
||||
for (k in 0 until itemGrid.size) {
|
||||
for (k in itemGrid.indices) {
|
||||
val item = inventory.itemEquipped[k]
|
||||
|
||||
if (item == null) {
|
||||
|
||||
Reference in New Issue
Block a user