summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGmOcean <hyperassassin@gmail.com>2014-11-23 23:16:52 -1000
committerGmOcean <hyperassassin@gmail.com>2014-11-23 23:16:52 -1000
commiteca655c1e581a7a25f58e9e1d96d1da7c84ea64f (patch)
treea5dd1562a3eb7778ab7dcd2ae94b1b5824b90aa2
parent467327c8169d0c952cec53535f9f2189d85baa53 (diff)
downloadhercules-eca655c1e581a7a25f58e9e1d96d1da7c84ea64f.tar.gz
hercules-eca655c1e581a7a25f58e9e1d96d1da7c84ea64f.tar.bz2
hercules-eca655c1e581a7a25f58e9e1d96d1da7c84ea64f.tar.xz
hercules-eca655c1e581a7a25f58e9e1d96d1da7c84ea64f.zip
Fixed whitespace
-rw-r--r--doc/script_commands.txt4
-rw-r--r--src/map/script.c78
2 files changed, 41 insertions, 41 deletions
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index a67e74899..ddecc4f56 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -8449,7 +8449,7 @@ if (instance_check_party(getcharid(1),2,2,149)) {
mes "All online members are between levels 1-150 and at least two are online.";
close;
} else {
- mes "Sorry, your party does not meet requirements.";
+ mes "Sorry, your party does not meet the requirements.";
close;
}
@@ -8470,7 +8470,7 @@ Example:
mes "All online members are between levels 1-150 and at least two are online.";
close;
} else {
- mes "Sorry, your guild does not meet requirements.";
+ mes "Sorry, your guild does not meet the requirements.";
close;
}
diff --git a/src/map/script.c b/src/map/script.c
index 37236d223..a4fcb118d 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -12433,35 +12433,35 @@ BUILDIN(getinventorylist){
int i,j=0,k,l;
if(!sd) return true;
- for(i=0;i<MAX_INVENTORY;i++) {
- if(sd->status.inventory[i].nameid > 0 && sd->status.inventory[i].amount > 0) {
- pc->setreg(sd,reference_uid(script->add_str("@inventorylist_id"), j),sd->status.inventory[i].nameid);
- pc->setreg(sd,reference_uid(script->add_str("@inventorylist_amount"), j),sd->status.inventory[i].amount);
- if(sd->status.inventory[i].equip) {
- for (k = 0; k < ARRAYLENGTH(script->equip); k++) {
- id = pc->checkequip(sd,script->equip[k]);
- item = sd->inventory_data[id];
- if( item != 0 ){
- if(item->nameid == sd->status.inventory[i].nameid) {
- pc->setreg(sd,reference_uid(script->add_str("@inventorylist_equip"), j),k+1);
- }
+ for(i=0;i<MAX_INVENTORY;i++) {
+ if(sd->status.inventory[i].nameid > 0 && sd->status.inventory[i].amount > 0) {
+ pc->setreg(sd,reference_uid(script->add_str("@inventorylist_id"), j),sd->status.inventory[i].nameid);
+ pc->setreg(sd,reference_uid(script->add_str("@inventorylist_amount"), j),sd->status.inventory[i].amount);
+ if(sd->status.inventory[i].equip) {
+ for (k = 0; k < ARRAYLENGTH(script->equip); k++) {
+ id = pc->checkequip(sd,script->equip[k]);
+ item = sd->inventory_data[id];
+ if( item != 0 ){
+ if(item->nameid == sd->status.inventory[i].nameid) {
+ pc->setreg(sd,reference_uid(script->add_str("@inventorylist_equip"), j),k+1);
}
}
- } else {
- pc->setreg(sd,reference_uid(script->add_str("@inventorylist_equip"), j),0);
- }
- pc->setreg(sd,reference_uid(script->add_str("@inventorylist_refine"), j),sd->status.inventory[i].refine);
- pc->setreg(sd,reference_uid(script->add_str("@inventorylist_identify"), j),sd->status.inventory[i].identify);
- pc->setreg(sd,reference_uid(script->add_str("@inventorylist_attribute"), j),sd->status.inventory[i].attribute);
- for (l = 0; l < MAX_SLOTS; l++) {
- sprintf(card_var, "@inventorylist_card%d",l+1);
- pc->setreg(sd,reference_uid(script->add_str(card_var), j),sd->status.inventory[i].card[l]);
}
- pc->setreg(sd,reference_uid(script->add_str("@inventorylist_expire"), j),sd->status.inventory[i].expire_time);
- pc->setreg(sd,reference_uid(script->add_str("@inventorylist_bound"), j),sd->status.inventory[i].bound);
- j++;
+ } else {
+ pc->setreg(sd,reference_uid(script->add_str("@inventorylist_equip"), j),0);
+ }
+ pc->setreg(sd,reference_uid(script->add_str("@inventorylist_refine"), j),sd->status.inventory[i].refine);
+ pc->setreg(sd,reference_uid(script->add_str("@inventorylist_identify"), j),sd->status.inventory[i].identify);
+ pc->setreg(sd,reference_uid(script->add_str("@inventorylist_attribute"), j),sd->status.inventory[i].attribute);
+ for (l = 0; l < MAX_SLOTS; l++) {
+ sprintf(card_var, "@inventorylist_card%d",l+1);
+ pc->setreg(sd,reference_uid(script->add_str(card_var), j),sd->status.inventory[i].card[l]);
}
+ pc->setreg(sd,reference_uid(script->add_str("@inventorylist_expire"), j),sd->status.inventory[i].expire_time);
+ pc->setreg(sd,reference_uid(script->add_str("@inventorylist_bound"), j),sd->status.inventory[i].bound);
+ j++;
}
+ }
pc->setreg(sd,script->add_str("@inventorylist_count"),j);
return true;
}
@@ -12473,23 +12473,23 @@ BUILDIN(getcartinventorylist){
int i,j=0,k;
if(!sd) return true;
- for(i=0;i<MAX_CART;i++) {
- if(sd->status.cart[i].nameid > 0 && sd->status.cart[i].amount > 0) {
- pc->setreg(sd,reference_uid(script->add_str("@cartinventorylist_id"), j),sd->status.cart[i].nameid);
- pc->setreg(sd,reference_uid(script->add_str("@cartinventorylist_amount"), j),sd->status.cart[i].amount);
- pc->setreg(sd,reference_uid(script->add_str("@cartinventorylist_equip"), j),sd->status.cart[i].equip);
- pc->setreg(sd,reference_uid(script->add_str("@cartinventorylist_refine"), j),sd->status.cart[i].refine);
- pc->setreg(sd,reference_uid(script->add_str("@cartinventorylist_identify"), j),sd->status.cart[i].identify);
- pc->setreg(sd,reference_uid(script->add_str("@cartinventorylist_attribute"), j),sd->status.cart[i].attribute);
- for (k = 0; k < MAX_SLOTS; k++) {
- sprintf(card_var, "@cartinventorylist_card%d",k+1);
- pc->setreg(sd,reference_uid(script->add_str(card_var), j),sd->status.cart[i].card[k]);
- }
- pc->setreg(sd,reference_uid(script->add_str("@cartinventorylist_expire"), j),sd->status.cart[i].expire_time);
- pc->setreg(sd,reference_uid(script->add_str("@cartinventorylist_bound"), j),sd->status.cart[i].bound);
- j++;
+ for(i=0;i<MAX_CART;i++) {
+ if(sd->status.cart[i].nameid > 0 && sd->status.cart[i].amount > 0) {
+ pc->setreg(sd,reference_uid(script->add_str("@cartinventorylist_id"), j),sd->status.cart[i].nameid);
+ pc->setreg(sd,reference_uid(script->add_str("@cartinventorylist_amount"), j),sd->status.cart[i].amount);
+ pc->setreg(sd,reference_uid(script->add_str("@cartinventorylist_equip"), j),sd->status.cart[i].equip);
+ pc->setreg(sd,reference_uid(script->add_str("@cartinventorylist_refine"), j),sd->status.cart[i].refine);
+ pc->setreg(sd,reference_uid(script->add_str("@cartinventorylist_identify"), j),sd->status.cart[i].identify);
+ pc->setreg(sd,reference_uid(script->add_str("@cartinventorylist_attribute"), j),sd->status.cart[i].attribute);
+ for (k = 0; k < MAX_SLOTS; k++) {
+ sprintf(card_var, "@cartinventorylist_card%d",k+1);
+ pc->setreg(sd,reference_uid(script->add_str(card_var), j),sd->status.cart[i].card[k]);
}
+ pc->setreg(sd,reference_uid(script->add_str("@cartinventorylist_expire"), j),sd->status.cart[i].expire_time);
+ pc->setreg(sd,reference_uid(script->add_str("@cartinventorylist_bound"), j),sd->status.cart[i].bound);
+ j++;
}
+ }
pc->setreg(sd,script->add_str("@cartinventorylist_count"),j);
return true;
}