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

Partial revert of a674869

Browse Source 
Fixes atcommands heal and jump not working without parameters anymore.
This commit is contained in:
Lemongrass3110 2015-11-17 14:46:05 +01:00
parent c2f8dec830
commit 057384aa51
10 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/msg_conf/map_msg.conf
View File

@ -423,7 +423,7 @@
404: War of Emperium SE is currently in progress.
405: War of Emperium SE has been ended.
406: War of Emperium SE is currently not in progress.
407: Invalid amount of parameters.
//407 free
//chrif related
408: Need disconnection to perform change-sex request...
409: Your sex has been changed (need disconnection by the server)...

2
conf/msg_conf/map_msg_chn.conf
View File

@ -412,7 +412,7 @@
404: 攻城戰第二版正在進行中
405: 攻城戰第二版結束了
406: 攻城戰第二版尚未開始
407: Invalid amount of parameters.
//407 free
//chrif related
408: 需要斷線以更改性別
409: 你的性別已更改(你將會被伺服器中斷連線)

2
conf/msg_conf/map_msg_frn.conf
View File

@ -420,7 +420,7 @@
404: War of Emperium SE en cours.
405: War of Emperium SE est terminée.
406: War of Emperium SE n'est pas en cours.
407: Invalid amount of parameters.
//407 free
//chrif related
408: Besoin de vous déconnecter pour effectuer la demande de changement de sexe...
409: Changement de sexe (le serveur a besoin de vous déconnecter)...

2
conf/msg_conf/map_msg_grm.conf
View File

@ -403,7 +403,7 @@
404: War of Emperium SE ist derzeitig im Gange.
405: War of Emperium SE wurde Beendet.
406: War of Emperium SE ist derzeitig nicht im Gange.
407: Invalid amount of parameters.
//407 free
// Homunculus messages
450: Du hast bereitz ein Homunculus

2
conf/msg_conf/map_msg_idn.conf
View File

@ -423,7 +423,7 @@
404: War of Emperium SE saat ini sedang berjalan.
405: War of Emperium SE telah dimulai.
406: War of Emperium SE saat ini sedang tidak berjalan.
407: Invalid amount of parameters.
//407 free
//berkaitan dengan chrif
408: Dibutuhkan pemutusan koneksi untuk melakukan permintaan ubah jenis kelamin ...
409: Jenis kelaminmu telah diganti (membutuhkan pemutusan koneksi oleh server) ...

2
conf/msg_conf/map_msg_por.conf
View File

@ -410,7 +410,7 @@
404: A Guerra do Emperium SE já está em progresso.
405: A Guerra do Emperium SE terminou!
406: A Guerra do Emperium SE ainda não foi iniciada.
407: Invalid amount of parameters.
//407 free
//Mensagens relacionadas ao chrif
408: É preciso desconectar-se para que o pedido de mudança de sexo seja processado...
409: O seu sexo foi alterado (é preciso desconectar-se do servidor)...

2
conf/msg_conf/map_msg_rus.conf
View File

@ -420,7 +420,7 @@
404: Война за Империум 2.0 уже идёт.
405: Война за Империум 2.0 окончена.
406: Война за Империум 2.0 в текущее время не идёт.
407: Invalid amount of parameters.
//407 free
//chrif related
408: Необходимо отключение для выполнения запроса на смену пола...
409: Ваш пол был изменен (необходимо отключение от сервера)...

2
conf/msg_conf/map_msg_spn.conf
View File

@ -411,7 +411,7 @@
404: Hay una Guerra del Emperium de la 2ª edición en marcha.
405: Ha finalizado la Guerra del Emperium de la 2ª edición.
406: No hay ninguna Guerra del Emperium de la 2ª edición en marcha.
407: Invalid amount of parameters.
//407 free
//Mensajes de chrif
408: Necesitas desconectarte para realizar el cambio de sexo.
409: Has cambiado de sexo (necesitas desconectarte y volver a entrar)

2
conf/msg_conf/map_msg_tha.conf
View File

@ -418,7 +418,7 @@
404: War of Emperium SE ∂턺㎎彖拈睾撫尸∏橘旅.
405: War of Emperium SE 芽蟯뵀<E89FAF>.
406: War of Emperium SE 幄巍닻롭㎾믹쬔嵬묄넓밌<EB8493>.
407: Invalid amount of parameters.
//407 free
//chrif related
408: 들系둘뇟櫓夕羸皐듣滾묀櫓닒仙瀆⌒창梱뼜㏅안 ...
409: ㅨ념닻沼큘宣휸촹쨘췌睾 (들系둘뇟櫓夕羸皐듣繫納奭惇荑璿稿<E792BF>)...

10
src/map/atcommand.c
View File

@ -578,10 +578,7 @@ ACMD_FUNC(jump)
memset(atcmd_output, '\0', sizeof(atcmd_output));
if (sscanf(message, "%6hd %6hd", &x, &y) != 2) {
clif_displaymessage(fd, msg_txt(sd,407));
return -1;
}
sscanf(message, "%6hd %6hd", &x, &y);
if (map[sd->bl.m].flag.noteleport && !pc_has_permission(sd, PC_PERM_WARP_ANYWHERE)) {
clif_displaymessage(fd, msg_txt(sd,248)); // You are not authorized to warp from your current map.
@ -1145,10 +1142,7 @@ ACMD_FUNC(heal)
int hp = 0, sp = 0; // [Valaris] thanks to fov
nullpo_retr(-1, sd);
if (sscanf(message, "%11d %11d", &hp, &sp) != 2) {
clif_displaymessage(fd, msg_txt(sd,407));
return -1;
}
sscanf(message, "%11d %11d", &hp, &sp);
// some overflow checks
if( hp == INT_MIN ) hp++;