From 81601053b3df92c13a9bc0bd679b49369b2cf788 Mon Sep 17 00:00:00 2001
From: zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sun, 24 Aug 2008 15:51:33 +0000
Subject: - Ops!! this is mine (homunculus hungry messages). - Fixed a bug on
char delete.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13123 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
src/char_sql/char.c | 2 +-
src/map/homunculus.c | 7 -------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 9008ac838..67a7419f2 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -1363,7 +1363,7 @@ int delete_char_sql(int char_id)
mapif_homunculus_delete(hom_id);
/* remove mercenary */
if( mer_id )
- mapif_mercenary_delete(hom_id);
+ mapif_mercenary_delete(mer_id);
/* delete char's friends list */
if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id` = '%d'", friend_db, char_id) )
diff --git a/src/map/homunculus.c b/src/map/homunculus.c
index 454d56e57..d6832e84a 100644
--- a/src/map/homunculus.c
+++ b/src/map/homunculus.c
@@ -487,8 +487,6 @@ static int merc_hom_hungry(int tid, unsigned int tick, int id, intptr data)
{
struct map_session_data *sd;
struct homun_data *hd;
- char mes[255];
- bool talk = true;
sd=map_id2sd(id);
if(!sd)
@@ -507,18 +505,13 @@ static int merc_hom_hungry(int tid, unsigned int tick, int id, intptr data)
hd->homunculus.hunger-- ;
if(hd->homunculus.hunger <= 10) {
clif_emotion(&hd->bl, 6) ; //an
- snprintf(mes, sizeof mes,"%s : Tengo mucha hambre...",hd->homunculus.name);
} else if(hd->homunculus.hunger == 25) {
clif_emotion(&hd->bl, 20) ; //hmm
- snprintf(mes, sizeof mes,"%s : Tengo hambre...",hd->homunculus.name);
} else if(hd->homunculus.hunger == 75) {
clif_emotion(&hd->bl, 33) ; //ok
- snprintf(mes, sizeof mes,"%s : Tengo un poco de hambre...",hd->homunculus.name);
} else
talk = false;
- if( talk ) clif_message(&hd->bl, mes);
-
if(hd->homunculus.hunger < 0) {
hd->homunculus.hunger = 0;
// Delete the homunculus if intimacy <= 100
--
cgit v1.2.3-70-g09d2