summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZido <Zido@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-08 09:28:02 +0000
committerZido <Zido@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-08 09:28:02 +0000
commit8de982a279a9eca6505c790b32ca2f1d559a3380 (patch)
tree07d130c21f89a5e27d7302d5197c80ceaba84416
parent43b24cf7d789caf1e7d88310597fe4386fb62451 (diff)
downloadhercules-8de982a279a9eca6505c790b32ca2f1d559a3380.tar.gz
hercules-8de982a279a9eca6505c790b32ca2f1d559a3380.tar.bz2
hercules-8de982a279a9eca6505c790b32ca2f1d559a3380.tar.xz
hercules-8de982a279a9eca6505c790b32ca2f1d559a3380.zip
- Wedding Sprites fixed
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5957 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt4
-rw-r--r--src/map/script.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 21daf919d..35d45a535 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,10 @@ 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.
2006/04/08
+ * Removed the baby class check when using "changebase" to change to the
+ Wedding Sprite, since it fixes the bug that the sprite doesn't show
+ at all, and baby classes arn't messed up by it anymore.
+ (or so it seems) [Zido]
* Fixed up irc.c, no more crashes :D [Zido]
2006/04/07
diff --git a/src/map/script.c b/src/map/script.c
index fba57bcaf..09d882c42 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -6329,8 +6329,8 @@ int buildin_changebase(struct script_state *st)
vclass = conv_num(st,& (st->stack->stack_data[st->start+2]));
if(vclass == JOB_WEDDING)
{
- if (!battle_config.wedding_modifydisplay || //Do not show the wedding sprites
- sd->class_&JOBL_BABY //Baby classes screw up when showing wedding sprites. [Skotlex]
+ if (!battle_config.wedding_modifydisplay //Do not show the wedding sprites
+ //sd->class_&JOBL_BABY //Baby classes screw up when showing wedding sprites. [Skotlex] They don't seem to anymore.
)
return 0;
}