summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-02-23 23:37:52 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-02-23 23:37:52 +0000
commit229785245a12c5a6b6b4e481bc5139f11bb6228c (patch)
treef186f5f2a8fab48f29115652e5531d90e532ef46
parent93109355b4f0b7dcbf9aa827716590df9cd3f9cd (diff)
downloadhercules-229785245a12c5a6b6b4e481bc5139f11bb6228c.tar.gz
hercules-229785245a12c5a6b6b4e481bc5139f11bb6228c.tar.bz2
hercules-229785245a12c5a6b6b4e481bc5139f11bb6228c.tar.xz
hercules-229785245a12c5a6b6b4e481bc5139f11bb6228c.zip
- Fixed the mob_override_name setting not working on summoned mobs.
- The server now prints an error message when it the produce_db reaches the max number of allowed produce recipes. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9907 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/mob.c8
-rw-r--r--src/map/skill.c3
3 files changed, 13 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index f017bb471..80e897e5c 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ 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.
2007/02/24
+ * Fixed the mob_override_name setting not working on summoned mobs.
+ * The server now prints an error message when it the produce_db reaches the
+ max number of allowed produce recipes.
* The NK value of the skill_db has been made a hexadecimal value, and
expanded to include more information about a skill's damage properties: 0x8
ignore caster's cards, 0x10 ignore element adjustments, 0x20 ignore
diff --git a/src/map/mob.c b/src/map/mob.c
index cc2fa146f..ddc26254d 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2486,7 +2486,13 @@ int mob_summonslave(struct mob_data *md2,int *value,int amount,int skill_id)
data.x = md2->bl.x;
data.y = md2->bl.y;
}
- strcpy(data.name, "--ja--"); //These two need to be loaded from the db for each slave.
+
+ //These two need to be loaded from the db for each slave.
+ if(battle_config.override_mob_names==1)
+ strcpy(data.name,"--en--");
+ else
+ strcpy(data.name,"--ja--");
+
data.level = 0;
if (!mob_parse_dataset(&data))
continue;
diff --git a/src/map/skill.c b/src/map/skill.c
index 264a5b4a0..ac1187126 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -11442,7 +11442,10 @@ int skill_readdb (void)
}
k++;
if(k >= MAX_SKILL_PRODUCE_DB)
+ {
+ ShowError("Reached the max number of produce_db entries (%d), consider raising the value of MAX_SKILL_PRODUCE_DB and recompile.\n", MAX_SKILL_PRODUCE_DB);
break;
+ }
}
fclose(fp);
ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",k,path);