Fixed some badly merged code in the #include part of map.c.

Updated effect_list.txt according to data from latest exe.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11422 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 13 insertions, 15 deletions

diff --git a/doc/effect_list.txt b/doc/effect_list.txt
index 1b4fb1998..907b029f3 100644
--- a/doc/effect_list.txt
+++ b/doc/effect_list.txt
@@ -3,13 +3,14 @@
 //===== By ================================================
 //= Valaris, Spira, Au{R}oN, Tharis, HiddenDragon
 //===== Version ===========================================
-//= 1.4
+//= 1.5
 //=========================================================
 //= 1.0 - Formatted to the standard
 //= 1.1 - New Effects, up to 2007/05/07 Sakexe [Au{R}oN]
 //= 1.2 - New Effects, up to 2007/07/12 Sakexe [Au{R}oN]
 //= 1.3 - New Effects, up to 2007/08/01 Sakexe [Au{R}oN]
 //= 1.4 - New Effects, up to 2007/09/11 Sakexe [Au{R}oN]
+//= 1.5 - New Effects, up to 2007/10/02 Sakexe [Au{R}oN]
 //===== Description =======================================
 //= A list of client-side effects sorted by their ID
 //=========================================================
@@ -709,4 +710,13 @@ number	description
 684.	Happy Valentine Day Banner
 685.	Happy Birthday Banner
 686.	Merry Christmas Banner
-687+.	No More Effects From 2007/09/11 Sakexe
\ No newline at end of file
+687.	New Area Cast
+688.	Another New Area Cast
+689.	Something like Little SandStorm Area, Maybe something related Satan Morroc MVP.
+690.	Little Burning Flame, Maybe something related Satan Morroc MVP.
+691.	The Same of 690 But it's Green.
+692.	Flying Little Skulls Bubbles, something like Quagmire but with Skulls.
+693.	The Sun.
+694.	The Semi-Green Sun
+695.	Something Like Green DiscoDance Light.
+696+.	No More Effects From 2007/10/02 Sakexe
diff --git a/src/map/map.c b/src/map/map.c
index d4f33ee3c..3df8bee8e 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -32,25 +32,14 @@
 #include "script.h"
 #include "guild.h"
 #include "pet.h"
-#include "mercenary.h"	//[orn]
+#include "mercenary.h"
 #include "atcommand.h"
 #include "charcommand.h"
 #include "log.h"
 #include "irc.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <math.h>
-
-#ifndef _WIN32
-#include <unistd.h>
-#endif
-
 #ifndef TXT_ONLY
 #include "mail.h"
 #endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -60,7 +49,6 @@
 #include <unistd.h>
 #endif
 
-
 #ifndef TXT_ONLY
 char default_codepage[32] = "";