diff options
author | MadCamel <madcamel@gmail.com> | 2009-10-06 19:35:25 -0400 |
---|---|---|
committer | MadCamel <madcamel@gmail.com> | 2009-10-06 19:35:25 -0400 |
commit | 29844ce5e2cd043551b46c1cd7bf3a36e357e3c6 (patch) | |
tree | bf42e1c857c08fce52ff5bcda8f74e27bdcd9638 | |
parent | 592170e732fd5b75cf1447ed33e8999541048db8 (diff) | |
parent | 40792ad45c1929f999602dd386483ce99b0ed30a (diff) | |
download | tmwa-29844ce5e2cd043551b46c1cd7bf3a36e357e3c6.tar.gz tmwa-29844ce5e2cd043551b46c1cd7bf3a36e357e3c6.tar.bz2 tmwa-29844ce5e2cd043551b46c1cd7bf3a36e357e3c6.tar.xz tmwa-29844ce5e2cd043551b46c1cd7bf3a36e357e3c6.zip |
Merge branch 'master' of git://gitorious.org/tmw-eathena/mainline
-rw-r--r-- | src/map/atcommand.c | 3 | ||||
-rw-r--r-- | src/map/clif.c | 7 | ||||
-rw-r--r-- | src/map/pc.c | 49 |
3 files changed, 30 insertions, 29 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 510026b..3668d98 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -241,7 +241,6 @@ static AtCommandInfo atcommand_info[] = { { AtCommand_Kill, "@kill", 60, atcommand_kill }, { AtCommand_Alive, "@alive", 60, atcommand_alive }, { AtCommand_Kami, "@kami", 40, atcommand_kami }, - { AtCommand_KamiB, "@kamib", 40, atcommand_kami }, { AtCommand_Heal, "@heal", 40, atcommand_heal }, { AtCommand_Item, "@item", 60, atcommand_item }, { AtCommand_ItemReset, "@itemreset", 40, atcommand_itemreset }, @@ -1732,7 +1731,7 @@ int atcommand_kami( } sscanf(message, "%199[^\n]", output); - intif_GMmessage(output, strlen(output) + 1, (*(command + 5) == 'b') ? 0x10 : 0); + intif_GMmessage(output, strlen(output) + 1, 0); return 0; } diff --git a/src/map/clif.c b/src/map/clif.c index 76c38e5..f168ae5 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -6833,15 +6833,20 @@ void clif_parse_Wis(int fd, struct map_session_data *sd) { // S 0096 <len>.w <ni */ void clif_parse_GMmessage(int fd, struct map_session_data *sd) { char m[512]; + char output[200]; nullpo_retv(sd); if ((battle_config.atc_gmonly == 0 || pc_isGM(sd)) && (pc_isGM(sd) >= get_atcommand_level(AtCommand_Broadcast))) { - intif_GMmessage(RFIFOP(fd,4), RFIFOW(fd,2)-4, 0); strncpy(m, RFIFOP(fd,4), RFIFOW(fd,2) - 4); m[RFIFOW(fd,2) - 4] = 0; log_atcommand(sd, "/announce %s", m); + + memset(output, '\0', sizeof(output)); + snprintf(output, 199, "%s : %s", sd->status.name, m); + + intif_GMmessage(output, strlen(output) + 1, 0); } } diff --git a/src/map/pc.c b/src/map/pc.c index e2f8eec..5bb0009 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4610,52 +4610,49 @@ int pc_statusup(struct map_session_data *sd,int type) nullpo_retr(0, sd); + switch(type){ + case SP_STR: + val= sd->status.str; + break; + case SP_AGI: + val= sd->status.agi; + break; + case SP_VIT: + val= sd->status.vit; + break; + case SP_INT: + val= sd->status.int_; + break; + case SP_DEX: + val= sd->status.dex; + break; + case SP_LUK: + val= sd->status.luk; + break; + } + need=pc_need_status_point(sd,type); - if(type<SP_STR || type>SP_LUK || need<0 || need>sd->status.status_point){ - clif_statusupack(sd,type,0,0); + if(type<SP_STR || type>SP_LUK || need<0 || need>sd->status.status_point || val >= battle_config.max_parameter){ + clif_statusupack(sd,type,0,val); return 1; } switch(type){ case SP_STR: - if(sd->status.str >= battle_config.max_parameter) { - clif_statusupack(sd,type,0,0); - return 1; - } val= ++sd->status.str; break; case SP_AGI: - if(sd->status.agi >= battle_config.max_parameter) { - clif_statusupack(sd,type,0,0); - return 1; - } val= ++sd->status.agi; break; case SP_VIT: - if(sd->status.vit >= battle_config.max_parameter) { - clif_statusupack(sd,type,0,0); - return 1; - } val= ++sd->status.vit; break; case SP_INT: - if(sd->status.int_ >= battle_config.max_parameter) { - clif_statusupack(sd,type,0,0); - return 1; - } val= ++sd->status.int_; break; case SP_DEX: - if(sd->status.dex >= battle_config.max_parameter) { - clif_statusupack(sd,type,0,0); - return 1; - } val= ++sd->status.dex; break; case SP_LUK: - if(sd->status.luk >= battle_config.max_parameter) { - clif_statusupack(sd,type,0,0); - return 1; - } val= ++sd->status.luk; break; } |