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

Whitespace cleanup from merging

Browse Source 
Follow up to 644e294.
Sorry somehow tortoise git always screws up with those lines...
This commit is contained in:
Lemongrass3110 2016-09-29 08:19:26 +02:00
parent 644e294699
commit 9e176ce8d1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/atcommand.c
View File

@ -8125,7 +8125,7 @@ ACMD_FUNC(mapflag) {
clif_displaymessage(sd->fd,"fog, fireworks, sakura, leaves, nogo, nobaseexp, nojobexp, nomobloot, nomvploot,");
clif_displaymessage(sd->fd,"nightenabled, restricted, nodrop, novending, loadevent, nochat, partylock, guildlock,");
clif_displaymessage(sd->fd,"reset, chmautojoin, nousecart, noitemconsumption, nosumstarmiracle, nolockon, notomb,");
clif_displaymessage(sd->fd,"nocostume,gvg_te, gvg_te_castle");
clif_displaymessage(sd->fd,"nocostume, gvg_te, gvg_te_castle");
#ifdef ADJUST_SKILL_DAMAGE
clif_displaymessage(sd->fd,"skill_damage");
#endif

14
src/map/script.c
View File

@ -18787,17 +18787,17 @@ BUILDIN_FUNC(waitingroom2bg)
map_name = script_getstr(st,2);
if (strcmp(map_name, "-") != 0 && (mapindex = mapindex_name2id(map_name)) == 0)
{ // Invalid Map
{ // Invalid Map
script_pushint(st, 0);
return SCRIPT_CMD_SUCCESS;
}
return SCRIPT_CMD_SUCCESS;
}
x = script_getnum(st,3);
y = script_getnum(st,4);
if(script_hasdata(st,5))
ev = script_getstr(st,5); // Logout Event
ev = script_getstr(st,5); // Logout Event
if(script_hasdata(st,6))
dev = script_getstr(st,6); // Die Event
dev = script_getstr(st,6); // Die Event
check_event(st, ev);
check_event(st, dev);
@ -18807,7 +18807,7 @@ BUILDIN_FUNC(waitingroom2bg)
script_pushint(st,0);
return SCRIPT_CMD_SUCCESS;
}
for (i = 0; i < cd->users; i++) { // Only add those who are in the chat room
struct map_session_data *sd;
if( (sd = cd->usersd[i]) != NULL && bg_team_join(bg_id, sd) ){
@ -18839,7 +18839,7 @@ BUILDIN_FUNC(waitingroom2bg_single)
map_name = script_getstr(st, 3);
if ((mapindex = mapindex_name2id(map_name)) == 0) {
script_pushint(st, false);
return SCRIPT_CMD_SUCCESS; // Invalid Map
return SCRIPT_CMD_SUCCESS; // Invalid Map
}
x = script_getnum(st, 4);
y = script_getnum(st, 5);