Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Ops!! this is mine (homunculus hungry messages).

Browse Source 
- Fixed a bug on char delete.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13123 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
zephyrus 2008-08-24 15:51:33 +00:00
parent c5cc2257d3
commit daf7030ce9
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/char_sql/char.c
View File

@ -1363,7 +1363,7 @@ int delete_char_sql(int char_id)
mapif_homunculus_delete(hom_id); mapif_homunculus_delete(hom_id);
/* remove mercenary */ /* remove mercenary */
if( mer_id ) if( mer_id )
mapif_mercenary_delete(hom_id); mapif_mercenary_delete(mer_id);
/* delete char's friends list */ /* delete char's friends list */
if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id` = '%d'", friend_db, char_id) ) if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id` = '%d'", friend_db, char_id) )

7
src/map/homunculus.c
View File

@ -487,8 +487,6 @@ static int merc_hom_hungry(int tid, unsigned int tick, int id, intptr data)
{ {
struct map_session_data *sd; struct map_session_data *sd;
struct homun_data *hd; struct homun_data *hd;
char mes[255];
bool talk = true;
sd=map_id2sd(id); sd=map_id2sd(id);
if(!sd) if(!sd)
@ -507,18 +505,13 @@ static int merc_hom_hungry(int tid, unsigned int tick, int id, intptr data)
hd->homunculus.hunger-- ; hd->homunculus.hunger-- ;
if(hd->homunculus.hunger <= 10) { if(hd->homunculus.hunger <= 10) {
clif_emotion(&hd->bl, 6) ; //an clif_emotion(&hd->bl, 6) ; //an
snprintf(mes, sizeof mes,"%s : Tengo mucha hambre...",hd->homunculus.name);
} else if(hd->homunculus.hunger == 25) { } else if(hd->homunculus.hunger == 25) {
clif_emotion(&hd->bl, 20) ; //hmm clif_emotion(&hd->bl, 20) ; //hmm
snprintf(mes, sizeof mes,"%s : Tengo hambre...",hd->homunculus.name);
} else if(hd->homunculus.hunger == 75) { } else if(hd->homunculus.hunger == 75) {
clif_emotion(&hd->bl, 33) ; //ok clif_emotion(&hd->bl, 33) ; //ok
snprintf(mes, sizeof mes,"%s : Tengo un poco de hambre...",hd->homunculus.name);
} else } else
talk = false; talk = false;
if( talk ) clif_message(&hd->bl, mes);
if(hd->homunculus.hunger < 0) { if(hd->homunculus.hunger < 0) {
hd->homunculus.hunger = 0; hd->homunculus.hunger = 0;
// Delete the homunculus if intimacy <= 100 // Delete the homunculus if intimacy <= 100