summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/common/socket.c2
-rw-r--r--src/map/battle.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/socket.c b/src/common/socket.c
index 3d7684972..537066ca7 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -1395,7 +1395,7 @@ bool session_isActive(int fd)
in_addr_t resolve_hostbyname(char* hostname, unsigned char *ip, char *ip_str) {
struct hostent *h = gethostbyname(hostname);
unsigned char ip_buf[16];
- char ip2[4];
+ unsigned char ip2[4];
if (!h) return 0;
if (ip == NULL) ip = ip2;
ip[0] = (unsigned char) h->h_addr[0];
diff --git a/src/map/battle.c b/src/map/battle.c
index e446e8376..75d48532e 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -331,7 +331,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i
if(sc->data[SC_AETERNA].timer!=-1 && skill_num != PF_SOULBURN){
damage<<=1;
//Shouldn't end until Breaker's non-weapon part connects.
- if (skill_num != ASC_BREAKER || flag&BF_WEAPON)
+ if (skill_num != ASC_BREAKER || !(flag&BF_WEAPON))
status_change_end( bl,SC_AETERNA,-1 );
}