diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-07 00:43:46 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-07 00:43:46 +0000 |
| commit | 6729808a6dd1e3760c3f8b5453d07f27f35dca45 (patch) | |
| tree | aa632da15c9e7f5423686ff1de46d06509efbfc7 /src | |
| parent | 4250071e3c0f382d3b6680f30d2c9bce848a92da (diff) | |
| download | hercules-6729808a6dd1e3760c3f8b5453d07f27f35dca45.tar.gz hercules-6729808a6dd1e3760c3f8b5453d07f27f35dca45.tar.bz2 hercules-6729808a6dd1e3760c3f8b5453d07f27f35dca45.tar.xz hercules-6729808a6dd1e3760c3f8b5453d07f27f35dca45.zip | |
- Disabled the exception handler on windows debug builds
- Fixed Devotion using WE_BABY's status icon (now uses no icon); if you have a way to determine the correct number, give feedback
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10173 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/core.c | 15 | ||||
| -rw-r--r-- | src/map/status.c | 4 | ||||
| -rw-r--r-- | src/map/status.h | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/src/common/core.c b/src/common/core.c index 8c57f98ea..d38f1597a 100644 --- a/src/common/core.c +++ b/src/common/core.c @@ -116,17 +116,18 @@ void signals_init (void) { compat_signal(SIGTERM, sig_proc); compat_signal(SIGINT, sig_proc); +#ifndef _DEBUG // need unhandled exceptions to debug on Windows compat_signal(SIGSEGV, sig_proc); compat_signal(SIGFPE, sig_proc); - +#endif // Signal to create coredumps by system when necessary (crash) compat_signal(SIGILL, SIG_DFL); - #ifndef _WIN32 - compat_signal(SIGXFSZ, sig_proc); - compat_signal(SIGPIPE, sig_proc); - compat_signal(SIGBUS, SIG_DFL); - compat_signal(SIGTRAP, SIG_DFL); - #endif +#ifndef _WIN32 + compat_signal(SIGXFSZ, sig_proc); + compat_signal(SIGPIPE, sig_proc); + compat_signal(SIGBUS, SIG_DFL); + compat_signal(SIGTRAP, SIG_DFL); +#endif } #endif diff --git a/src/map/status.c b/src/map/status.c index 2b7dc2e09..a4fbef589 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -235,7 +235,7 @@ void initChangeTables(void) { set_sc(CR_REFLECTSHIELD, SC_REFLECTSHIELD, SI_REFLECTSHIELD, SCB_NONE); add_sc(CR_HOLYCROSS, SC_BLIND); add_sc(CR_GRANDCROSS, SC_BLIND); - set_sc(CR_DEVOTION, SC_DEVOTION, SI_DEVOTION, SCB_NONE); + add_sc(CR_DEVOTION, SC_DEVOTION); set_sc(CR_PROVIDENCE, SC_PROVIDENCE, SI_PROVIDENCE, SCB_PC); set_sc(CR_DEFENDER, SC_DEFENDER, SI_DEFENDER, SCB_SPEED|SCB_ASPD); set_sc(CR_SPEARQUICKEN, SC_SPEARQUICKEN, SI_SPEARQUICKEN, SCB_ASPD); @@ -313,7 +313,7 @@ void initChangeTables(void) { add_sc(PF_MEMORIZE, SC_MEMORIZE); add_sc(PF_FOGWALL, SC_FOGWALL); set_sc(PF_SPIDERWEB, SC_SPIDERWEB, SI_BLANK, SCB_FLEE); - add_sc(WE_BABY, SC_BABY); + set_sc(WE_BABY, SC_BABY, SI_BABY, SCB_NONE); set_sc(TK_RUN, SC_RUN, SI_RUN, SCB_SPEED|SCB_DSPD); set_sc(TK_RUN, SC_SPURT, SI_SPURT, SCB_STR); set_sc(TK_READYSTORM, SC_READYSTORM, SI_READYSTORM, SCB_NONE); diff --git a/src/map/status.h b/src/map/status.h index d0d82b825..4e14ebd45 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -352,7 +352,7 @@ enum { SI_MOONLIT = 123, SI_BLEEDING = 124, SI_JOINTBEAT = 125, - SI_DEVOTION = 130, + SI_BABY = 130, SI_STEELBODY = 132, SI_RUN = 133, SI_BUMP = 134, |