diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/char_sql/char.c | 5 | ||||
| -rw-r--r-- | src/common/timer.c | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index d10b93ac9..6f0260ee4 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -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
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]
* Map SQL server will no longer ignore the gm-list packets received from
char. [Skotlex]
diff --git a/src/char_sql/char.c b/src/char_sql/char.c index 0fea5b016..dca9a28a1 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -3352,7 +3352,7 @@ int parse_char(int fd) { WFIFOB(fd,2) = 3;
WFIFOSET(fd, 3);
} else {
-// int len;
+ int len;
WFIFOB(fd,2) = 0;
WFIFOSET(fd, 3);
session[fd]->func_parse = parse_frommap;
@@ -3364,7 +3364,6 @@ int parse_char(int fd) { realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
char_mapif_init(fd);
// send gm acccounts level to map-servers
-/* removed by CLOWNISIUS due to isGM
len = 4;
WFIFOW(fd,0) = 0x2b15;
for(i = 0; i < GM_num; i++) {
@@ -3373,7 +3372,7 @@ int parse_char(int fd) { len += 5;
}
WFIFOW(fd,2) = len;
- WFIFOSET(fd,len);*/
+ WFIFOSET(fd,len);
}
RFIFOSKIP(fd,60);
break;
diff --git a/src/common/timer.c b/src/common/timer.c index 49b6e18de..9baa33e08 100644 --- a/src/common/timer.c +++ b/src/common/timer.c @@ -241,7 +241,7 @@ int add_timer_interval(unsigned int tick, int (*func)(int,unsigned int,int,int), if (interval < 1) {
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;
}
diff --git a/src/map/skill.c b/src/map/skill.c index cb9e7d255..7d528aa50 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -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);
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))
skill_attack(BF_MAGIC,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick+count*10,1);
} else {
|