Interactive: Use range-based for loop

arx · Aug 14, 2021 · fc70d68 · fc70d68
1 parent ec3900e
commit fc70d68
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/src/scene/Interactive.cpp b/src/scene/Interactive.cpp
@@ -750,18 +750,13 @@ static void ARX_INTERACTIVE_ClearIODynData_II(Entity * io) {
 	g_secondaryInventoryHud.clear(io);
 
 	if(io->inventory != nullptr) {
-		INVENTORY_DATA * id = io->inventory;
-
-		for(long nj = 0; nj < id->m_size.y; nj++) {
-			for(long ni = 0; ni < id->m_size.x; ni++) {
-				if(id->slot[ni][nj].io) {
-					id->slot[ni][nj].io->destroy();
-				}
-				arx_assert(id->slot[ni][nj].io == nullptr);
-				arx_assert(id->slot[ni][nj].show == false);
+		for(auto slot : io->inventory->slots()) {
+			if(slot.entity) {
+				slot.entity->destroy();
 			}
+			arx_assert(slot.entity == nullptr);
+			arx_assert(slot.show == false);
 		}
-
 		delete io->inventory;
 		io->inventory = nullptr;
 	}