From 4ed2d71e76f04c75a214e43363dc1b64e109fe3d Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Fri, 21 Feb 2020 19:22:26 +0100
Subject: used rank in taking objects

---
 src/systems/take.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/systems')

diff --git a/src/systems/take.rs b/src/systems/take.rs
index bf0f8e8..31634d2 100644
--- a/src/systems/take.rs
+++ b/src/systems/take.rs
@@ -44,17 +44,20 @@ impl <'a> System<'a> for Take {
 					ents.remove(&ent);
 					for ent in ents {
 						if let Some(item) = items.get(ent) {
-							inventory.items.push(item.clone());
+							inventory.items.insert(0, item.clone());
 							if let Err(msg) = removed.insert(ent, Removed) {
 								println!("{:?}", msg);
 							}
+							break;
 						}
 					}
 				}
-				Control::Drop(_rank) => {
-					if let Some(item) = inventory.items.pop() {
-						let _ = new.create(position.pos, item.ent);
+				Control::Drop(rank) => {
+					if *rank >= inventory.items.len() {
+						return
 					}
+					let item = inventory.items.remove(*rank);
+					let _ = new.create(position.pos, item.ent);
 				}
 				_ => {}
 			}
-- 
cgit