summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-01-04 13:00:49 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-01-04 13:00:49 +0000
commit4ca054f01983eaf5cfca204897eb43a7f9472d2a (patch)
treeb2b862577cc611da3c2ccda8ee91c03717addd79
parentff2dd3a0c696cbcd659837ff736f927fab8937e3 (diff)
downloadhercules-4ca054f01983eaf5cfca204897eb43a7f9472d2a.tar.gz
hercules-4ca054f01983eaf5cfca204897eb43a7f9472d2a.tar.bz2
hercules-4ca054f01983eaf5cfca204897eb43a7f9472d2a.tar.xz
hercules-4ca054f01983eaf5cfca204897eb43a7f9472d2a.zip
Fixed a mistake in r11991 that let knockback work through walls
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12010 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/path.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 6b55051bd..c30f7990b 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2008/01/04
+ * Fixed a mistake in r11991 that let knockback work through walls
* Modified the map_setcell() code to to use a boolean flag instead of
needing SET_ / CLR_ pairs of defines (topic:174323) [ultramage].
Also removed script object 'setcell', added script function 'setcell'
diff --git a/src/map/path.c b/src/map/path.c
index 3316f9657..e2e3ae44b 100644
--- a/src/map/path.c
+++ b/src/map/path.c
@@ -180,9 +180,9 @@ int path_blownpos(int m,int x0,int y0,int dx,int dy,int count)
else
dy=0;
}
- else if( !fx )
+ if( !fx )
dx=0;
- else if( !fy )
+ if( !fy )
dy=0;
}