summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-22 13:16:45 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-22 13:16:45 +0000
commit53cee1c9a4415b8a092c744c6612d2a152e06762 (patch)
tree47d3a7cab24e3ee4d733cb1ceab1e246520a6265 /src/map
parent097d544fa11ef60116a3f9c4e89b63f111b06738 (diff)
downloadhercules-53cee1c9a4415b8a092c744c6612d2a152e06762.tar.gz
hercules-53cee1c9a4415b8a092c744c6612d2a152e06762.tar.bz2
hercules-53cee1c9a4415b8a092c744c6612d2a152e06762.tar.xz
hercules-53cee1c9a4415b8a092c744c6612d2a152e06762.zip
* [Removed]:
- Redundant mob name copying. (it's already copied in mob_parse_dataset) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7292 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/mob.c14
-rw-r--r--src/map/script.c9
2 files changed, 10 insertions, 13 deletions
diff --git a/src/map/mob.c b/src/map/mob.c
index a016a825a..f462b9aa8 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -623,12 +623,14 @@ int mob_spawn (struct mob_data *md)
else if (md->vd->class_ != md->class_) {
status_set_viewdata(&md->bl, md->class_);
md->db = mob_db(md->class_);
- if (md->spawn)
- memcpy(md->name,md->spawn->name,NAME_LENGTH);
- else if (battle_config.override_mob_names == 1)
- memcpy(md->name,md->db->name,NAME_LENGTH);
- else
- memcpy(md->name,md->db->jname,NAME_LENGTH);
+ if (md->spawn)
+ memcpy(md->name,md->spawn->name,NAME_LENGTH);
+ // Redundant? mob_parse_dataset already have the name copied. [Lance]
+ /*else if (battle_config.override_mob_names == 1)
+ memcpy(md->name,md->db->name,NAME_LENGTH);
+ else
+ memcpy(md->name,md->db->jname,NAME_LENGTH);*/
+ }
}
if (md->spawn) { //Respawn data
diff --git a/src/map/script.c b/src/map/script.c
index 119ea5097..8a151aba0 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -10433,7 +10433,7 @@ int buildin_pcstopfollow(struct script_state *st) {
// [zBuffer] List of mob control commands --->
int buildin_mobspawn(struct script_state *st){
int class_,x,y,id;
- char *str,*map,*event="";
+ char *str,*map;
// Who?
str =conv_str(st,& (st->stack->stack_data[st->start+2]));
@@ -10443,13 +10443,8 @@ int buildin_mobspawn(struct script_state *st){
map =conv_str(st,& (st->stack->stack_data[st->start+4]));
x =conv_num(st,& (st->stack->stack_data[st->start+5]));
y =conv_num(st,& (st->stack->stack_data[st->start+6]));
- // When?
- if( st->end > st->start+8 ){
- event=conv_str(st,& (st->stack->stack_data[st->start+7]));
- check_event(st, event);
- }
- id = mob_once_spawn(map_id2sd(st->rid),map,x,y,str,class_,1,event);
+ id = mob_once_spawn(map_id2sd(st->rid),map,x,y,str,class_,1,NULL);
push_val(st->stack,C_INT,id);
return 0;