Some formatting fixes before I go insane

Also delete the French translation from ladmin.

1 files changed, 87 insertions, 87 deletions

diff --git a/src/map/storage.cpp b/src/map/storage.cpp
index 2d45c69..6426cb1 100644
--- a/src/map/storage.cpp
+++ b/src/map/storage.cpp
@@ -23,7 +23,7 @@ static struct dbt *storage_db;
  * 倉庫内アイテムソート
  *------------------------------------------
  */
-int storage_comp_item (const void *_i1, const void *_i2)
+int storage_comp_item(const void *_i1, const void *_i2)
 {
     struct item *i1 = (struct item *) _i1;
     struct item *i2 = (struct item *) _i2;
@@ -37,16 +37,16 @@ int storage_comp_item (const void *_i1, const void *_i2)
     return i1->nameid - i2->nameid;
 }
 
-static void storage_db_final (db_key_t key, db_val_t data, va_list ap)
+static void storage_db_final(db_key_t key, db_val_t data, va_list ap)
 {
     struct storage *stor = (struct storage *) data;
-    free (stor);
+    free(stor);
 }
 
-void sortage_sortitem (struct storage *stor)
+void sortage_sortitem(struct storage *stor)
 {
-    nullpo_retv (stor);
-    qsort (stor->storage_, MAX_STORAGE, sizeof (struct item),
+    nullpo_retv(stor);
+    qsort(stor->storage_, MAX_STORAGE, sizeof(struct item),
            storage_comp_item);
 }
 
@@ -54,59 +54,59 @@ void sortage_sortitem (struct storage *stor)
  * 初期化とか
  *------------------------------------------
  */
-int do_init_storage (void)      // map.c::do_init()から呼ばれる
+int do_init_storage(void)      // map.c::do_init()から呼ばれる
 {
-    storage_db = numdb_init ();
+    storage_db = numdb_init();
     return 1;
 }
 
-void do_final_storage (void)    // by [MC Cameri]
+void do_final_storage(void)    // by [MC Cameri]
 {
     if (storage_db)
-        numdb_final (storage_db, storage_db_final);
+        numdb_final(storage_db, storage_db_final);
 }
 
-static void storage_reconnect_sub (db_key_t key, db_val_t data, va_list ap)
+static void storage_reconnect_sub(db_key_t key, db_val_t data, va_list ap)
 {
     //Parses storage and saves 'dirty' ones upon reconnect. [Skotlex]
     struct storage *stor = (struct storage *) data;
     if (stor->dirty && stor->storage_status == 0)   //Save closed storages.
-        storage_storage_save (stor->account_id, stor->dirty == 2 ? 1 : 0);
+        storage_storage_save(stor->account_id, stor->dirty == 2 ? 1 : 0);
 }
 
 //Function to be invoked upon server reconnection to char. To save all 'dirty' storages [Skotlex
-void do_reconnect_storage (void)
+void do_reconnect_storage(void)
 {
-    numdb_foreach (storage_db, storage_reconnect_sub);
+    numdb_foreach(storage_db, storage_reconnect_sub);
 }
 
-struct storage *account2storage (int account_id)
+struct storage *account2storage(int account_id)
 {
     struct storage *stor =
-        (struct storage *) numdb_search (storage_db, account_id);
+        (struct storage *) numdb_search(storage_db, account_id);
     if (stor == NULL)
     {
-        CREATE (stor, struct storage, 1);
+        CREATE(stor, struct storage, 1);
         stor->account_id = account_id;
-        numdb_insert (storage_db, stor->account_id, stor);
+        numdb_insert(storage_db, stor->account_id, stor);
     }
     return stor;
 }
 
 // Just to ask storage, without creation
-struct storage *account2storage2 (int account_id)
+struct storage *account2storage2(int account_id)
 {
-    return (struct storage *) numdb_search (storage_db, account_id);
+    return (struct storage *) numdb_search(storage_db, account_id);
 }
 
-int storage_delete (int account_id)
+int storage_delete(int account_id)
 {
     struct storage *stor =
-        (struct storage *) numdb_search (storage_db, account_id);
+        (struct storage *) numdb_search(storage_db, account_id);
     if (stor)
     {
-        numdb_erase (storage_db, account_id);
-        free (stor);
+        numdb_erase(storage_db, account_id);
+        free(stor);
     }
     return 0;
 }
@@ -115,19 +115,19 @@ int storage_delete (int account_id)
  * カプラ倉庫を開く
  *------------------------------------------
  */
-int storage_storageopen (struct map_session_data *sd)
+int storage_storageopen(struct map_session_data *sd)
 {
     struct storage *stor;
-    nullpo_retr (0, sd);
+    nullpo_retr(0, sd);
 
     if (sd->state.storage_open)
         return 1;               //Already open?
 
     if ((stor =
-         (struct storage *) numdb_search (storage_db,
+         (struct storage *) numdb_search(storage_db,
                                           sd->status.account_id)) == NULL)
     {                           //Request storage.
-        intif_request_storage (sd->status.account_id);
+        intif_request_storage(sd->status.account_id);
         return 1;
     }
 
@@ -136,9 +136,9 @@ int storage_storageopen (struct map_session_data *sd)
 
     stor->storage_status = 1;
     sd->state.storage_open = 1;
-    clif_storageitemlist (sd, stor);
-    clif_storageequiplist (sd, stor);
-    clif_updatestorageamount (sd, stor);
+    clif_storageitemlist(sd, stor);
+    clif_storageequiplist(sd, stor);
+    clif_updatestorageamount(sd, stor);
     return 0;
 }
 
@@ -146,27 +146,27 @@ int storage_storageopen (struct map_session_data *sd)
  * Internal add-item function.
  *------------------------------------------
  */
-static int storage_additem (struct map_session_data *sd, struct storage *stor,
+static int storage_additem(struct map_session_data *sd, struct storage *stor,
                             struct item *item_data, int amount)
 {
     struct item_data *data;
-    int  i;
+    int i;
 
     if (item_data->nameid <= 0 || amount <= 0)
         return 1;
 
-    data = itemdb_search (item_data->nameid);
+    data = itemdb_search(item_data->nameid);
 
-    if (!itemdb_isequip2 (data))
+    if (!itemdb_isequip2(data))
     {                           //Stackable
         for (i = 0; i < MAX_STORAGE; i++)
         {
-            if (compare_item (&stor->storage_[i], item_data))
+            if (compare_item(&stor->storage_[i], item_data))
             {
                 if (amount > MAX_AMOUNT - stor->storage_[i].amount)
                     return 1;
                 stor->storage_[i].amount += amount;
-                clif_storageitemadded (sd, stor, i, amount);
+                clif_storageitemadded(sd, stor, i, amount);
                 stor->dirty = 1;
                 return 0;
             }
@@ -178,11 +178,11 @@ static int storage_additem (struct map_session_data *sd, struct storage *stor,
     if (i >= MAX_STORAGE)
         return 1;
 
-    memcpy (&stor->storage_[i], item_data, sizeof (stor->storage_[0]));
+    memcpy(&stor->storage_[i], item_data, sizeof(stor->storage_[0]));
     stor->storage_[i].amount = amount;
     stor->storage_amount++;
-    clif_storageitemadded (sd, stor, i, amount);
-    clif_updatestorageamount (sd, stor);
+    clif_storageitemadded(sd, stor, i, amount);
+    clif_updatestorageamount(sd, stor);
     stor->dirty = 1;
     return 0;
 }
@@ -191,7 +191,7 @@ static int storage_additem (struct map_session_data *sd, struct storage *stor,
  * Internal del-item function
  *------------------------------------------
  */
-static int storage_delitem (struct map_session_data *sd, struct storage *stor,
+static int storage_delitem(struct map_session_data *sd, struct storage *stor,
                             int n, int amount)
 {
 
@@ -201,11 +201,11 @@ static int storage_delitem (struct map_session_data *sd, struct storage *stor,
     stor->storage_[n].amount -= amount;
     if (stor->storage_[n].amount == 0)
     {
-        memset (&stor->storage_[n], 0, sizeof (stor->storage_[0]));
+        memset(&stor->storage_[n], 0, sizeof(stor->storage_[0]));
         stor->storage_amount--;
-        clif_updatestorageamount (sd, stor);
+        clif_updatestorageamount(sd, stor);
     }
-    clif_storageitemremoved (sd, n, amount);
+    clif_storageitemremoved(sd, n, amount);
 
     stor->dirty = 1;
     return 0;
@@ -215,12 +215,12 @@ static int storage_delitem (struct map_session_data *sd, struct storage *stor,
  * Add an item to the storage from the inventory.
  *------------------------------------------
  */
-int storage_storageadd (struct map_session_data *sd, int index, int amount)
+int storage_storageadd(struct map_session_data *sd, int index, int amount)
 {
     struct storage *stor;
 
-    nullpo_retr (0, sd);
-    nullpo_retr (0, stor = account2storage2 (sd->status.account_id));
+    nullpo_retr(0, sd);
+    nullpo_retr(0, stor = account2storage2(sd->status.account_id));
 
     if ((stor->storage_amount > MAX_STORAGE) || !stor->storage_status)
         return 0;               // storage full / storage closed
@@ -235,11 +235,11 @@ int storage_storageadd (struct map_session_data *sd, int index, int amount)
         return 0;
 
 //  log_tostorage(sd, index, 0);
-    if (storage_additem (sd, stor, &sd->status.inventory[index], amount) == 0)
+    if (storage_additem(sd, stor, &sd->status.inventory[index], amount) == 0)
     {
         // remove item from inventory
-        pc_unequipinvyitem (sd, index, 0);
-        pc_delitem (sd, index, amount, 0);
+        pc_unequipinvyitem(sd, index, 0);
+        pc_delitem(sd, index, amount, 0);
     }
 
     return 1;
@@ -249,13 +249,13 @@ int storage_storageadd (struct map_session_data *sd, int index, int amount)
  * Retrieve an item from the storage.
  *------------------------------------------
  */
-int storage_storageget (struct map_session_data *sd, int index, int amount)
+int storage_storageget(struct map_session_data *sd, int index, int amount)
 {
     struct storage *stor;
-    int  flag;
+    int flag;
 
-    nullpo_retr (0, sd);
-    nullpo_retr (0, stor = account2storage2 (sd->status.account_id));
+    nullpo_retr(0, sd);
+    nullpo_retr(0, stor = account2storage2(sd->status.account_id));
 
     if (index < 0 || index >= MAX_STORAGE)
         return 0;
@@ -266,10 +266,10 @@ int storage_storageget (struct map_session_data *sd, int index, int amount)
     if (amount < 1 || amount > stor->storage_[index].amount)
         return 0;
 
-    if ((flag = pc_additem (sd, &stor->storage_[index], amount)) == 0)
-        storage_delitem (sd, stor, index, amount);
+    if ((flag = pc_additem(sd, &stor->storage_[index], amount)) == 0)
+        storage_delitem(sd, stor, index, amount);
     else
-        clif_additem (sd, 0, 0, flag);
+        clif_additem(sd, 0, 0, flag);
 //  log_fromstorage(sd, index, 0);
     return 1;
 }
@@ -278,13 +278,13 @@ int storage_storageget (struct map_session_data *sd, int index, int amount)
  * Move an item from cart to storage.
  *------------------------------------------
  */
-int storage_storageaddfromcart (struct map_session_data *sd, int index,
+int storage_storageaddfromcart(struct map_session_data *sd, int index,
                                 int amount)
 {
     struct storage *stor;
 
-    nullpo_retr (0, sd);
-    nullpo_retr (0, stor = account2storage2 (sd->status.account_id));
+    nullpo_retr(0, sd);
+    nullpo_retr(0, stor = account2storage2(sd->status.account_id));
 
     if (stor->storage_amount > MAX_STORAGE || !stor->storage_status)
         return 0;               // storage full / storage closed
@@ -298,8 +298,8 @@ int storage_storageaddfromcart (struct map_session_data *sd, int index,
     if (amount < 1 || amount > sd->status.cart[index].amount)
         return 0;
 
-    if (storage_additem (sd, stor, &sd->status.cart[index], amount) == 0)
-        pc_cart_delitem (sd, index, amount, 0);
+    if (storage_additem(sd, stor, &sd->status.cart[index], amount) == 0)
+        pc_cart_delitem(sd, index, amount, 0);
 
     return 1;
 }
@@ -308,13 +308,13 @@ int storage_storageaddfromcart (struct map_session_data *sd, int index,
  * Get from Storage to the Cart
  *------------------------------------------
  */
-int storage_storagegettocart (struct map_session_data *sd, int index,
+int storage_storagegettocart(struct map_session_data *sd, int index,
                               int amount)
 {
     struct storage *stor;
 
-    nullpo_retr (0, sd);
-    nullpo_retr (0, stor = account2storage2 (sd->status.account_id));
+    nullpo_retr(0, sd);
+    nullpo_retr(0, stor = account2storage2(sd->status.account_id));
 
     if (!stor->storage_status)
         return 0;
@@ -328,8 +328,8 @@ int storage_storagegettocart (struct map_session_data *sd, int index,
     if (amount < 1 || amount > stor->storage_[index].amount)
         return 0;
 
-    if (pc_cart_additem (sd, &stor->storage_[index], amount) == 0)
-        storage_delitem (sd, stor, index, amount);
+    if (pc_cart_additem(sd, &stor->storage_[index], amount) == 0)
+        storage_delitem(sd, stor, index, amount);
 
     return 1;
 }
@@ -338,20 +338,20 @@ int storage_storagegettocart (struct map_session_data *sd, int index,
  * Modified By Valaris to save upon closing [massdriller]
  *------------------------------------------
  */
-int storage_storageclose (struct map_session_data *sd)
+int storage_storageclose(struct map_session_data *sd)
 {
     struct storage *stor;
 
-    nullpo_retr (0, sd);
-    nullpo_retr (0, stor = account2storage2 (sd->status.account_id));
+    nullpo_retr(0, sd);
+    nullpo_retr(0, stor = account2storage2(sd->status.account_id));
 
-    clif_storageclose (sd);
+    clif_storageclose(sd);
     if (stor->storage_status)
     {
         if (save_settings & 4)
-            chrif_save (sd);    //Invokes the storage saving as well.
+            chrif_save(sd);    //Invokes the storage saving as well.
         else
-            storage_storage_save (sd->status.account_id, 0);
+            storage_storage_save(sd->status.account_id, 0);
     }
     stor->storage_status = 0;
     sd->state.storage_open = 0;
@@ -359,7 +359,7 @@ int storage_storageclose (struct map_session_data *sd)
     if (sd->npc_flags.storage)
     {
         sd->npc_flags.storage = 0;
-        map_scriptcont (sd, sd->npc_id);
+        map_scriptcont(sd, sd->npc_id);
     }
 
     return 0;
@@ -369,16 +369,16 @@ int storage_storageclose (struct map_session_data *sd)
  * When quitting the game.
  *------------------------------------------
  */
-int storage_storage_quit (struct map_session_data *sd)
+int storage_storage_quit(struct map_session_data *sd)
 {
     struct storage *stor;
 
-    nullpo_retr (0, sd);
+    nullpo_retr(0, sd);
 
-    stor = account2storage2 (sd->status.account_id);
+    stor = account2storage2(sd->status.account_id);
     if (stor)
     {
-        chrif_save (sd);        //Invokes the storage saving as well.
+        chrif_save(sd);        //Invokes the storage saving as well.
         stor->storage_status = 0;
         sd->state.storage_open = 0;
     }
@@ -386,21 +386,21 @@ int storage_storage_quit (struct map_session_data *sd)
     return 0;
 }
 
-void storage_storage_dirty (struct map_session_data *sd)
+void storage_storage_dirty(struct map_session_data *sd)
 {
     struct storage *stor;
 
-    stor = account2storage2 (sd->status.account_id);
+    stor = account2storage2(sd->status.account_id);
 
     if (stor)
         stor->dirty = 1;
 }
 
-int storage_storage_save (int account_id, int final)
+int storage_storage_save(int account_id, int final)
 {
     struct storage *stor;
 
-    stor = account2storage2 (account_id);
+    stor = account2storage2(account_id);
     if (!stor)
         return 0;
 
@@ -411,12 +411,12 @@ int storage_storage_save (int account_id, int final)
             stor->dirty = 2;
             stor->storage_status = 0;   //To prevent further manipulation of it.
         }
-        intif_send_storage (stor);
+        intif_send_storage(stor);
         return 1;
     }
     if (final)
     {                           //Clear storage from memory. Nothing to save.
-        storage_delete (account_id);
+        storage_delete(account_id);
         return 1;
     }
 
@@ -424,16 +424,16 @@ int storage_storage_save (int account_id, int final)
 }
 
 //Ack from Char-server indicating the storage was saved. [Skotlex]
-int storage_storage_saved (int account_id)
+int storage_storage_saved(int account_id)
 {
     struct storage *stor;
 
-    if ((stor = account2storage2 (account_id)) != NULL)
+    if ((stor = account2storage2(account_id)) != NULL)
     {                           //Only mark it clean if it's not in use. [Skotlex]
         if (stor->dirty && stor->storage_status == 0)
         {
             stor->dirty = 0;
-            sortage_sortitem (stor);
+            sortage_sortitem(stor);
         }
         return 1;
     }