From 2fffc25ea8895cbd7748b4a84565091a91490995 Mon Sep 17 00:00:00 2001 From: skotlex Date: Wed, 21 Jun 2006 18:30:39 +0000 Subject: - Added function parse_hostbyname() which takes a hostname and a char[4]. The hostname is resolved to an ip, whose individual components are stored in char[], the return value of the function is the inet_addr result of the lookup (or returns 0 when failed). Meant to be used in the rest of the code without the need to do socket/network related includes. - Applied use of parse_hostbyname() in chrif.c to fix compilation errors. - status_percent_change will now account for when the target's max hp/sp is above INT_MAX. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7281 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/chrif.c | 12 ++++++------ src/map/pc.c | 8 ++++---- src/map/status.c | 16 ++++++++++++++++ 3 files changed, 26 insertions(+), 10 deletions(-) (limited to 'src/map') diff --git a/src/map/chrif.c b/src/map/chrif.c index e95858df9..2396f5175 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -1415,14 +1415,14 @@ int chrif_disconnect(int fd) { } void chrif_update_ip(int fd){ - struct hostent *h = map_server_dns?gethostbyname(map_server_dns):NULL; + char ip[4]; ShowInfo("IP Sync in progress...\n"); - if(h){ + if (map_server_dns && resolve_hostbyname(map_server_dns, ip)) { WFIFOW(fd, 0) = 0x2736; - WFIFOB(fd, 2) = h->h_addr[0]; - WFIFOB(fd, 3) = h->h_addr[1]; - WFIFOB(fd, 4) = h->h_addr[2]; - WFIFOB(fd, 5) = h->h_addr[3]; + WFIFOB(fd, 2) = ip[0]; + WFIFOB(fd, 3) = ip[1]; + WFIFOB(fd, 4) = ip[2]; + WFIFOB(fd, 5) = ip[3]; WFIFOSET(fd, 6); } } diff --git a/src/map/pc.c b/src/map/pc.c index 8e1ed1d25..9090a7a65 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -1552,14 +1552,14 @@ int pc_bonus(struct map_session_data *sd,int type,int val) case SP_NO_MAGIC_DAMAGE: if(sd->state.lr_flag == 2) break; - val+= sd->special_state.no_magic_damage; - sd->special_state.no_magic_damage = cap_value(val,0,100); + val+= sd->special_state.no_magic_damage; + sd->special_state.no_magic_damage = cap_value(val,0,100); break; case SP_NO_WEAPON_DAMAGE: if(sd->state.lr_flag == 2) break; - val+= sd->special_state.no_weapon_damage; - sd->special_state.no_weapon_damage = cap_value(val,0,100); + val+= sd->special_state.no_weapon_damage; + sd->special_state.no_weapon_damage = cap_value(val,0,100); break; case SP_NO_GEMSTONE: if(sd->state.lr_flag != 2) diff --git a/src/map/status.c b/src/map/status.c index 8fe79f999..98a6ad652 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -767,6 +767,22 @@ int status_percent_change(struct block_list *src,struct block_list *target,signe if (sp_rate && !sp) sp = 1; + //Ugly check in case damage dealt is too much for the received args of + //status_heal / status_damage. [Skotlex] + if (hp > INT_MAX) { + hp -= INT_MAX; + if (flag) + status_heal(target, INT_MAX, 0, 0); + else + status_damage(src, target, INT_MAX, 0, 0, (!src||src==target?5:1)); + } + if (sp > INT_MAX) { + sp -= INT_MAX; + if (flag) + status_heal(target, 0, INT_MAX, 0); + else + status_damage(src, target, 0, INT_MAX, 0, (!src||src==target?5:1)); + } if (flag) return status_heal(target, hp, sp, 0); return status_damage(src, target, hp, sp, 0, (!src||src==target?5:1)); } -- cgit v1.2.3-60-g2f50