From 795552b239069ad77d63b47fddc6b1ef435fb987 Mon Sep 17 00:00:00 2001
From: Eugenio Favalli <elvenprogrammer@gmail.com>
Date: Sat, 13 Nov 2004 16:47:56 +0000
Subject: Hair styles

---
 The Mana World.dev      |  2 +-
 src/game.cpp            | 10 ++++++----
 src/game.h              |  3 ++-
 src/graphic/graphic.cpp |  4 ++++
 src/gui/shop.cpp        |  5 +++--
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/The Mana World.dev b/The Mana World.dev
index 87d63d45..9d55dba7 100644
--- a/The Mana World.dev	
+++ b/The Mana World.dev	
@@ -33,7 +33,7 @@ CompilerSettings=0000001001001000001101
 Major=0
 Minor=0
 Release=8
-Build=71
+Build=89
 LanguageID=1033
 CharsetID=1252
 CompanyName=The Mana World Development Team
diff --git a/src/game.cpp b/src/game.cpp
index 8b14202b..9c1c8c82 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -733,10 +733,12 @@ void do_parse() {
 					break;
 				// Sell dialog
 				case 0x00c7:
-					n_items = (len-4)/10;
-					show_npc_dialog = 4;
-					for(int k=0;k<n_items;k++)
-						add_sell_item(RFIFOW(4+10*k), RFIFOL(4+10*k+2));
+				  n_items = (len-4)/10;
+				  if(n_items>0) {
+				    show_npc_dialog = 4;
+				    for(int k=0;k<n_items;k++)
+				      add_sell_item(RFIFOW(4+10*k), RFIFOL(4+10*k+2));
+		      } else chatlog.chat_log("Nothing to sell", BY_SERVER, gui_font);  
 					break;
 				// Answer to buy
 				case 0x00ca:
diff --git a/src/game.h b/src/game.h
index 1a455a1f..b4ec5a50 100644
--- a/src/game.h
+++ b/src/game.h
@@ -75,7 +75,8 @@ extern DIALOG stats_dialog[];
 extern int fps, frame, current_npc;
 extern char walk_status;
 extern unsigned short src_x, src_y, x, y;
-extern volatile int tick_time, server_tick;
+extern volatile int tick_time;
+extern int server_tick;
 
 void game();
 void do_init();
diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp
index bbac9532..42b6856e 100644
--- a/src/graphic/graphic.cpp
+++ b/src/graphic/graphic.cpp
@@ -423,7 +423,11 @@ void do_graphic(void) {
 			}
 			break;
 		case 4:
+		  //alert("","","","","",0,0);
+		  //char ds[20];
       sell_dialog[3].d1 = get_item_quantity(sell_dialog[4].d1);
+      //sprintf(ds, "%i", sell_dialog[3].d1);
+      //ok(ds,"");
 			/*if(sell_dialog[3].d2>sell_dialog[3].d1) {
         sell_dialog[3].d2 = sell_dialog[3].d1;
 				sprintf((char *)sell_dialog[5].dp, "%i %i", sell_dialog[3].d1, sell_dialog[3].d2);
diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp
index e929f434..5413e472 100644
--- a/src/gui/shop.cpp
+++ b/src/gui/shop.cpp
@@ -30,7 +30,7 @@ char* selectedItem = "You got 4";
 ITEM_SHOP *shop = NULL;
 
 char *item_db[] = {
-	"Candy", "Medical Herb", "Chocolate", "Royal Jam", "Faerie Walnut",
+	"Cactus Drink", "Cactus potion", "Casino coins", "Royal Jam", "Faerie Walnut",
 	"Cup of wishes", "Magic rope", "Midge mallet", "Flammie drum", "Moogle belt"
 };
 
@@ -118,7 +118,8 @@ int get_item_quantity(int index) {
     item_shop = item_shop->next;
     iterator++;
   }
-  return item_shop->quantity;
+  if(item_shop)return item_shop->quantity;
+  else return 0;
 }
 
 int get_item_index(int index) {
-- 
cgit v1.2.3-70-g09d2