- 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

5 files changed, 17 insertions, 11 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 66b288618..2993a1433 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,7 +5,10 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 
 2007/04/07
-	Updated the server's PCRE components to 7.0
+	* 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
+	* Updated the server's PCRE components to 7.0
 	- dll, library, header
 	- cleaned the only existing example and moved it to /samples
 	- changed the interface, now $@ is used instead of $ to store the result
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 2a6e4b544..d11e63333 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -21,6 +21,8 @@
 ========================
 
 04/07
+	* Corrected amatsu dungeon's nomemo mapflags not working
+	* Added a missing map entry, 've_in02' to map list and index
 	* Fixed Galion's mob skills (remnants of copy-paste) [ultramage]
 	* Updated map index and map cache with Nameless Island maps [DracoRPG]
 	- also removed the duplicate g_room2 entry from map index, read the note
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,