summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-15 02:55:50 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-15 02:55:50 +0000
commit3aa689e30efaac30f0899b44f82dc755e44ac6d7 (patch)
tree5c4edbde709aa708f624c2cae68a6153f6766539 /src
parentcffd40f5ba4897e1099ba843dac80363f4a20aca (diff)
downloadhercules-3aa689e30efaac30f0899b44f82dc755e44ac6d7.tar.gz
hercules-3aa689e30efaac30f0899b44f82dc755e44ac6d7.tar.bz2
hercules-3aa689e30efaac30f0899b44f82dc755e44ac6d7.tar.xz
hercules-3aa689e30efaac30f0899b44f82dc755e44ac6d7.zip
- Fixed a possible crash in Venom Splasher if the countdown is too high.
- Small cleanup in clif.c hoping that it'll fix a mysterious crash. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5606 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/status.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 074f918ab..ac7c73ef5 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -320,7 +320,7 @@ int clif_send_sub(struct block_list *bl, va_list ap)
//it's being received by everyone. [Skotlex]
if ((sd->special_state.intravision || sd->sc.data[SC_INTRAVISION].timer != -1 ) && bl != src_bl) {
struct status_change *sc = status_get_sc(src_bl);
- if(sc && (sc->option)&(OPTION_HIDE|OPTION_CLOAK))
+ if(sc && (sc->option&(OPTION_HIDE|OPTION_CLOAK)))
{ //option̏C
switch(((unsigned short*)buf)[0])
{
diff --git a/src/map/status.c b/src/map/status.c
index 548be4d1f..48d762900 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -5503,8 +5503,8 @@ int status_change_timer(int tid, unsigned int tick, int id, int data)
case SC_SPLASHER:
if (sc->data[type].val4 % 1000 == 0) {
- char timer[2];
- sprintf (timer, "%d", sc->data[type].val4/1000);
+ char timer[10];
+ snprintf (timer, 10, "%d", sc->data[type].val4/1000);
clif_message(bl, timer);
}
if((sc->data[type].val4 -= 500) > 0) {