diff options
| -rw-r--r-- | doc/effect_list.txt | 6 | ||||
| -rw-r--r-- | eAthena-8.sln | 2 | ||||
| -rw-r--r-- | src/char_sql/int_auction.c | 2 | ||||
| -rw-r--r-- | src/map/npc.c | 5 | ||||
| -rw-r--r-- | src/map/pc.c | 6 | ||||
| -rw-r--r-- | vcproj-6/char-server_sql.dsp | 8 | ||||
| -rw-r--r-- | vcproj-7.1/char-server_sql.vcproj | 6 |
7 files changed, 23 insertions, 12 deletions
diff --git a/doc/effect_list.txt b/doc/effect_list.txt index 907b029f3..112641fd2 100644 --- a/doc/effect_list.txt +++ b/doc/effect_list.txt @@ -3,7 +3,7 @@ //===== By ================================================ //= Valaris, Spira, Au{R}oN, Tharis, HiddenDragon //===== Version =========================================== -//= 1.5 +//= 1.6 //========================================================= //= 1.0 - Formatted to the standard //= 1.1 - New Effects, up to 2007/05/07 Sakexe [Au{R}oN] @@ -11,6 +11,7 @@ //= 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] +//= 1.6 - New Effects, up to 2008/01/02 Sakexe [Au{R}oN] //===== Description ======================================= //= A list of client-side effects sorted by their ID //========================================================= @@ -719,4 +720,5 @@ number description 693. The Sun. 694. The Semi-Green Sun 695. Something Like Green DiscoDance Light. -696+. No More Effects From 2007/10/02 Sakexe +696. The same of 690 and 691 but Blue/Purple. +697+. No More Effects From 2008/01/22 Sakexe diff --git a/eAthena-8.sln b/eAthena-8.sln index c6f05d3d6..ea940b957 100644 --- a/eAthena-8.sln +++ b/eAthena-8.sln @@ -105,13 +105,11 @@ Global {D356871D-58E1-450B-967A-E8E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32 {D356871D-58E1-450B-967A-E8E9646175AF}.Debug|Win32.Build.0 = Debug|Win32 {D356871D-58E1-450B-967A-E8E9646175AF}.Debug-sql|Win32.ActiveCfg = Debug|Win32 - {D356871D-58E1-450B-967A-E8E9646175AF}.Debug-sql|Win32.Build.0 = Debug|Win32 {D356871D-58E1-450B-967A-E8E9646175AF}.Debug-txt|Win32.ActiveCfg = Debug|Win32 {D356871D-58E1-450B-967A-E8E9646175AF}.Debug-txt|Win32.Build.0 = Debug|Win32 {D356871D-58E1-450B-967A-E8E9646175AF}.Release|Win32.ActiveCfg = Release|Win32 {D356871D-58E1-450B-967A-E8E9646175AF}.Release|Win32.Build.0 = Release|Win32 {D356871D-58E1-450B-967A-E8E9646175AF}.Release-sql|Win32.ActiveCfg = Release|Win32 - {D356871D-58E1-450B-967A-E8E9646175AF}.Release-sql|Win32.Build.0 = Release|Win32 {D356871D-58E1-450B-967A-E8E9646175AF}.Release-txt|Win32.ActiveCfg = Release|Win32 {D356871D-58E1-450B-967A-E8E9646175AF}.Release-txt|Win32.Build.0 = Release|Win32 {D356871D-58E1-450B-967A-E9E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32 diff --git a/src/char_sql/int_auction.c b/src/char_sql/int_auction.c index 7ae39d7a3..a21dbb22f 100644 --- a/src/char_sql/int_auction.c +++ b/src/char_sql/int_auction.c @@ -17,8 +17,6 @@ #include <string.h> #include <stdlib.h> -// This is set to limit the search result -// On iRO, no one uses auctions, so there is no way to know static DBMap* auction_db_ = NULL; // int auction_id -> struct auction_data* void auction_delete(struct auction_data *auction); diff --git a/src/map/npc.c b/src/map/npc.c index 5ed3f4e2d..4b6231cf0 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -640,7 +640,7 @@ int npc_event_sub(struct map_session_data* sd, struct event_data* ev, const char if( i < MAX_EVENTQUEUE ) safestrncpy(sd->eventqueue[i],eventname,50); //Event enqueued. else - ShowWarning("npc_event: event queue is full !\n"); + ShowWarning("npc_event: player's event queue is full, can't add event '%s' !\n", eventname); return 1; } @@ -678,8 +678,7 @@ int npc_event(struct map_session_data* sd, const char* eventname, int mob_kill) strcat( mobevent, "::OnMyMobDead"); ev = strdb_get(ev_db, mobevent); if (ev == NULL || (nd = ev->nd) == NULL) { - if (strnicmp(eventname, "GM_MONSTER",10) != 0) - ShowError("npc_event: (mob_kill) event not found [%s]\n", mobevent); + ShowError("npc_event: (mob_kill) event not found [%s]\n", mobevent); return 0; } } else { diff --git a/src/map/pc.c b/src/map/pc.c index 1065bb788..782446c42 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -3432,9 +3432,8 @@ int pc_setpos(struct map_session_data* sd, unsigned short mapindex, int x, int y return 1; } - m=map_mapindex2mapid(mapindex); - - if( (sd->state.changemap = (sd->mapindex != mapindex)) ) + sd->state.changemap = (sd->mapindex != mapindex); + if( sd->state.changemap ) { //Misc map-changing settings if (sd->sc.count) { //Cancel some map related stuff. @@ -3463,6 +3462,7 @@ int pc_setpos(struct map_session_data* sd, unsigned short mapindex, int x, int y sd->regen.state.gc = 0; } + m=map_mapindex2mapid(mapindex); if(m<0) { uint32 ip; uint16 port; diff --git a/vcproj-6/char-server_sql.dsp b/vcproj-6/char-server_sql.dsp index 2b11e80d7..ad5f37169 100644 --- a/vcproj-6/char-server_sql.dsp +++ b/vcproj-6/char-server_sql.dsp @@ -195,6 +195,14 @@ SOURCE=..\src\char_sql\char.h # End Source File
# Begin Source File
+SOURCE=..\src\char_sql\int_auction.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\char_sql\int_auction.h
+# End Source File
+# Begin Source File
+
SOURCE=..\src\char_sql\int_guild.c
# End Source File
# Begin Source File
diff --git a/vcproj-7.1/char-server_sql.vcproj b/vcproj-7.1/char-server_sql.vcproj index f0ed1a41f..bb2765dfc 100644 --- a/vcproj-7.1/char-server_sql.vcproj +++ b/vcproj-7.1/char-server_sql.vcproj @@ -150,6 +150,12 @@ RelativePath="..\src\char_sql\char.h"> </File> <File + RelativePath="..\src\char_sql\int_auction.c"> + </File> + <File + RelativePath="..\src\char_sql\int_auction.h"> + </File> + <File RelativePath="..\src\char_sql\int_guild.c"> </File> <File |