diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-05-07 05:18:39 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-05-07 05:18:39 +0000 |
| commit | 919e29e2806ead1798d55bd6749691de3f06c47f (patch) | |
| tree | aca86014dde0ae6da74bf7d888dde4e039ba681e | |
| parent | 4dc600664fc2c4780dc6527041800044ca978b51 (diff) | |
| download | hercules-919e29e2806ead1798d55bd6749691de3f06c47f.tar.gz hercules-919e29e2806ead1798d55bd6749691de3f06c47f.tar.bz2 hercules-919e29e2806ead1798d55bd6749691de3f06c47f.tar.xz hercules-919e29e2806ead1798d55bd6749691de3f06c47f.zip | |
* Fixed warpwaitingpc not working (bug introduced in r10471).
there was a "sd != NULL" where it should be "sd == NULL"
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10499 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/chat.c | 4 | ||||
| -rw-r--r-- | src/map/script.c | 16 |
3 files changed, 11 insertions, 10 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 80ed3abc8..15dfb9e0f 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2007/05/07 + * Fixed warpwaitingpc not working (bug introduced in r10471). [FlavioJS] * Added a check to login_sql against too long db-stored emails [ultramage] * Removed an unused variable in script.c [Toms] * Fixed Converters not overwriting each other [Playtester] diff --git a/src/map/chat.c b/src/map/chat.c index e66ed7dc3..92901c86e 100644 --- a/src/map/chat.c +++ b/src/map/chat.c @@ -149,7 +149,7 @@ int chat_leavechat(struct map_session_data* sd) cd->users--; pc_setchatid(sd, 0); - if( cd->users == 0 && (*cd->owner)->type==BL_PC ) + if( cd->users == 0 && (*cd->owner)->type == BL_PC ) {// Delete empty chatroom clif_clearchat(cd, 0); map_delobject(cd->bl.id); @@ -158,7 +158,7 @@ int chat_leavechat(struct map_session_data* sd) for( i = leavechar; i < cd->users; i++ ) cd->usersd[i] = cd->usersd[i + 1]; - if( leavechar == 0 && (*cd->owner)->type==BL_PC ) + if( leavechar == 0 && (*cd->owner)->type == BL_PC ) { //Adjust Chat location after owner has been changed. map_delblock( &cd->bl ); diff --git a/src/map/script.c b/src/map/script.c index 9c46aa109..1b996ebcb 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -6972,8 +6972,8 @@ BUILDIN_FUNC(getgdskilllv) } /// Returns the 'basic_skill_check' setting. -/// This config determines if the server check the skill level of NV_BASIC -/// before alowing the basic actions. +/// This config determines if the server checks the skill level of NV_BASIC +/// before allowing the basic actions. /// /// basicskillcheck() -> <bool> BUILDIN_FUNC(basicskillcheck) @@ -8660,15 +8660,15 @@ BUILDIN_FUNC(waitingroom) if( script_hasdata(st,5) ) { - struct script_data* data = script_getdata(st, 5); - get_val(st, data); - if( data_isstring(data) ) - {// ,"<event>",<trigger> + struct script_data* last = script_getdata(st, 5); + get_val(st, last); + if( data_isstring(last) ) + {// ,<trigger>,"<event>" trigger = script_getnum(st, 4); ev = script_getstr(st, 5); } else - {// ,<trigger>,"<event>" + {// ,"<event>",<trigger> ev = script_getstr(st, 4); trigger=script_getnum(st,5); } @@ -8841,7 +8841,7 @@ BUILDIN_FUNC(warpwaitingpc) for( i = 0; i < n && cd->users > 0; i++ ) { sd = cd->usersd[0]; - if( sd != NULL ) + if( sd == NULL ) { ShowDebug("script:warpwaitingpc: no user in chat room position 0 (cd->users=%d,%d/%d)\n", cd->users, i, n); mapreg_setreg(add_str("$@warpwaitingpc")+(i<<24), 0); |