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

Small cleanup of r13321/r13322/r13331.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13338 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2008-10-30 06:32:10 +00:00
parent 98ba2dd843
commit a8929509cc
2 changed files with 10 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/map/atcommand.c
View File

@ -1504,8 +1504,11 @@ int atcommand_heal(const int fd, struct map_session_data* sd, const char* comman
sscanf(message, "%d %d", &hp, &sp); sscanf(message, "%d %d", &hp, &sp);
if ( ( hp == 0 && sp == 0 ) // some overflow checks
|| ( hp > INT_MAX && sp > INT_MAX ) ) { // Prevent overflow. [Paradox924X] if( hp == INT_MIN ) hp++;
if( sp == INT_MIN ) sp++;
if ( hp == 0 && sp == 0 ) {
if (!status_percent_heal(&sd->bl, 100, 100)) if (!status_percent_heal(&sd->bl, 100, 100))
clif_displaymessage(fd, msg_txt(157)); // HP and SP have already been recovered. clif_displaymessage(fd, msg_txt(157)); // HP and SP have already been recovered.
else else
@ -1513,39 +1516,6 @@ int atcommand_heal(const int fd, struct map_session_data* sd, const char* comman
return 0; return 0;
} }
// Prevent overflow. [Paradox924X]
if ( hp < -INT_MAX && sp < -INT_MAX ) {
status_damage(NULL, &sd->bl, INT_MAX, INT_MAX, 0, 0);
clif_damage(&sd->bl,&sd->bl, gettick(), 0, 0, INT_MAX, 0, 4, 0);
clif_displaymessage(fd, msg_txt(156)); // HP or/and SP modified.
return 0;
}
// Prevent overflow. [Paradox924X]
if ( hp > INT_MAX ) {
if (!status_percent_heal(&sd->bl, 100, 0))
clif_displaymessage(fd, msg_txt(157)); // HP and SP have already been recovered.
else
clif_displaymessage(fd, msg_txt(17)); // HP, SP recovered.
return 0;
} else if ( hp < -INT_MAX ) {
status_damage(NULL, &sd->bl, INT_MAX, 0, 0, 0);
clif_damage(&sd->bl,&sd->bl, gettick(), 0, 0, INT_MAX, 0, 4, 0);
clif_displaymessage(fd, msg_txt(156)); // HP or/and SP modified.
return 0;
}
// Prevent overflow. [Paradox924X]
if ( sp > INT_MAX ) {
status_heal(&sd->bl, 0, INT_MAX, 0);
clif_displaymessage(fd, msg_txt(156)); // HP or/and SP modified.
return 0;
} else if ( sp < -INT_MAX ) {
status_damage(NULL, &sd->bl, 0, INT_MAX, 0, 0);
clif_displaymessage(fd, msg_txt(156)); // HP or/and SP modified.
return 0;
}
if ( hp > 0 && sp >= 0 ) { if ( hp > 0 && sp >= 0 ) {
if(!status_heal(&sd->bl, hp, sp, 0)) if(!status_heal(&sd->bl, hp, sp, 0))
clif_displaymessage(fd, msg_txt(157)); // HP and SP are already with the good value. clif_displaymessage(fd, msg_txt(157)); // HP and SP are already with the good value.

40
src/map/charcommand.c
View File

@ -1794,8 +1794,11 @@ int charcommand_heal(const int fd, struct map_session_data* sd, const char* comm
return -1; return -1;
} }
if ( ( hp == 0 && sp == 0 ) // some overflow checks
|| ( hp > INT_MAX && sp > INT_MAX ) ) { // Prevent overflow. [Paradox924X] if( hp == INT_MIN ) hp++;
if( sp == INT_MIN ) sp++;
if ( hp == 0 && sp == 0 ) {
if (!status_percent_heal(&pl_sd->bl, 100, 100)) if (!status_percent_heal(&pl_sd->bl, 100, 100))
clif_displaymessage(fd, msg_txt(157)); // HP and SP are already with the good value. clif_displaymessage(fd, msg_txt(157)); // HP and SP are already with the good value.
else else
@ -1807,39 +1810,6 @@ int charcommand_heal(const int fd, struct map_session_data* sd, const char* comm
return 0; return 0;
} }
// Prevent overflow. [Paradox924X]
if ( hp < -INT_MAX && sp < -INT_MAX ) {
status_damage(NULL, &pl_sd->bl, INT_MAX, INT_MAX, 0, 0);
clif_damage(&pl_sd->bl,&pl_sd->bl, gettick(), 0, 0, INT_MAX, 0 , 4, 0);
clif_displaymessage(fd, msg_txt(156)); // HP or/and SP modified.
return 0;
}
// Prevent overflow. [Paradox924X]
if ( hp > INT_MAX ) {
if (!status_percent_heal(&pl_sd->bl, 100, 0))
clif_displaymessage(fd, msg_txt(157)); // HP and SP have already been recovered.
else
clif_displaymessage(fd, msg_txt(17)); // HP, SP recovered.
return 0;
} else if ( hp < -INT_MAX ) {
status_damage(NULL, &pl_sd->bl, INT_MAX, 0, 0, 0);
clif_damage(&pl_sd->bl,&pl_sd->bl, gettick(), 0, 0, INT_MAX, 0, 4, 0);
clif_displaymessage(fd, msg_txt(156)); // HP or/and SP modified.
return 0;
}
// Prevent overflow. [Paradox924X]
if ( sp > INT_MAX ) {
status_heal(&pl_sd->bl, 0, INT_MAX, 0);
clif_displaymessage(fd, msg_txt(156)); // HP or/and SP modified.
return 0;
} else if ( sp < -INT_MAX ) {
status_damage(NULL, &pl_sd->bl, 0, INT_MAX, 0, 0);
clif_displaymessage(fd, msg_txt(156)); // HP or/and SP modified.
return 0;
}
if(hp > 0 && sp >= 0) { if(hp > 0 && sp >= 0) {
if( !status_heal(&pl_sd->bl, hp, sp, 2) ) if( !status_heal(&pl_sd->bl, hp, sp, 2) )
clif_displaymessage(fd, msg_txt(157)); // HP and SP are already with the good value. clif_displaymessage(fd, msg_txt(157)); // HP and SP are already with the good value.