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

-Update multiclient support.

Browse Source 
--Use client->packetver for client reception.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17355 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
glighta 2013-06-11 15:24:11 +00:00
parent 91cc117015
commit acb18492aa
3 changed files with 433 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/map/atcommand.c
View File

@ -1126,14 +1126,14 @@ ACMD_FUNC(item)
memset(item_name, '\0', sizeof(item_name)); memset(item_name, '\0', sizeof(item_name));
if (!strcmpi(command+1,"itembound") && (!message || !*message || ( if (!strcmpi(command+1,"itembound") && (!message || !*message || (
sscanf(message, "\"%99[^\"]\" %d %d", item_name, &number, &bound) < 2 && sscanf(message, "\"%99[^\"]\" %d %d", item_name, &number, &bound) < 2 &&
sscanf(message, "%99s %d %d", item_name, &number, &bound) < 2 sscanf(message, "%99s %d %d", item_name, &number, &bound) < 2
))) { ))) {
clif_displaymessage(fd, msg_txt(sd,295)); // Please enter an item name or ID (usage: @item <item name/ID> <quantity> <bound_type>). clif_displaymessage(fd, msg_txt(sd,295)); // Please enter an item name or ID (usage: @item <item name/ID> <quantity> <bound_type>).
return -1; return -1;
} else if (!message || !*message || ( } else if (!message || !*message || (
sscanf(message, "\"%99[^\"]\" %d", item_name, &number) < 1 && sscanf(message, "\"%99[^\"]\" %d", item_name, &number) < 1 &&
sscanf(message, "%99s %d", item_name, &number) < 1 sscanf(message, "%99s %d", item_name, &number) < 1
)) { )) {
clif_displaymessage(fd, msg_txt(sd,983)); // Please enter an item name or ID (usage: @item <item name/ID> <quantity>). clif_displaymessage(fd, msg_txt(sd,983)); // Please enter an item name or ID (usage: @item <item name/ID> <quantity>).
return -1; return -1;

791
src/map/clif.c
View File

File diff suppressed because it is too large Load Diff

1
src/map/status.c
View File

@ -3604,7 +3604,6 @@ void status_calc_state( struct block_list *bl, struct status_change *sc, enum sc
/* player-only states */ /* player-only states */
if( bl->type == BL_PC ) { if( bl->type == BL_PC ) {
/* can pick items? */ /* can pick items? */
if( flag&SCS_NOPICKITEM ) { if( flag&SCS_NOPICKITEM ) {
if( !(flag&SCS_NOPICKITEMCOND) ) { if( !(flag&SCS_NOPICKITEMCOND) ) {