Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Added overflow protection to @main whisper parsing.

Browse Source 
- Fixed a bug in slaves_inherit_speed
- Miscellanous silly cleanups (format, unnecessary assignments, comments, etc)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9367 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-11-29 20:11:12 +00:00
parent 636089bb3a
commit b421d38216
5 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/map/battle.c
View File

@ -1600,6 +1600,7 @@ static struct Damage battle_calc_weapon_attack(
break;
case HFLI_SBR44: //[orn]
skillratio += 100 *(skill_lv-1);
break;
}
ATK_RATE(skillratio);
@ -3226,7 +3227,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
return 0;
}
break;
//Valid targets with nothing else specified.
//Valid targets with no special checks here.
case BL_HOM:
break;
//All else not specified is an invalid target.

2
src/map/battle.h
View File

@ -355,7 +355,7 @@ extern struct Battle_Config {
unsigned short pk_min_level; // [celest]
unsigned short skill_steal_type; // [celest]
unsigned short skill_steal_rate; // [celest]
unsigned short skill_steal_max_tries; //max steal skill tries on a mob. if 0 or 256, then w/o limit [Lupus]
unsigned short skill_steal_max_tries; //max steal skill tries on a mob. if 0, then w/o limit [Lupus]
unsigned short motd_type; // [celest]
unsigned short finding_ore_rate; // orn
unsigned short exp_calc_type;

4
src/map/clif.c
View File

@ -9184,7 +9184,7 @@ void clif_parse_Wis(int fd, struct map_session_data *sd) { // S 0096 <len>.w <ni
if(!sd->state.mainchat)
clif_displaymessage(fd, msg_txt(388)); // You should enable main chat with "@main on" command.
else {
sprintf(output, msg_txt(386), sd->status.name, msg);
snprintf(output, sizeof(output)/sizeof(char), msg_txt(386), sd->status.name, msg);
intif_announce(output, strlen(output) + 1, 0xFE000000, 0);
}
aFree(command);
@ -11131,7 +11131,7 @@ void clif_parse_PMIgnore(int fd, struct map_session_data *sd) { // Rewritten by
WFIFOW(fd,0) = 0x0d1; // R 00d1 <type>.B <fail>.B: type: 0: deny, 1: allow, fail: 0: success, 1: fail
WFIFOB(fd,2) = RFIFOB(fd,26);
// do nothing only if nick can not exist
if ((i = strlen(nick)) < 4) {
if (strlen(nick) < 4) {
WFIFOB(fd,3) = 1; // fail
WFIFOSET(fd, packet_len_table[0x0d1]);
clif_wis_message(fd, wisp_server_name,

2
src/map/status.c
View File

@ -1321,7 +1321,7 @@ int status_calc_mob(struct mob_data* md, int first)
if (flag&8 && mbl) {
struct status_data *mstatus = status_get_base_status(mbl);
if (mstatus &&
battle_config.slaves_inherit_speed&(status->mode&MD_CANMOVE?1:2))
battle_config.slaves_inherit_speed&(mstatus->mode&MD_CANMOVE?1:2))
status->speed = mstatus->speed;
}