Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed warpwaitingpc not working (bug introduced in r10471).

Browse Source 
there was a "sd != NULL" where it should be "sd == NULL"

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10499 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
FlavioJS 2007-05-07 05:18:39 +00:00
parent 4aee18a00a
commit e54e285849
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -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. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/05/07 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] * Added a check to login_sql against too long db-stored emails [ultramage]
* Removed an unused variable in script.c [Toms] * Removed an unused variable in script.c [Toms]
* Fixed Converters not overwriting each other [Playtester] * Fixed Converters not overwriting each other [Playtester]

4
src/map/chat.c
View File

@ -149,7 +149,7 @@ int chat_leavechat(struct map_session_data* sd)
cd->users--; cd->users--;
pc_setchatid(sd, 0); 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 {// Delete empty chatroom
clif_clearchat(cd, 0); clif_clearchat(cd, 0);
map_delobject(cd->bl.id); map_delobject(cd->bl.id);
@ -158,7 +158,7 @@ int chat_leavechat(struct map_session_data* sd)
for( i = leavechar; i < cd->users; i++ ) for( i = leavechar; i < cd->users; i++ )
cd->usersd[i] = cd->usersd[i + 1]; 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. //Adjust Chat location after owner has been changed.
map_delblock( &cd->bl ); map_delblock( &cd->bl );

16
src/map/script.c
View File

@ -6972,8 +6972,8 @@ BUILDIN_FUNC(getgdskilllv)
} }
/// Returns the 'basic_skill_check' setting. /// Returns the 'basic_skill_check' setting.
/// This config determines if the server check the skill level of NV_BASIC /// This config determines if the server checks the skill level of NV_BASIC
/// before alowing the basic actions. /// before allowing the basic actions.
/// ///
/// basicskillcheck() -> <bool> /// basicskillcheck() -> <bool>
BUILDIN_FUNC(basicskillcheck) BUILDIN_FUNC(basicskillcheck)
@ -8660,15 +8660,15 @@ BUILDIN_FUNC(waitingroom)
if( script_hasdata(st,5) ) if( script_hasdata(st,5) )
{ {
struct script_data* data = script_getdata(st, 5); struct script_data* last = script_getdata(st, 5);
get_val(st, data); get_val(st, last);
if( data_isstring(data) ) if( data_isstring(last) )
{// ,"<event>",<trigger> {// ,<trigger>,"<event>"
trigger = script_getnum(st, 4); trigger = script_getnum(st, 4);
ev = script_getstr(st, 5); ev = script_getstr(st, 5);
} }
else else
{// ,<trigger>,"<event>" {// ,"<event>",<trigger>
ev = script_getstr(st, 4); ev = script_getstr(st, 4);
trigger=script_getnum(st,5); trigger=script_getnum(st,5);
} }
@ -8841,7 +8841,7 @@ BUILDIN_FUNC(warpwaitingpc)
for( i = 0; i < n && cd->users > 0; i++ ) for( i = 0; i < n && cd->users > 0; i++ )
{ {
sd = cd->usersd[0]; 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); 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); mapreg_setreg(add_str("$@warpwaitingpc")+(i<<24), 0);