diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-16 12:21:26 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-16 12:21:26 +0000 |
| commit | 236f3f46336cf648284b28a6b4bf7ffcec27fbd4 (patch) | |
| tree | f9150ffcf2b1e746dd546d1f63086b501aec7920 /src/map | |
| parent | 4256612cd7254d789cb90daa0e49f82e67dc0226 (diff) | |
| download | hercules-236f3f46336cf648284b28a6b4bf7ffcec27fbd4.tar.gz hercules-236f3f46336cf648284b28a6b4bf7ffcec27fbd4.tar.bz2 hercules-236f3f46336cf648284b28a6b4bf7ffcec27fbd4.tar.xz hercules-236f3f46336cf648284b28a6b4bf7ffcec27fbd4.zip | |
* Updated jA's dummy socket to mod1137
* Added jA's ddos protection system
* Moved stall_time's reading to packet_athena.conf
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1237 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/clif.c | 6 | ||||
| -rw-r--r-- | src/map/map.c | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index a44979ff4..2e1a7e1e7 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -973,7 +973,7 @@ int clif_mob_equip(struct mob_data *md, int nameid) { */ static int clif_mob0078(struct mob_data *md, unsigned char *buf) { - int level; + int level, i; memset(buf,0,packet_len_table[0x78]); @@ -986,7 +986,7 @@ static int clif_mob0078(struct mob_data *md, unsigned char *buf) WBUFW(buf,10)=md->opt2; WBUFW(buf,12)=md->option; WBUFW(buf,14)=mob_get_viewclass(md->class_); - if((mob_get_viewclass(md->class_) <= 23) || (mob_get_viewclass(md->class_) == 812) || (mob_get_viewclass(md->class_) >= 4001)) { + if((i=mob_get_viewclass(md->class_)) <= 23 || i == 812 || i >= 4001) { WBUFW(buf,12)|=mob_db[md->class_].option; WBUFW(buf,16)=mob_get_hair(md->class_); WBUFW(buf,18)=mob_get_weapon(md->class_); @@ -1360,7 +1360,7 @@ int clif_spawnmob(struct mob_data *md) nullpo_retr(0, md); - if (mob_get_viewclass(md->class_) > 23 ) { + if (mob_get_viewclass(md->class_) > 23) { memset(buf,0,packet_len_table[0x7c]); WBUFW(buf,0)=0x7c; diff --git a/src/map/map.c b/src/map/map.c index 7c8275cf9..3a6a29fde 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -2896,8 +2896,10 @@ int inter_config_read(char *cfgName) i=sscanf(line,"%[^:]: %[^\r\n]",w1,w2); if(i!=2) continue; - if(strcmpi(w1,"stall_time")==0){ - stall_time_ = atoi(w2); + //support the import command, just like any other config + if(strcmpi(w1,"import")==0){ + inter_config_read(w2); + } #ifndef TXT_ONLY } else if(strcmpi(w1,"item_db_db")==0){ strcpy(item_db_db,w2); @@ -2959,9 +2961,6 @@ int inter_config_read(char *cfgName) } else if(strcmpi(w1,"log_db_port")==0) { log_db_port = atoi(w2); #endif - //support the import command, just like any other config - } else if(strcmpi(w1,"import")==0){ - inter_config_read(w2); } } fclose(fp); |