Still working on the new item system integration

[irc/gameservirc.git] / gameserv / gameserv.cpp

diff --git a/gameserv/gameserv.cpp b/gameserv/gameserv.cpp
index 18bd0fe246f5cdb58199af991df577d179ba77b5..4ad512d4cd3293447702ee46d37077f12f60b3e4 100644 (file)
--- a/gameserv/gameserv.cpp
+++ b/gameserv/gameserv.cpp
@@ -2189,10 +2189,15 @@ int load_gs_dbase()
 
     while (infile.getline(buf, 1024, '\n'))
       {
+       item *testitem;
+       testitem = new weapon("Empty Weapon");
+
        temp = new aClient;
        tempname = strtok(buf, " ");
        temp->stats = new Player(tempname);
        p = temp->stats;
+
+       p->inventory->addItem(testitem);
        
        p->level = stringtoint(strtok(NULL, " "));
        p->exp = stringtoint(strtok(NULL, " "));
@@ -2217,7 +2222,6 @@ int load_gs_dbase()
        temp->setRealNick("Not Playing");
 #endif
        
-       p->inventory->clear(); // Set inventory to all 0s
        // Old player databases didn't have these three extra values
        // If they come up null, leave them to 0 as the default.
        // On the next gameserv database save, it will save the values.
@@ -2523,10 +2527,11 @@ void do_inventory(char *u)
 
 void showinventory(aClient *from, aClient *to)
 {
-  char *nick = to->getNick();
-
+  char *nick;
   if (!to)
     to = from;
+
+  nick = to->getNick();
   
   if (is_playing(from))
     {
@@ -2543,12 +2548,12 @@ void showinventory(aClient *from, aClient *to)
       item_iter = items->begin();
 
       notice(s_GameServ, nick, "Inventory for %s:", from->stats->name.c_str());
+      int x = 0;
       while (item_iter != items->end())
        {
-         int x = 0;
-         notice(s_GameServ, nick, "%d.) %s", x, (*item_iter)->getName().c_str());
+         notice(s_GameServ, nick, "%d.) %s", ++x, (*item_iter)->getName().c_str());
+         item_iter++;
        }
-
     }
 
 }