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

- Added back the char-sql server sending the GM list when the map server connects.

Browse Source 
- Fixed a bug in the add_timer_interval error reporting.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5351 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-02-20 22:16:19 +00:00
parent 8138fcb6e6
commit c0652d7916
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -5,6 +5,8 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/02/20 2006/02/20
* Made the Char-SQL server send the GM listing when the map server
connects. [Skotlex]
* Play-dead and Basilica now block Gospel [Skotlex] * Play-dead and Basilica now block Gospel [Skotlex]
* Map SQL server will no longer ignore the gm-list packets received from * Map SQL server will no longer ignore the gm-list packets received from
char. [Skotlex] char. [Skotlex]

5
src/char_sql/char.c
View File

@ -3352,7 +3352,7 @@ int parse_char(int fd) {
WFIFOB(fd,2) = 3; WFIFOB(fd,2) = 3;
WFIFOSET(fd, 3); WFIFOSET(fd, 3);
} else { } else {
// int len; int len;
WFIFOB(fd,2) = 0; WFIFOB(fd,2) = 0;
WFIFOSET(fd, 3); WFIFOSET(fd, 3);
session[fd]->func_parse = parse_frommap; session[fd]->func_parse = parse_frommap;
@ -3364,7 +3364,6 @@ int parse_char(int fd) {
realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK); realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
char_mapif_init(fd); char_mapif_init(fd);
// send gm acccounts level to map-servers // send gm acccounts level to map-servers
/* removed by CLOWNISIUS due to isGM
len = 4; len = 4;
WFIFOW(fd,0) = 0x2b15; WFIFOW(fd,0) = 0x2b15;
for(i = 0; i < GM_num; i++) { for(i = 0; i < GM_num; i++) {
@ -3373,7 +3372,7 @@ int parse_char(int fd) {
len += 5; len += 5;
} }
WFIFOW(fd,2) = len; WFIFOW(fd,2) = len;
WFIFOSET(fd,len);*/ WFIFOSET(fd,len);
} }
RFIFOSKIP(fd,60); RFIFOSKIP(fd,60);
break; break;

2
src/common/timer.c
View File

@ -241,7 +241,7 @@ int add_timer_interval(unsigned int tick, int (*func)(int,unsigned int,int,int),
if (interval < 1) { if (interval < 1) {
ShowError("add_timer_interval : function %08x(%s) has invalid interval %d!\n", ShowError("add_timer_interval : function %08x(%s) has invalid interval %d!\n",
(int)func, search_timer_func_list(func)); (int)func, search_timer_func_list(func), interval);
return -1; return -1;
} }

2
src/map/skill.c
View File

@ -6764,6 +6764,8 @@ int skill_unit_onplace_timer(struct skill_unit *src,struct block_list *bl,unsign
{ {
int count=0, t_ele = status_get_elem_type(bl); int count=0, t_ele = status_get_elem_type(bl);
if (t_ele == 3 || battle_check_undead(status_get_race(bl), t_ele)) { if (t_ele == 3 || battle_check_undead(status_get_race(bl), t_ele)) {
//This is the best Aegis approximation we can do without
//changing the minimum skill unit interval. [Skotlex]
while (count++ < battle_config.firewall_hits_on_undead && src->val2-- && !status_isdead(bl)) while (count++ < battle_config.firewall_hits_on_undead && src->val2-- && !status_isdead(bl))
skill_attack(BF_MAGIC,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick+count*10,1); skill_attack(BF_MAGIC,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick+count*10,1);
} else { } else {