Item id based inventory, support for weapon dealers.

1 files changed, 11 insertions, 1 deletions

diff --git a/src/game/base/station.cc b/src/game/base/station.cc
index 6493348..31e6b3e 100644
--- a/src/game/base/station.cc
+++ b/src/game/base/station.cc
@@ -6,6 +6,7 @@
 
 #include "base/game.h"
 #include "base/station.h"
+#include "base/weapon.h"
 #include "sys/sys.h"
 
 namespace game
@@ -32,12 +33,21 @@ void Station::upkeep(const unsigned long timestamp)
 	
 	if (deplete > 0) {
 		bool dirty = false;
-		for (core::Inventory::Items::iterator it = inventory()->items().begin(); it != inventory()->items().end(); it++) {
+		for (core::Inventory::Items::iterator it = inventory()->items().begin(); it != inventory()->items().end(); ) {
 			core::Item *item = (*it);
 			if ((item->amount() > 0) && (item->timestamp() + deplete < timestamp)) {
 				item->dec_amount(1);
 				dirty = true;
 			}
+			
+			if ((item->info()->type() == Weapon::infotype()) && (item->amount() == 0)) {
+				delete (item);
+				(*it) = 0;
+				inventory()->items().erase(it++);
+				dirty = true;
+			} else {
+				++it;
+			}	
 		}
 		
 		if (dirty) {