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

Quickfixs

Browse Source 
Fix bugreport:8035 (SC_ENERVATION altening twice watk)
Upd config.pl enable coredump part to reload sysconfig once altered.
This commit is contained in:
lighta 2013-09-04 18:45:11 -04:00
parent 102f1c5d63
commit 03ada4b547
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/conf.h
View File

@ -5,7 +5,7 @@
#define _CONF_H_
#include "../common/cbasetypes.h"
#include "libconfig.h"
#include "../../3rdparty/libconfig/libconfig.h"
int conf_read_file(config_t *config, const char *config_filename);
int config_setting_copy(config_setting_t *parent, const config_setting_t *src);

7
src/map/status.c
View File

@ -4699,8 +4699,6 @@ static unsigned short status_calc_watk(struct block_list *bl, struct status_chan
watk -= watk * 25/100;
if(sc->data[SC_STRIPWEAPON] && bl->type != BL_PC)
watk -= watk * sc->data[SC_STRIPWEAPON]->val2/100;
if(sc->data[SC__ENERVATION])
watk -= watk * sc->data[SC__ENERVATION]->val2 / 100;
if((sc->data[SC_FIRE_INSIGNIA] && sc->data[SC_FIRE_INSIGNIA]->val1 == 2)
|| (sc->data[SC_WATER_INSIGNIA] && sc->data[SC_WATER_INSIGNIA]->val1 == 2)
|| (sc->data[SC_WIND_INSIGNIA] && sc->data[SC_WIND_INSIGNIA]->val1 == 2)
@ -4957,7 +4955,7 @@ static defType status_calc_def(struct block_list *bl, struct status_change *sc,
if(!sc || !sc->count)
return (defType)cap_value(def,DEFTYPE_MIN,DEFTYPE_MAX);
if(sc->data[SC_DEFSET]) //FIXME: Find out if this really overrides all other SCs
return sc->data[SC_DEFSET]->val1;
if(sc->data[SC_BERSERK])
@ -5099,7 +5097,7 @@ static defType status_calc_mdef(struct block_list *bl, struct status_change *sc,
if(!sc || !sc->count)
return (defType)cap_value(mdef,DEFTYPE_MIN,DEFTYPE_MAX);
if(sc->data[SC_MDEFSET]) //FIXME: Find out if this really overrides all other SCs
return sc->data[SC_MDEFSET]->val1;
if(sc->data[SC_BERSERK])
@ -8419,7 +8417,6 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
sc_start(src,bl,SC_STRIPWEAPON,100,val1,tick);
sc_start(src,bl,SC_STRIPSHIELD,100,val1,tick);
break;
break;
case SC_GN_CARTBOOST:
if( val1 < 3 )
val2 = 50;

6
src/map/unit.c
View File

@ -114,7 +114,11 @@ int unit_walktoxy_sub(struct block_list *bl)
}
/**
* Retrieve the direct master of a bl if he have one.
* @param bl: char to get his master
* @return map_session_data of master or NULL
*/
TBL_PC* unit_get_master(struct block_list *bl){
if(bl)
switch(bl->type){

2
tools/config.pl
View File

@ -123,6 +123,7 @@ sub EnableCoredump {
$sJump=1 if(GetValidAnwser("y|o|n") =~ /n/i);
}
system("sudo echo \"ulimit -c unlimited\" >> $sCurfile") unless $sJump==1;
#FIXME centos need to alter /etc/security/limits.conf
$sCurfile = "/etc/sysctl.conf";
@lines = ();
@ -140,6 +141,7 @@ sub EnableCoredump {
system('sudo su root -c "echo \"echo kernel.core_uses_pid = 1 >> /etc/sysctl.conf\" | sudo bash"');
system('sudo su root -c "echo \"echo kernel.core_pattern = /tmp/core-%e-%s-%u-%g-%p-%t >> /etc/sysctl.conf\" | sudo bash"');
system('sudo su root -c "echo \"echo fs.suid_dumpable = 1 >> /etc/sysctl.conf\" | sudo bash"');
system('sudo su root -c "sysctl -p"');
}
}