diff options
| -rw-r--r-- | db/const.txt | 8 | ||||
| -rw-r--r-- | src/char/char.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/db/const.txt b/db/const.txt index dcabf6d45..a53866b7c 100644 --- a/db/const.txt +++ b/db/const.txt @@ -712,7 +712,10 @@ SC_CONFUSION 7 SC_BLIND 8 SC_BLOODING 9 SC_DPOISON 10 -SC_BURNING 11 +SC_FEAR 11 +SC_COLD 12 +SC_BURNING 13 +SC_DEEP_SLEEP 14 SC_PROVOKE 20 SC_ENDURE 21 SC_TWOHANDQUICKEN 22 @@ -993,7 +996,6 @@ SC_FOOD_VIT_CASH 306 SC_FOOD_DEX_CASH 307 SC_FOOD_INT_CASH 308 SC_FOOD_LUK_CASH 309 -SC_FEAR 310 SC_FROSTMISTY 311 SC_ENCHANTBLADE 312 SC_DEATHBOUND 313 @@ -1071,7 +1073,6 @@ SC_BANDING_DEFENCE 384 SC_EARTHDRIVE 385 SC_INSPIRATION 386 SC_SPELLFIST 387 -SC_COLD 388 SC_STRIKING 389 SC_WARMER 390 SC_VACUUM_EXTREME 391 @@ -1083,7 +1084,6 @@ SC_RUSH_WINDMILL 396 SC_ECHOSONG 397 SC_HARMONIZE 398 SC_SIREN 399 -SC_DEEP_SLEEP 400 SC_SIRCLEOFNATURE 401 SC_GLOOMYDAY 402 SC_GLOOMYDAY_SK 403 diff --git a/src/char/char.c b/src/char/char.c index 0d96d40cb..6549ead3c 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -2239,7 +2239,7 @@ void loginif_on_ready(void) send_accounts_tologin(INVALID_TIMER, timer->gettick(), 0, 0); // if no map-server already connected, display a message... - ARR_FIND( 0, ARRAYLENGTH(server), i, server[i].fd > 0 && server[i].map[0] ); + ARR_FIND( 0, ARRAYLENGTH(server), i, server[i].fd > 0 && server[i].map ); if( i == ARRAYLENGTH(server) ) ShowStatus("Awaiting maps from map-server.\n"); } @@ -4279,7 +4279,7 @@ int parse_char(int fd) } #endif - ARR_FIND( 0, ARRAYLENGTH(server), server_id, server[server_id].fd > 0 && server[server_id].map[0] ); + ARR_FIND( 0, ARRAYLENGTH(server), server_id, server[server_id].fd > 0 && server[server_id].map ); /* not available, tell it to wait (client wont close; char select will respawn). * magic response found by Ind thanks to Yommy <3 */ if( server_id == ARRAYLENGTH(server) ) { @@ -4350,7 +4350,7 @@ int parse_char(int fd) if (i < 0 || !cd->last_point.map) { unsigned short j; //First check that there's actually a map server online. - ARR_FIND( 0, ARRAYLENGTH(server), j, server[j].fd >= 0 && server[j].map[0] ); + ARR_FIND( 0, ARRAYLENGTH(server), j, server[j].fd >= 0 && server[j].map ); if (j == ARRAYLENGTH(server)) { ShowInfo("Connection Closed. No map servers available.\n"); WFIFOHEAD(fd,3); |