diff --git a/conf/messages.conf b/conf/messages.conf index c1ca477a39a..61f7d350e76 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -54,7 +54,7 @@ 24: Job level raised. 25: Job level lowered. 26: [%d] seconds left until you can use -27: Storage has been not loaded yet. +27: %s has not been loaded yet. 28: No player found. 29: 1 player found. 30: %d players found. @@ -91,7 +91,11 @@ 62: Judgement has passed. 63: Mercy has been shown. 64: Mercy has been granted. -//65-69 FREE +65: Please specify a storage ID or name. (usage: @storeall ). +66: Please specify a storage ID or name. (usage: @clearstorage ). +67: Please specify a storage ID or name. (usage: @storage ). +68: Please specify a storage ID or name. (usage: @storagelist ). +69: Invalid storage name or ID 70: You have learned the skill. 71: You have forgotten the skill. 72: War of Emperium has been initiated. @@ -779,7 +783,7 @@ 918: Please enter a speed value (usage: @speed <%d-%d>). // @storage -919: Storage opened. +919: %s opened. // @guildstorage 920: Guild storage opened. @@ -1507,7 +1511,7 @@ 1393: You can't use commands while dead. // @clearstorage -1394: Your storage was cleaned. +1394: Your %s has now been cleaned. 1395: Your guild storage was cleaned. // @clearcart diff --git a/conf/storage.conf b/conf/storage.conf new file mode 100644 index 00000000000..36516403ef8 --- /dev/null +++ b/conf/storage.conf @@ -0,0 +1,53 @@ +//================= Hercules Database ========================================== +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License ==================================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2014-2024 Hercules Dev Team +//= Copyright (C) 2017 Smokexyz +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//============================================================================== +//= Storage Configuration +//================= Description ================================================ +//= There can be an unlimited amount of storages and limits. +//= All setting names are case-sensitive and must be keyed accurately. +//= Storage capacity will default to MAX_STORAGE in mmo.h if set higher +//= Storage ID 1 is the default (official) storage for accounts. +//============================================================================== + +storage_conf: ( +/****************************************************************************** +***************************** Entry structure ********************************* +******************************************************************************* +{ + Id: (int) Unique Identifier + Name: (string) Name of the storage sent to the client. + Constant: (string) Constant to be used by scripts + Capacity: (int) Maximum capacity of the storage. +} +*******************************************************************************/ +{ + Id: 1 + Name: "Main Storage" + Constant: "STORAGE_TYPE_MAIN" + Capacity: 600 +}, +) diff --git a/doc/atcommands.txt b/doc/atcommands.txt index 3be26473b7d..71055fd5c8b 100644 --- a/doc/atcommands.txt +++ b/doc/atcommands.txt @@ -560,9 +560,9 @@ Using the command without a message will enable or disable main chat. --------------------------------------- -@storage +@storage -Opens your Kafra storage. +Opens your specified Kafra storage. --------------------------------------- @@ -731,9 +731,9 @@ Valid item types: --------------------------------------- -@storeall +@storeall -Places all inventory and equipped items directly into your Kafra Storage. +Places all inventory and equipped items directly into your specified storage. --------------------------------------- @@ -743,10 +743,15 @@ Deletes all inventory items (not equipped items). --------------------------------------- -@clearstorage +@clearstorage + +Deletes all items in specified storage. + +--------------------------------------- + @cleargstorage -Deletes all items in storage (or guild storage). +Deletes all items in guild storage. --------------------------------------- diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 58b186dcb3f..78ad7857585 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -6217,19 +6217,32 @@ has no gear, script will be terminated with an error. //===================================== --------------------------------------- -*openstorage() +*openstorage({, }); -This will open character's Kafra storage window on the client connected to -the invoking character. It can be used from any kind of NPC or item -script, not just limited to Kafra Staff. +This command opens the specified storage window on the client +connected to the invoking character. It can be used from any kind of NPC or +item script and is not limited to Kafra Staff interactions. -The storage window opens regardless of whether there are open NPC dialogs -or not, but it is preferred to close the dialog before displaying the -storage window, to avoid any disruption when both windows overlap. +The storage window will open regardless of whether there are open NPC dialogs, +but it is recommended to close any dialogs before displaying the storage window +to avoid overlapping interface elements, which could disrupt the user experience. +Parameters: + : Specifies which storage to open (e.g., STORAGE_TYPE_MAIN). + Constants are declared in conf/storage.conf + (optional): Defines the access permissions for the storage window. + +Storage Modes (bitmask): + STORAGE_ACCESS_VIEW: View storage only. + STORAGE_ACCESS_GET: Allow retrieving items from storage. + STORAGE_ACCESS_PUT: Allow depositing items into storage. + STORAGE_ACCESS_ALL: (Default mode) Full access for viewing, retrieving, + and depositing items. + +Example Usage: mes("I will now open your stash for you"); close2(); - openstorage(); + openstorage(STORAGE_TYPE_MAIN); end; The mapflag 'nostorage' when set to type '2' (or 3), will not open the diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt index ce0897f698b..7868a38154f 100644 --- a/npc/custom/etc/quest_warper.txt +++ b/npc/custom/etc/quest_warper.txt @@ -474,7 +474,7 @@ L_Storage: } mes "Close this window and I will open your storage."; close2; - openstorage; + openstorage(STORAGE_TYPE_MAIN); end; L_StorageJBlow: diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index 27697fe1e66..7da3f16044e 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -293,7 +293,7 @@ function script F_KafStor { } callfunc("F_CheckKafCode"); //check your storage password, if set close2; - openstorage; + openstorage(STORAGE_TYPE_MAIN); cutin "", 255; end; } diff --git a/npc/kafras/kafras.txt b/npc/kafras/kafras.txt index 2077dbab77f..2e2ef3e29fa 100644 --- a/npc/kafras/kafras.txt +++ b/npc/kafras/kafras.txt @@ -92,7 +92,7 @@ aldeba_in,96,181,4 script Kafra Service 4_F_KAFRA5,{ mes "Thank you for your patronage."; callfunc("F_CheckKafCode"); //check your storage password, if set close2; - openstorage; + openstorage(STORAGE_TYPE_MAIN); break; case 3: mes "[Kafra Leilah]"; diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt index 0d236154cea..9a2f719bcab 100644 --- a/npc/other/CashShop_Functions.txt +++ b/npc/other/CashShop_Functions.txt @@ -46,7 +46,7 @@ function script F_CashStore { mes "Welcome to the Kafra Corporation."; mes "Here, let me open your Storage for you."; close2; - openstorage; + openstorage(STORAGE_TYPE_MAIN); cutin "",255; return; } diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index 033b5ea7429..7ff1bb16eda 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -7686,7 +7686,7 @@ function Catwarp; mes "Your storage will"; mes "be opened shortly."; close2; - openstorage; + openstorage(STORAGE_TYPE_MAIN); end; } else { @@ -7733,7 +7733,7 @@ function Catwarp; mes "Your storage will"; mes "be opened shortly."; close2; - openstorage; + openstorage(STORAGE_TYPE_MAIN); end; } else { @@ -7855,7 +7855,7 @@ function Catwarp; mes "Your storage will"; mes "be opened shortly."; close2; - openstorage; + openstorage(STORAGE_TYPE_MAIN); end; } else { diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt index b47ebc8aed0..7999810a8b4 100644 --- a/npc/quests/quests_13_2.txt +++ b/npc/quests/quests_13_2.txt @@ -109,7 +109,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 4_M_BOSSCAT,{ mes "Thank you."; mes "Your storage will be opened shortly."; close2; - openstorage; + openstorage(STORAGE_TYPE_MAIN); end; } else { @@ -156,7 +156,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 4_M_BOSSCAT,{ mes "Thank you."; mes "Your storage will be opened shortly."; close2; - openstorage; + openstorage(STORAGE_TYPE_MAIN); end; } else { @@ -277,7 +277,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 4_M_BOSSCAT,{ mes "Thank you."; mes "Your storage will be opened shortly."; close2; - openstorage; + openstorage(STORAGE_TYPE_MAIN); end; } else { diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt index 0404093d835..13d52e06a82 100644 --- a/npc/re/cities/mora.txt +++ b/npc/re/cities/mora.txt @@ -1194,7 +1194,7 @@ mora,48,128,0 script Drawer#mora_warehouse HIDDEN_NPC,{ close; } Zeny -= 100; - openstorage; + openstorage(STORAGE_TYPE_MAIN); close; case 2: mes "- You gave up using the warehouse. -"; diff --git a/npc/re/jobs/2e/rebellion.txt b/npc/re/jobs/2e/rebellion.txt index f57ba262c35..6720edae4b4 100644 --- a/npc/re/jobs/2e/rebellion.txt +++ b/npc/re/jobs/2e/rebellion.txt @@ -987,7 +987,7 @@ job_gun,216,138,4 script Butler Karlex 1_M_01,{ mes("Thank you for using the service."); close2(); if (.@select == 2) { - openstorage(); + openstorage(STORAGE_TYPE_MAIN); } end; } diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt index 44726576044..cec3eacd139 100644 --- a/npc/re/jobs/novice/academy.txt +++ b/npc/re/jobs/novice/academy.txt @@ -5422,7 +5422,7 @@ iz_ac01,95,46,5 script Kafra Guide Trainer#ac 4_F_KAFRA1,{ mes("Thanks for using~!"); close2(); cutin("", 255); - openstorage; + openstorage(STORAGE_TYPE_MAIN); end; } else { mes("[Kafra Guide Trainer]"); diff --git a/npc/re/other/dimensional_gap.txt b/npc/re/other/dimensional_gap.txt index 1a148e9afb0..222f7c3db85 100644 --- a/npc/re/other/dimensional_gap.txt +++ b/npc/re/other/dimensional_gap.txt @@ -137,7 +137,7 @@ dali,112,95,4 script Logistics Manager 4_M_MERCAT2,{ mes("You need at least 200 zeny to use the Storage."); } else { Zeny -= 200; - openstorage(); + openstorage(STORAGE_TYPE_MAIN); } close(); } diff --git a/npc/re/quests/eden/eden_service.txt b/npc/re/quests/eden/eden_service.txt index 8e8a6b5c90e..f9a4d3df37f 100644 --- a/npc/re/quests/eden/eden_service.txt +++ b/npc/re/quests/eden/eden_service.txt @@ -65,7 +65,7 @@ } Zeny -= 500; close2; - openstorage; + openstorage(STORAGE_TYPE_MAIN); end; } mes "I don't have enough zeny."; diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index 87391ba0a26..fce748d8db5 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -449,7 +449,7 @@ dic_in01,254,119,0 script Item Storage#01 CLEAR_NPC,{ } Zeny -= 500; close2; - openstorage; + openstorage(STORAGE_TYPE_MAIN); end; } diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt index b8f951ee7a2..82cea0f3af0 100644 --- a/npc/re/quests/quests_malangdo.txt +++ b/npc/re/quests/quests_malangdo.txt @@ -371,7 +371,7 @@ malangdo,184,139,4 script Storekeeper#mal 4_CAT_ADV2,{ mes "[Storekeeper]"; mes "Thank you."; close2; - openstorage; + openstorage(STORAGE_TYPE_MAIN); end; } diff --git a/npc/woe-fe/agit_main.txt b/npc/woe-fe/agit_main.txt index bbd94aeeacc..cb7c10e7b15 100644 --- a/npc/woe-fe/agit_main.txt +++ b/npc/woe-fe/agit_main.txt @@ -367,7 +367,7 @@ OnRecvCastle: mes "the Kafra Service."; close2; cutin "",255; - openstorage; + openstorage(STORAGE_TYPE_MAIN); end; case 2: mes "[Kafra Employee]"; diff --git a/npc/woe-se/agit_main_se.txt b/npc/woe-se/agit_main_se.txt index cccfb8c3904..822709ebce4 100644 --- a/npc/woe-se/agit_main_se.txt +++ b/npc/woe-se/agit_main_se.txt @@ -869,7 +869,7 @@ OnInit: mes("have at least Novice Skill"); mes("Lv.6 to use the Storage."); } - else openstorage; + else openstorage(STORAGE_TYPE_MAIN); break; case 2: mes("[Kafra Employee]"); diff --git a/sql-files/main.sql b/sql-files/main.sql index 221f153e93d..a17ad0fd258 100644 --- a/sql-files/main.sql +++ b/sql-files/main.sql @@ -967,6 +967,7 @@ INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1599908598); -- 2020-09-1 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1613840320); -- 2021-02-20--19-57.sql INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1618058468); -- 2021-04-10--15-36.sql INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1653155461); -- 2022-05-21--29-49.sql +INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1730631632); -- 2024-11-03--07-00.sql -- -- Table structure for table `storage` @@ -975,6 +976,7 @@ INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1653155461); -- 2022-05-2 CREATE TABLE IF NOT EXISTS `storage` ( `id` INT UNSIGNED NOT NULL AUTO_INCREMENT, `account_id` INT UNSIGNED NOT NULL DEFAULT '0', + `storage_id` INT UNSIGNED NOT NULL DEFAULT '1', `nameid` INT UNSIGNED NOT NULL DEFAULT '0', `amount` SMALLINT UNSIGNED NOT NULL DEFAULT '0', `equip` INT UNSIGNED NOT NULL DEFAULT '0', @@ -1000,7 +1002,8 @@ CREATE TABLE IF NOT EXISTS `storage` ( `bound` TINYINT UNSIGNED NOT NULL DEFAULT '0', `unique_id` BIGINT UNSIGNED NOT NULL DEFAULT '0', PRIMARY KEY (`id`), - KEY `account_id` (`account_id`) + KEY `account_id` (`account_id`), + KEY `storage_id` (`storage_id`) ) ENGINE=MyISAM; CREATE TABLE IF NOT EXISTS `rodex_items` ( diff --git a/sql-files/upgrades/2024-11-03--07-00.sql b/sql-files/upgrades/2024-11-03--07-00.sql new file mode 100644 index 00000000000..9d3f36da610 --- /dev/null +++ b/sql-files/upgrades/2024-11-03--07-00.sql @@ -0,0 +1,24 @@ +#1730631632 + +-- This file is part of Hercules. +-- http://herc.ws - http://github.com/HerculesWS/Hercules +-- +-- Copyright (C) 2013-2024 Hercules Dev Team +-- +-- Hercules is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . + +ALTER TABLE `storage` ADD `storage_id` INT UNSIGNED NOT NULL DEFAULT '1' AFTER `account_id`, +ADD INDEX `storage_id` (`storage_id`); + +INSERT INTO `sql_updates` (`timestamp`) VALUES (1730631632); diff --git a/sql-files/upgrades/index.txt b/sql-files/upgrades/index.txt index 6292a22f1b2..a31eab02ee1 100644 --- a/sql-files/upgrades/index.txt +++ b/sql-files/upgrades/index.txt @@ -74,3 +74,4 @@ 2022-01-05--19-00.sql 2022-10-08--08-35.sql 2022-05-21--29-49.sql +2024-11-03--07-00.sql diff --git a/src/char/int_storage.c b/src/char/int_storage.c index 1a29e864505..db3b488ba89 100644 --- a/src/char/int_storage.c +++ b/src/char/int_storage.c @@ -41,20 +41,19 @@ static struct inter_storage_interface inter_storage_s; struct inter_storage_interface *inter_storage; /// Save storage data to sql -static int inter_storage_tosql(int account_id, const struct storage_data *p) +static int inter_storage_tosql(int account_id, int storage_id, const struct storage_data *p) { int i = 0, j = 0; bool matched_p[MAX_STORAGE] = { false }; int delete[MAX_STORAGE] = { 0 }; int total_deletes = 0, total_updates = 0, total_inserts = 0; - int total_changes = 0; struct storage_data cp = { 0 }; StringBuf buf; nullpo_ret(p); VECTOR_INIT(cp.item); - inter_storage->fromsql(account_id, &cp); + inter_storage->fromsql(account_id, storage_id, &cp); StrBuf->Init(&buf); @@ -67,18 +66,18 @@ static int inter_storage_tosql(int account_id, const struct storage_data *p) struct item *p_it = NULL; ARR_FIND(0, VECTOR_LENGTH(p->item), j, - matched_p[j] != true - && (p_it = &VECTOR_INDEX(p->item, j)) != NULL - && cp_it->nameid == p_it->nameid - && cp_it->unique_id == p_it->unique_id - && memcmp(p_it->card, cp_it->card, sizeof(int) * MAX_SLOTS) == 0 - && memcmp(p_it->option, cp_it->option, 5 * MAX_ITEM_OPTIONS) == 0); + matched_p[j] != true + && (p_it = &VECTOR_INDEX(p->item, j)) != NULL + && cp_it->nameid == p_it->nameid + && cp_it->unique_id == p_it->unique_id + && memcmp(p_it->card, cp_it->card, sizeof(int) * MAX_SLOTS) == 0 + && memcmp(p_it->option, cp_it->option, 5 * MAX_ITEM_OPTIONS) == 0); if (j < VECTOR_LENGTH(p->item)) { int k = 0; if (memcmp(cp_it, p_it, sizeof(struct item)) != 0) { if (total_updates == 0) { - StrBuf->Printf(&buf, "REPLACE INTO `%s` (`id`, `account_id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `grade`, `attribute`", storage_db); + StrBuf->Printf(&buf, "REPLACE INTO `%s` (`id`, `account_id`, `storage_id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `grade`, `attribute`", storage_db); for (k = 0; k < MAX_SLOTS; k++) StrBuf->Printf(&buf, ", `card%d`", k); for (k = 0; k < MAX_ITEM_OPTIONS; k++) @@ -86,8 +85,8 @@ static int inter_storage_tosql(int account_id, const struct storage_data *p) StrBuf->AppendStr(&buf, ", `expire_time`, `bound`, `unique_id`) VALUES"); } - StrBuf->Printf(&buf, "%s('%d', '%d', '%d', '%d', '%u', '%d', '%d', '%d', '%d'", - total_updates > 0 ? ", " : "", cp_it->id, account_id, p_it->nameid, p_it->amount, p_it->equip, p_it->identify, p_it->refine, p_it->grade, p_it->attribute); + StrBuf->Printf(&buf, "%s('%d', '%d', '%d', '%d', '%d', '%u', '%d', '%d', '%d', '%d'", + total_updates > 0 ? ", " : "", cp_it->id, account_id, storage_id, p_it->nameid, p_it->amount, p_it->equip, p_it->identify, p_it->refine, p_it->grade, p_it->attribute); for (k = 0; k < MAX_SLOTS; k++) StrBuf->Printf(&buf, ", '%d'", p_it->card[k]); for (k = 0; k < MAX_ITEM_OPTIONS; ++k) @@ -133,7 +132,7 @@ static int inter_storage_tosql(int account_id, const struct storage_data *p) // Store the remaining items. if (total_inserts == 0) { StrBuf->Clear(&buf); - StrBuf->Printf(&buf, "INSERT INTO `%s` (`account_id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `grade`, `attribute`, `expire_time`, `bound`, `unique_id`", storage_db); + StrBuf->Printf(&buf, "INSERT INTO `%s` (`account_id`, `storage_id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `grade`, `attribute`, `expire_time`, `bound`, `unique_id`", storage_db); for (j = 0; j < MAX_SLOTS; ++j) StrBuf->Printf(&buf, ", `card%d`", j); for (j = 0; j < MAX_ITEM_OPTIONS; ++j) @@ -141,8 +140,8 @@ static int inter_storage_tosql(int account_id, const struct storage_data *p) StrBuf->AppendStr(&buf, ") VALUES "); } - StrBuf->Printf(&buf, "%s('%d', '%d', '%d', '%u', '%d', '%d', '%d', '%d', '%u', '%d', '%"PRIu64"'", - total_inserts > 0 ? ", " : "", account_id, p_it->nameid, p_it->amount, p_it->equip, p_it->identify, p_it->refine, p_it->grade, + StrBuf->Printf(&buf, "%s('%d', '%d', '%d', '%d', '%u', '%d', '%d', '%d', '%d', '%u', '%d', '%"PRIu64"'", + total_inserts > 0 ? ", " : "", account_id, storage_id, p_it->nameid, p_it->amount, p_it->equip, p_it->identify, p_it->refine, p_it->grade, p_it->attribute, p_it->expire_time, p_it->bound, p_it->unique_id); for (j = 0; j < MAX_SLOTS; ++j) StrBuf->Printf(&buf, ", '%d'", p_it->card[j]); @@ -159,44 +158,40 @@ static int inter_storage_tosql(int account_id, const struct storage_data *p) StrBuf->Destroy(&buf); VECTOR_CLEAR(cp.item); - total_changes = total_inserts + total_updates + total_deletes; - ShowInfo("storage save complete - id: %d (total: %d)\n", account_id, total_changes); - return total_changes; + ShowInfo("Storage #%d save complete - id: %d (replace: %d, insert: %d, delete: %d)\n", storage_id, account_id, total_updates, total_inserts, total_deletes); + + return total_inserts + total_updates + total_deletes; } /// Load storage data to mem -static int inter_storage_fromsql(int account_id, struct storage_data *p) +static int inter_storage_fromsql(int account_id, int storage_id, struct storage_data *p) { StringBuf buf; - char* data; + char *data; int i; - int j; - int num_rows = 0; nullpo_ret(p); - if (VECTOR_LENGTH(p->item) > 0) - VECTOR_CLEAR(p->item); + VECTOR_CLEAR(p->item); - // storage {`account_id`/`id`/`nameid`/`amount`/`equip`/`identify`/`refine`/`grade`/`attribute`/`card0`/`card1`/`card2`/`card3`} + // storage {`account_id`/`storage_id`/`id`/`nameid`/`amount`/`equip`/`identify`/`refine`/`grade`/`attribute`/`card0`/`card1`/`card2`/`card3`} StrBuf->Init(&buf); StrBuf->AppendStr(&buf, "SELECT `id`,`nameid`,`amount`,`equip`,`identify`,`refine`,`grade`,`attribute`,`expire_time`,`bound`,`unique_id`"); - for (j = 0; j < MAX_SLOTS; ++j) - StrBuf->Printf(&buf, ",`card%d`", j); - for (j = 0; j < MAX_ITEM_OPTIONS; ++j) - StrBuf->Printf(&buf, ",`opt_idx%d`,`opt_val%d`", j, j); - StrBuf->Printf(&buf, " FROM `%s` WHERE `account_id`='%d' ORDER BY `nameid`", storage_db, account_id); + for (i = 0; i < MAX_SLOTS; ++i) + StrBuf->Printf(&buf, ",`card%d`", i); + for (i = 0; i < MAX_ITEM_OPTIONS; ++i) + StrBuf->Printf(&buf, ",`opt_idx%d`,`opt_val%d`", i, i); + StrBuf->Printf(&buf, " FROM `%s` WHERE `account_id`='%d' AND `storage_id`='%d' ORDER BY `nameid`", storage_db, account_id, storage_id); if (SQL_ERROR == SQL->QueryStr(inter->sql_handle, StrBuf->Value(&buf))) Sql_ShowDebug(inter->sql_handle); StrBuf->Destroy(&buf); - if ((num_rows = (int)SQL->NumRows(inter->sql_handle)) != 0) { - - VECTOR_ENSURE(p->item, num_rows > MAX_STORAGE ? MAX_STORAGE : num_rows, 1); + if (SQL->NumRows(inter->sql_handle) > 0) { + VECTOR_ENSURE(p->item, MAX_STORAGE, 1); - for (i = 0; i < MAX_STORAGE && SQL_SUCCESS == SQL->NextRow(inter->sql_handle); ++i) { + for (int j = 0; j < MAX_STORAGE && SQL_SUCCESS == SQL->NextRow(inter->sql_handle); ++j) { struct item item = { 0 }; SQL->GetData(inter->sql_handle, 0, &data, NULL); item.id = atoi(data); SQL->GetData(inter->sql_handle, 1, &data, NULL); item.nameid = atoi(data); @@ -211,17 +206,17 @@ static int inter_storage_fromsql(int account_id, struct storage_data *p) SQL->GetData(inter->sql_handle, 10, &data, NULL); item.unique_id = strtoull(data, NULL, 10); /* Card Slots */ - for (j = 0; j < MAX_SLOTS; ++j) { - SQL->GetData(inter->sql_handle, 11 + j, &data, NULL); - item.card[j] = atoi(data); + for (i = 0; i < MAX_SLOTS; ++i) { + SQL->GetData(inter->sql_handle, 11 + i, &data, NULL); + item.card[i] = atoi(data); } /* Item Options */ - for (j = 0; j < MAX_ITEM_OPTIONS; ++j) { - SQL->GetData(inter->sql_handle, 11 + MAX_SLOTS + j * 2, &data, NULL); - item.option[j].index = atoi(data); - SQL->GetData(inter->sql_handle, 12 + MAX_SLOTS + j * 2, &data, NULL); - item.option[j].value = atoi(data); + for (i = 0; i < MAX_ITEM_OPTIONS; ++i) { + SQL->GetData(inter->sql_handle, 11 + MAX_SLOTS + i * 2, &data, NULL); + item.option[i].index = atoi(data); + SQL->GetData(inter->sql_handle, 12 + MAX_SLOTS + i * 2, &data, NULL); + item.option[i].value = atoi(data); } VECTOR_PUSH(p->item, item); @@ -230,7 +225,7 @@ static int inter_storage_fromsql(int account_id, struct storage_data *p) SQL->FreeResult(inter->sql_handle); - ShowInfo("storage load complete from DB - id: %d (total: %d)\n", account_id, VECTOR_LENGTH(p->item)); + ShowInfo("Storage #%d load complete from DB - id: %d (total: %d)\n", storage_id, account_id, VECTOR_LENGTH(p->item)); return VECTOR_LENGTH(p->item); } diff --git a/src/char/int_storage.h b/src/char/int_storage.h index 43cc929b419..346074706ac 100644 --- a/src/char/int_storage.h +++ b/src/char/int_storage.h @@ -31,8 +31,8 @@ struct guild_storage; * inter_storage interface **/ struct inter_storage_interface { - int (*tosql) (int account_id, const struct storage_data *p); - int (*fromsql) (int account_id, struct storage_data *p); + int (*tosql) (int account_id, int storage_id, const struct storage_data *p); + int (*fromsql) (int account_id, int storage_id, struct storage_data *p); bool (*guild_storage_tosql) (int guild_id, const struct guild_storage *gstor); int (*guild_storage_fromsql) (int guild_id, struct guild_storage *gstor); int (*sql_init) (void); diff --git a/src/char/mapif.c b/src/char/mapif.c index e2641587e03..41eba747dd9 100644 --- a/src/char/mapif.c +++ b/src/char/mapif.c @@ -1831,12 +1831,14 @@ static int mapif_save_guild_storage_ack(int fd, int account_id, int guild_id, in /** * Loads the account storage and send to the map server. - * @packet 0x3805 [out] .L .P + * @packet 0x3805 [out] .W .L .W .P * @param fd [in] file/socket descriptor. * @param account_id [in] account id of the session. + * @param storage_id [in] storage id to load + * @param storage_size [in] size of storage * @return 1 on success, 0 on failure. */ -static int mapif_account_storage_load(int fd, int account_id) +static int mapif_account_storage_load(int fd, int account_id, int storage_id, int storage_size) { struct storage_data stor = { 0 }; int count = 0, i = 0, len = 0; @@ -1844,16 +1846,17 @@ static int mapif_account_storage_load(int fd, int account_id) Assert_ret(account_id > 0); VECTOR_INIT(stor.item); - count = inter_storage->fromsql(account_id, &stor); + count = inter_storage->fromsql(account_id, storage_id, &stor); - len = 8 + count * sizeof(struct item); + len = 10 + count * sizeof(struct item); WFIFOHEAD(fd, len); WFIFOW(fd, 0) = 0x3805; WFIFOW(fd, 2) = (uint16) len; WFIFOL(fd, 4) = account_id; + WFIFOW(fd, 8) = storage_id; for (i = 0; i < count; i++) - memcpy(WFIFOP(fd, 8 + i * sizeof(struct item)), &VECTOR_INDEX(stor.item, i), sizeof(struct item)); + memcpy(WFIFOP(fd, 10 + i * sizeof(struct item)), &VECTOR_INDEX(stor.item, i), sizeof(struct item)); WFIFOSET(fd, len); VECTOR_CLEAR(stor.item); @@ -1863,18 +1866,22 @@ static int mapif_account_storage_load(int fd, int account_id) /** * Parses account storage load request from map server. - * @packet 0x3010 [in] .L + * @packet 0x3010 [in] .L storage_id>.W .W * @param fd [in] file/socket descriptor * @return 1 on success, 0 on failure. */ static int mapif_parse_AccountStorageLoad(int fd) { int account_id = RFIFOL(fd, 2); + int storage_id = RFIFOW(fd, 6); + int storage_size = RFIFOW(fd, 8); Assert_ret(fd > 0); Assert_ret(account_id > 0); + Assert_ret(storage_id > 0); + Assert_ret(storage_size >= 0); - mapif->account_storage_load(fd, account_id); + mapif->account_storage_load(fd, account_id, storage_id, storage_size); return 1; } @@ -1883,7 +1890,7 @@ static int mapif_parse_AccountStorageLoad(int fd) * Parses an account storage save request from the map server. * * @code{.unparsed} - * @packet 0x3011 [in] .W .L .P + * @packet 0x3011 [in] .W .L .W .P * @endcode * * @attention If the size of packet 0x3011 changes, @@ -1899,14 +1906,17 @@ static int mapif_parse_AccountStorageLoad(int fd) **/ static int mapif_parse_AccountStorageSave(int fd) { - int payload_size = RFIFOW(fd, 2) - 8, account_id = RFIFOL(fd, 4); + int payload_size = RFIFOW(fd, 2) - 10; + int account_id = RFIFOL(fd, 4); + int storage_id = RFIFOW(fd, 8); + int i = 0, count = 0; struct storage_data p_stor = { 0 }; Assert_ret(fd > 0); Assert_ret(account_id > 0); - count = payload_size/sizeof(struct item); + count = payload_size / sizeof(struct item); VECTOR_INIT(p_stor.item); @@ -1914,7 +1924,7 @@ static int mapif_parse_AccountStorageSave(int fd) VECTOR_ENSURE(p_stor.item, count, 1); for (i = 0; i < count; i++) { - const struct item *it = RFIFOP(fd, 8 + i * sizeof(struct item)); + const struct item *it = RFIFOP(fd, 10 + i * sizeof(struct item)); VECTOR_PUSH(p_stor.item, *it); } @@ -1922,11 +1932,11 @@ static int mapif_parse_AccountStorageSave(int fd) p_stor.aggregate = count; } - inter_storage->tosql(account_id, &p_stor); + inter_storage->tosql(account_id, storage_id, &p_stor); VECTOR_CLEAR(p_stor.item); - mapif->sAccountStorageSaveAck(fd, account_id, true); + mapif->sAccountStorageSaveAck(fd, account_id, storage_id, true); return 1; } @@ -1934,18 +1944,20 @@ static int mapif_parse_AccountStorageSave(int fd) /** * Sends an acknowledgement for the save * status of the account storage. - * @packet 0x3808 [out] .L .B + * @packet 0x3808 [out] .L .W .B * @param fd [in] File/Socket Descriptor. * @param account_id [in] Account ID of the storage in question. + * @param storage_id [in] acknowledgement of storage id. * @param flag [in] Save flag, true for success and false for failure. */ -static void mapif_send_AccountStorageSaveAck(int fd, int account_id, bool flag) +static void mapif_send_AccountStorageSaveAck(int fd, int account_id, int storage_id, bool flag) { - WFIFOHEAD(fd, 7); + WFIFOHEAD(fd, 9); WFIFOW(fd, 0) = 0x3808; WFIFOL(fd, 2) = account_id; - WFIFOB(fd, 6) = flag ? 1 : 0; - WFIFOSET(fd, 7); + WFIFOW(fd, 6) = storage_id; + WFIFOB(fd, 8) = flag ? 1 : 0; + WFIFOSET(fd, 9); } static int mapif_parse_LoadGuildStorage(int fd) diff --git a/src/char/mapif.h b/src/char/mapif.h index 25410fc2ce6..2a11876ffde 100644 --- a/src/char/mapif.h +++ b/src/char/mapif.h @@ -176,10 +176,10 @@ struct mapif_interface { int (*save_guild_storage_ack) (int fd, int account_id, int guild_id, int fail); int (*parse_LoadGuildStorage) (int fd); int (*parse_SaveGuildStorage) (int fd); - int (*account_storage_load) (int fd, int account_id); + int (*account_storage_load) (int fd, int account_id, int storage_id, int storage_size); int (*pAccountStorageLoad) (int fd); int (*pAccountStorageSave) (int fd); - void (*sAccountStorageSaveAck) (int fd, int account_id, bool save); + void (*sAccountStorageSaveAck) (int fd, int account_id, int storage_id, bool save); int (*itembound_ack) (int fd, int aid, int guild_id); void (*parse_ItemBoundRetrieve) (int fd); void (*parse_accinfo) (int fd); diff --git a/src/common/HPMDataCheck.h b/src/common/HPMDataCheck.h index 5d4bd1fdf25..5c137873fea 100644 --- a/src/common/HPMDataCheck.h +++ b/src/common/HPMDataCheck.h @@ -1239,6 +1239,7 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = { #ifdef MAP_STORAGE_H { "guild_storage_interface", sizeof(struct guild_storage_interface), SERVER_TYPE_MAP }, { "storage_interface", sizeof(struct storage_interface), SERVER_TYPE_MAP }, + { "storage_settings", sizeof(struct storage_settings), SERVER_TYPE_MAP }, #else #define MAP_STORAGE_H #endif // MAP_STORAGE_H diff --git a/src/common/mmo.h b/src/common/mmo.h index 1a2c3b31c96..f61ec1b9b72 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -645,6 +645,7 @@ struct status_change_data { }; struct storage_data { + int uid; ///< Storage Identifier. bool save; ///< save flag. bool received; ///< received flag. int aggregate; ///< total item count. diff --git a/src/common/msgtable.h b/src/common/msgtable.h index d3a6a7a113b..4b67360c744 100644 --- a/src/common/msgtable.h +++ b/src/common/msgtable.h @@ -58,7 +58,7 @@ enum msgtable_messages { MSGTBL_JOB_LEVEL_LOWERED = 25, /** [%d] seconds left until you can use */ MSGTBL_SECONDS_UNTIL_USE = 26, - /** Storage has been not loaded yet. */ + /** %s has not been loaded yet. */ MSGTBL_STORAGE_NOT_LOADED = 27, /** No player found. */ MSGTBL_NO_PLAYER_FOUND = 28, @@ -131,7 +131,16 @@ enum msgtable_messages { MSGTBL_MERCY_SHOWN = 63, /** Mercy has been granted. */ MSGTBL_MERCY_GRANTED = 64, - //65-69 FREE + /** Please specify a storage ID or name. (usage: @storeall ). */ + MSGTBL_STORAGE_SPECIFY_STOREALL = 65, + /** Please specify a storage ID or name. (usage: @clearstorage ). */ + MSGTBL_STORAGE_SPECIFY_CLEARSTORAGE = 66, + /** Please specify a storage ID or name. (usage: @storage ). */ + MSGTBL_STORAGE_SPECIFY_INVALID = 67, + /** Please specify a storage ID or name. (usage: @storagelist ). */ + MSGTBL_STORAGE_SPECIFY_STORAGELIST = 68, + /** Invalid storage name or ID */ + MSGTBL_STORAGE_INVALID = 69, /** You have learned the skill. */ MSGTBL_LEARNED_SKILL = 70, /** You have forgotten the skill. */ @@ -1429,7 +1438,7 @@ enum msgtable_messages { MSGTBL_ENTER_SPEED_VALUE = 918, // @storage - /** Storage opened. */ + /** %s opened. */ MSGTBL_STORAGE_OPENED = 919, // @guildstorage @@ -2577,7 +2586,7 @@ enum msgtable_messages { MSGTBL_IS_ATCOMMAND_DEAD = 1393, // @clearstorage - /** Your storage was cleaned. */ + /** Your %s has now been cleaned. */ MSGTBL_CLEARSTORAGE_SUCCESS = 1394, /** Your guild storage was cleaned. */ MSGTBL_CLEARGUILDSTORAGE_SUCCESS = 1395, diff --git a/src/common/packets_inter_len.h b/src/common/packets_inter_len.h index a0ead825e7e..d0b221d24bc 100644 --- a/src/common/packets_inter_len.h +++ b/src/common/packets_inter_len.h @@ -36,7 +36,7 @@ packetLen(0x300c, 0) packetLen(0x300d, 0) packetLen(0x300e, 0) packetLen(0x300f, 0) -packetLen(0x3010, 6) +packetLen(0x3010, 10) packetLen(0x3011, -1) packetLen(0x3012, 6) packetLen(0x3013, -1) diff --git a/src/common/packets_intif_len.h b/src/common/packets_intif_len.h index 352e96b3ad5..473f086d499 100644 --- a/src/common/packets_intif_len.h +++ b/src/common/packets_intif_len.h @@ -28,7 +28,7 @@ packetLen(0x3804, -1) packetLen(0x3805, -1) packetLen(0x3806, 37) packetLen(0x3807, -1) -packetLen(0x3808, 7) +packetLen(0x3808, 9) packetLen(0x3809, 0) packetLen(0x380a, 0) packetLen(0x380b, 0) diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 9eca9a09365..2ab9fddc35f 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -874,20 +874,55 @@ ACMD(speed) *------------------------------------------*/ ACMD(storage) { + char storage_name[NAME_LENGTH] = ""; + int storage_id = 0; + + if (*message != '\0' && sscanf(message, "%12d", &storage_id) == 1) { + // Proceed + } else if (*message != '\0' && sscanf(message, "%23s", storage_name) == 1) { + if ((storage_id = storage->get_id_by_name(storage_name)) == 0) { + clif->message(fd, msg_fd(fd, MSGTBL_STORAGE_INVALID)); + return false; + } + } else { + clif->message(fd, msg_fd(fd, MSGTBL_STORAGE_SPECIFY_INVALID)); + return false; + } + + struct storage_settings *stst = storage->get_settings(storage_id); + if (stst == NULL) { + clif->message(fd, msg_fd(fd, MSGTBL_STORAGE_INVALID)); + return false; + } + + struct storage_data *stor = storage->ensure(sd, storage_id); + if (stor == NULL) { + ShowError("atcommand_storage: Error ensuring storage for player %d, storage_id %d\n", sd->bl.id, storage_id); + return false; + } + + if (!stor->received) { + snprintf(atcmd_output, sizeof(atcmd_output), msg_fd(fd, MSGTBL_STORAGE_NOT_LOADED), stst->name); + clif->message(fd, atcmd_output); + return false; + } + if (sd->npc_id || sd->state.vending || sd->state.prevend || sd->state.buyingstore || sd->state.trading || sd->state.storage_flag) return false; if (!pc_has_permission(sd, PC_PERM_BYPASS_NOSTORAGE) && (map->list[sd->bl.m].flag.nostorage & 1)) { // mapflag nostorage already defined? can't open :c - clif->message(fd, msg_fd(fd, MSGTBL_CANNOT_OPEN_STORAGE)); // You currently cannot open your storage. + clif->message(fd, msg_fd(fd, MSGTBL_CANNOT_OPEN_STORAGE)); return false; } - if (storage->open(sd) == 1) { //Already open. - clif->message(fd, msg_fd(fd, MSGTBL_STORAGE_ALREADY_OPEN)); // You have already opened your storage. Close it first. + if (storage->open(sd, stor, STORAGE_ACCESS_ALL) == 1) { //Already open. + clif->message(fd, msg_fd(fd, MSGTBL_STORAGE_ALREADY_OPEN)); return false; } - clif->message(fd, msg_fd(fd, MSGTBL_STORAGE_OPENED)); // Storage opened. + snprintf(atcmd_output, sizeof(atcmd_output), msg_fd(fd, MSGTBL_STORAGE_OPENED), stst->name); + + clif->message(fd, atcmd_output); return true; } @@ -5635,16 +5670,51 @@ ACMD(dropall) *------------------------------------------*/ ACMD(storeall) { - if (sd->state.storage_flag != STORAGE_FLAG_NORMAL) { - //Open storage. - if (storage->open(sd) == 1) { - clif->message(fd, msg_fd(fd, MSGTBL_CANNOT_OPEN_STORAGE)); // You currently cannot open your storage. + char storage_name[NAME_LENGTH] = ""; + int storage_id = 0; + + if (*message != '\0' && sscanf(message, "%12d", &storage_id) == 1) { + // Proceed + } else if (*message != '\0' && sscanf(message, "%23s", storage_name) == 1) { + if ((storage_id = storage->get_id_by_name(storage_name)) == 0) { + clif->message(fd, msg_fd(fd, MSGTBL_STORAGE_INVALID)); + return false; + } + } else { + clif->message(fd, msg_fd(fd, MSGTBL_STORAGE_SPECIFY_STOREALL)); + return false; + } + + struct storage_settings *stst = storage->get_settings(storage_id); + if (stst == NULL) { + clif->message(fd, msg_fd(fd, MSGTBL_STORAGE_INVALID)); + return false; + } + + struct storage_data *stor = storage->ensure(sd, storage_id); + if (stor == NULL) { + ShowError("atcommand_storeall: Error ensuring storage for player %d, storage_id %d\n", sd->bl.id, storage_id); + return false; + } + + if (sd->state.storage_flag == STORAGE_FLAG_NORMAL) { + clif->message(fd, msg_fd(fd, MSGTBL_STORAGE_ALREADY_OPEN)); + return false; + } else { + if (storage->open(sd, stor, STORAGE_ACCESS_ALL) == 1) { // Open storage. + clif->message(fd, msg_fd(fd, MSGTBL_CANNOT_OPEN_STORAGE)); return false; } } - if (sd->storage.received == false) { - clif->message(fd, msg_fd(fd, MSGTBL_STORAGE_NOT_LOADED)); // "Storage has not been loaded yet" + if (sd->storage.current != storage_id) { + ShowError("atcommand_storeall: Storage id mismatch for player %d, current storage id: %d, storage_id: %d\n", sd->bl.id, sd->storage.current, storage_id); + return false; + } + + if (stor->received == false) { + snprintf(atcmd_output, sizeof(atcmd_output), msg_fd(fd, MSGTBL_STORAGE_NOT_LOADED), stst->name); + clif->message(fd, atcmd_output); return false; } @@ -5652,39 +5722,77 @@ ACMD(storeall) if (sd->status.inventory[i].amount) { if(sd->status.inventory[i].equip != 0) pc->unequipitem(sd, i, PCUNEQUIPITEM_RECALC|PCUNEQUIPITEM_FORCE); - storage->add(sd, i, sd->status.inventory[i].amount); + storage->add(sd, stor, i, sd->status.inventory[i].amount); } } storage->close(sd); - clif->message(fd, msg_fd(fd, MSGTBL_ALL_ITEMS_STORED)); // All items stored. + clif->message(fd, msg_fd(fd, MSGTBL_ALL_ITEMS_STORED)); return true; } ACMD(clearstorage) { - int i; + int i = 0; + char storage_name[NAME_LENGTH] = ""; + int storage_id = 0; + + if (*message != '\0' && sscanf(message, "%12d", &storage_id) == 1) { + // Proceed + } else if (*message != '\0' && sscanf(message, "%23s", storage_name) == 1) { + if ((storage_id = storage->get_id_by_name(storage_name)) == 0) { + clif->message(fd, msg_fd(fd, MSGTBL_STORAGE_INVALID)); + return false; + } + } else { + clif->message(fd, msg_fd(fd, MSGTBL_STORAGE_SPECIFY_CLEARSTORAGE)); + return false; + } + + struct storage_settings *stst = storage->get_settings(storage_id); + if (stst == NULL) { + clif->message(fd, msg_fd(fd, MSGTBL_STORAGE_INVALID)); + return false; + } + + struct storage_data *stor = storage->ensure(sd, storage_id); + if (stor == NULL) { + ShowError("atcommand_clearstorage: Error ensuring storage for player %d, storage_id %d\n", sd->bl.id, storage_id); + return false; + } if (sd->state.storage_flag == STORAGE_FLAG_NORMAL) { clif->message(fd, msg_fd(fd, MSGTBL_STORAGE_ALREADY_OPEN)); return false; + } else { + if (storage->open(sd, stor, STORAGE_ACCESS_ALL) == 1) { // Open storage. + clif->message(fd, msg_fd(fd, MSGTBL_CANNOT_OPEN_STORAGE)); + return false; + } } - if (sd->storage.received == false) { - clif->message(fd, msg_fd(fd, MSGTBL_STORAGE_NOT_LOADED)); // "Storage has not been loaded yet" + if (sd->storage.current != storage_id) { + ShowError("atcommand_clearstorage: Storage id mismatch for player %d, current storage id: %d, storage_id: %d\n", sd->bl.id, sd->storage.current, storage_id); + return false; + } + + if (stor->received == false) { + snprintf(atcmd_output, sizeof(atcmd_output), msg_fd(fd, MSGTBL_STORAGE_NOT_LOADED), stst->name); + clif->message(fd, atcmd_output); return false; } - for (i = 0; i < VECTOR_LENGTH(sd->storage.item); ++i) { - if (VECTOR_INDEX(sd->storage.item, i).nameid == 0) + for (i = 0; i < VECTOR_LENGTH(stor->item); ++i) { + if (VECTOR_INDEX(stor->item, i).nameid == 0) continue; // we skip the already deleted items. - storage->delitem(sd, i, VECTOR_INDEX(sd->storage.item, i).amount); + storage->delitem(sd, stor, i, VECTOR_INDEX(stor->item, i).amount); } storage->close(sd); - clif->message(fd, msg_fd(fd, MSGTBL_CLEARSTORAGE_SUCCESS)); // Your storage was cleaned. + snprintf(atcmd_output, sizeof(atcmd_output), msg_fd(fd, MSGTBL_CLEARSTORAGE_SUCCESS), stst->name); + clif->message(fd, atcmd_output); return true; } @@ -8777,8 +8885,35 @@ ACMD(itemlist) if( strcmpi(info->command, "storagelist") == 0 ) { location = "storage"; - items = VECTOR_DATA(sd->storage.item); - size = VECTOR_LENGTH(sd->storage.item); + char storage_name[NAME_LENGTH] = ""; + int storage_id = 0; + + if (*message != '\0' && sscanf(message, "%12d", &storage_id) == 1) { + // Proceed + } else if (*message != '\0' && sscanf(message, "%23s", storage_name) == 1) { + if ((storage_id = storage->get_id_by_name(storage_name)) == 0) { + clif->message(fd, msg_fd(fd, MSGTBL_STORAGE_INVALID)); + return false; + } + } else { + clif->message(fd, msg_fd(fd, MSGTBL_STORAGE_SPECIFY_STORAGELIST)); + return false; + } + + struct storage_settings *stst = storage->get_settings(storage_id); + if (stst == NULL) { + clif->message(fd, msg_fd(fd, MSGTBL_STORAGE_INVALID)); + return false; + } + + struct storage_data *stor = storage->ensure(sd, storage_id); + if (stor == NULL) { + ShowError("atcommand_storagelist: Error ensuring storage for player %d, storage_id %d\n", sd->bl.id, storage_id); + return false; + } + + items = VECTOR_DATA(stor->item); + size = VECTOR_LENGTH(stor->item); } else if( strcmpi(info->command, "cartlist") == 0 ) { location = "cart"; items = sd->status.cart; diff --git a/src/map/chrif.c b/src/map/chrif.c index d0f576b61f1..070fd7ba5d9 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -264,8 +264,12 @@ static bool chrif_save(struct map_session_data *sd, int flag) if (sd->state.storage_flag == STORAGE_FLAG_GUILD) gstorage->save(sd->status.account_id, sd->status.guild_id, flag); - if (flag) - sd->state.storage_flag = STORAGE_FLAG_CLOSED; //Force close it. + if (flag != 0 && sd->state.storage_flag != STORAGE_FLAG_CLOSED) { + if (sd->state.storage_flag == STORAGE_FLAG_NORMAL) + storage->close(sd); + else if (sd->state.storage_flag == STORAGE_FLAG_GUILD) + gstorage->close(sd); + } //Saving of registry values. if (sd->vars_dirty) @@ -293,8 +297,11 @@ static bool chrif_save(struct map_session_data *sd, int flag) if (VECTOR_LENGTH(sd->achievement) > 0) intif->achievements_save(sd); - if (sd->storage.received == true && sd->storage.save == true) - intif->send_account_storage(sd); + for (int i = 0; i < VECTOR_LENGTH(sd->storage.list); i++) { + if (VECTOR_INDEX(sd->storage.list, i).received && VECTOR_INDEX(sd->storage.list, i).save) { + intif->send_account_storage(sd, VECTOR_INDEX(sd->storage.list, i).uid); + } + } return true; } diff --git a/src/map/clif.c b/src/map/clif.c index a84ddbe1ca8..11b50af4062 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -3178,16 +3178,21 @@ static void clif_storageList(struct map_session_data *sd, struct item *items, in { nullpo_retv(sd); - clif->inventoryStart(sd, INVTYPE_STORAGE, "Storage"); - if (sd->storage.aggregate > 0) - clif->storageItems(sd, INVTYPE_STORAGE, items, items_length); + const struct storage_settings* stst = storage->get_settings(sd->storage.current); + nullpo_retv(stst); + struct storage_data* stor = storage->ensure(sd, sd->storage.current); + nullpo_retv(stor); + + clif->inventoryStart(sd, INVTYPE_STORAGE, stst->name); + if (stor->aggregate > 0) + clif->storageItems(sd, INVTYPE_STORAGE, items, items_length, stst->name); clif->inventoryEnd(sd, INVTYPE_STORAGE); } static void clif_guildStorageList(struct map_session_data *sd, struct item *items, int items_length) { - clif->inventoryStart(sd, INVTYPE_GUILD_STORAGE, "Guild storage"); - clif->storageItems(sd, INVTYPE_GUILD_STORAGE, items, items_length); + clif->inventoryStart(sd, INVTYPE_GUILD_STORAGE, "Guild Storage"); + clif->storageItems(sd, INVTYPE_GUILD_STORAGE, items, items_length, "Storage"); clif->inventoryEnd(sd, INVTYPE_GUILD_STORAGE); } @@ -3234,10 +3239,11 @@ static void clif_inventoryEnd(struct map_session_data *sd, enum inventory_type t #endif } -static void clif_storageItems(struct map_session_data *sd, enum inventory_type type, struct item *items, int items_length) +static void clif_storageItems(struct map_session_data *sd, enum inventory_type type, struct item *items, int items_length, const char* name) { nullpo_retv(sd); nullpo_retv(items); + nullpo_retv(name); int normal_count = 0, equip_count = 0; for (int i = 0; i < items_length; ++i) { @@ -3259,7 +3265,7 @@ static void clif_storageItems(struct map_session_data *sd, enum inventory_type t storelist_normal.invType = type; #endif #if PACKETVER >= 20120925 && PACKETVER_RE_NUM < 20180829 && PACKETVER_ZERO_NUM < 20180919 && PACKETVER_MAIN_NUM < 20181002 - safestrncpy(storelist_normal.name, "Storage", NAME_LENGTH); + safestrncpy(storelist_normal.name, name, NAME_LENGTH); #endif clif->send(&storelist_normal, storelist_normal.PacketLength, &sd->bl, SELF); @@ -3274,7 +3280,7 @@ static void clif_storageItems(struct map_session_data *sd, enum inventory_type t storelist_equip.invType = type; #endif #if PACKETVER >= 20120925 && PACKETVER_RE_NUM < 20180829 && PACKETVER_ZERO_NUM < 20180919 && PACKETVER_MAIN_NUM < 20181002 - safestrncpy(storelist_equip.name, "Storage", NAME_LENGTH); + safestrncpy(storelist_equip.name, name, NAME_LENGTH); #endif clif->send(&storelist_equip, storelist_equip.PacketLength, &sd->bl, SELF); @@ -3290,7 +3296,7 @@ static void clif_storageItems(struct map_session_data *sd, enum inventory_type t storelist_normal.invType = type; #endif #if PACKETVER >= 20120925 && PACKETVER_RE_NUM < 20180829 && PACKETVER_ZERO_NUM < 20180919 && PACKETVER_MAIN_NUM < 20181002 - safestrncpy(storelist_normal.name, "Storage", NAME_LENGTH); + safestrncpy(storelist_equip.name, name, NAME_LENGTH); #endif clif->send(&storelist_normal, storelist_normal.PacketLength, &sd->bl, SELF); @@ -3305,7 +3311,7 @@ static void clif_storageItems(struct map_session_data *sd, enum inventory_type t storelist_equip.invType = type; #endif #if PACKETVER >= 20120925 && PACKETVER_RE_NUM < 20180829 && PACKETVER_ZERO_NUM < 20180919 && PACKETVER_MAIN_NUM < 20181002 - safestrncpy(storelist_equip.name, "Storage", NAME_LENGTH); + safestrncpy(storelist_equip.name, name, NAME_LENGTH); #endif clif->send(&storelist_equip, storelist_equip.PacketLength, &sd->bl, SELF); @@ -9694,14 +9700,23 @@ static void clif_serviceMessageColor(struct map_session_data *sd, uint32 color, static void clif_refresh_storagewindow(struct map_session_data *sd) { nullpo_retv(sd); + // Notify the client that the storage is open if (sd->state.storage_flag == STORAGE_FLAG_NORMAL) { - if (sd->storage.aggregate > 0) { - storage->sortitem(VECTOR_DATA(sd->storage.item), VECTOR_LENGTH(sd->storage.item)); - } - clif->storageList(sd, VECTOR_DATA(sd->storage.item), VECTOR_LENGTH(sd->storage.item)); - clif->updatestorageamount(sd, sd->storage.aggregate, MAX_STORAGE); + const struct storage_settings* stst = storage->get_settings(sd->storage.current); + nullpo_retv(stst); + + struct storage_data* stor = storage->ensure(sd, sd->storage.current); + nullpo_retv(stor); + + if (stor->aggregate > 0) + storage->sortitem(VECTOR_DATA(stor->item), VECTOR_LENGTH(stor->item)); + + clif->storageList(sd, VECTOR_DATA(stor->item), VECTOR_LENGTH(stor->item)); + + clif->updatestorageamount(sd, stor->aggregate, stst->capacity); } + // Notify the client that the gstorage is open otherwise it will // remain locked forever and nobody will be able to access it if (sd->state.storage_flag == STORAGE_FLAG_GUILD) { @@ -9791,7 +9806,12 @@ static void clif_refresh(struct map_session_data *sd) pc->disguise(sd, disguise); } - clif->refresh_storagewindow(sd); + // Close storage when refreshing the client + // to avoid an unnecessary complication of things. + if (sd->state.storage_flag == STORAGE_FLAG_NORMAL) + storage->close(sd); + else if (sd->state.storage_flag == STORAGE_FLAG_GUILD) + gstorage->close(sd); } static void clif_send_selforarea(int fd, struct block_list *bl, const void *buf, int len) @@ -14327,10 +14347,13 @@ static void clif_parse_MoveToKafra(int fd, struct map_session_data *sd) if (item_index < 0 || item_index >= sd->status.inventorySize || item_amount < 1) return; - if (sd->state.storage_flag == STORAGE_FLAG_NORMAL) - storage->add(sd, item_index, item_amount); - else if (sd->state.storage_flag == STORAGE_FLAG_GUILD) + if (sd->state.storage_flag == STORAGE_FLAG_NORMAL) { + struct storage_data* stor = storage->ensure(sd, sd->storage.current); + if (stor != NULL) + storage->add(sd, stor, item_index, item_amount); + } else if (sd->state.storage_flag == STORAGE_FLAG_GUILD) { gstorage->add(sd, item_index, item_amount); + } } static void clif_parse_MoveFromKafra(int fd, struct map_session_data *sd) __attribute__((nonnull (2))); @@ -14348,10 +14371,13 @@ static void clif_parse_MoveFromKafra(int fd, struct map_session_data *sd) item_index = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0])-1; item_amount = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[1]); - if (sd->state.storage_flag == STORAGE_FLAG_NORMAL) - storage->get(sd, item_index, item_amount); - else if(sd->state.storage_flag == STORAGE_FLAG_GUILD) + if (sd->state.storage_flag == STORAGE_FLAG_NORMAL) { + struct storage_data* stor = storage->ensure(sd, sd->storage.current); + if (stor != NULL) + storage->get(sd, stor, item_index, item_amount); + } else if (sd->state.storage_flag == STORAGE_FLAG_GUILD) { gstorage->get(sd, item_index, item_amount); + } } static void clif_parse_MoveToKafraFromCart(int fd, struct map_session_data *sd) __attribute__((nonnull (2))); @@ -14364,10 +14390,13 @@ static void clif_parse_MoveToKafraFromCart(int fd, struct map_session_data *sd) if (!pc_iscarton(sd)) return; - if (sd->state.storage_flag == STORAGE_FLAG_NORMAL) - storage->addfromcart(sd, RFIFOW(fd,2) - 2, RFIFOL(fd,4)); - else if (sd->state.storage_flag == STORAGE_FLAG_GUILD) - gstorage->addfromcart(sd, RFIFOW(fd,2) - 2, RFIFOL(fd,4)); + if (sd->state.storage_flag == STORAGE_FLAG_NORMAL) { + struct storage_data* stor = storage->ensure(sd, sd->storage.current); + if (stor != NULL) + storage->addfromcart(sd, stor, RFIFOW(fd, 2) - 2, RFIFOL(fd, 4)); + } else if (sd->state.storage_flag == STORAGE_FLAG_GUILD) { + gstorage->addfromcart(sd, RFIFOW(fd, 2) - 2, RFIFOL(fd, 4)); + } } static void clif_parse_MoveFromKafraToCart(int fd, struct map_session_data *sd) __attribute__((nonnull (2))); @@ -14380,10 +14409,13 @@ static void clif_parse_MoveFromKafraToCart(int fd, struct map_session_data *sd) if (!pc_iscarton(sd)) return; - if (sd->state.storage_flag == STORAGE_FLAG_NORMAL) - storage->gettocart(sd, RFIFOW(fd,2)-1, RFIFOL(fd,4)); - else if (sd->state.storage_flag == STORAGE_FLAG_GUILD) - gstorage->gettocart(sd, RFIFOW(fd,2)-1, RFIFOL(fd,4)); + if (sd->state.storage_flag == STORAGE_FLAG_NORMAL) { + struct storage_data* stor = storage->ensure(sd, sd->storage.current); + if (stor != NULL) + storage->gettocart(sd, stor, RFIFOW(fd, 2) - 1, RFIFOL(fd, 4)); + } else if (sd->state.storage_flag == STORAGE_FLAG_GUILD) { + gstorage->gettocart(sd, RFIFOW(fd, 2) - 1, RFIFOL(fd, 4)); + } } static void clif_parse_CloseKafra(int fd, struct map_session_data *sd) __attribute__((nonnull (2))); diff --git a/src/map/clif.h b/src/map/clif.h index e10b3c3aff9..b18e52c6db1 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -1297,7 +1297,7 @@ struct clif_interface { /* storage handling */ void (*storageList) (struct map_session_data* sd, struct item* items, int items_length); void (*guildStorageList) (struct map_session_data* sd, struct item* items, int items_length); - void (*storageItems) (struct map_session_data* sd, enum inventory_type type, struct item* items, int items_length); + void (*storageItems) (struct map_session_data* sd, enum inventory_type type, struct item* items, int items_length, const char* name); void (*inventoryStart) (struct map_session_data* sd, enum inventory_type type, const char* name); void (*inventoryEnd) (struct map_session_data* sd, enum inventory_type type); void (*updatestorageamount) (struct map_session_data* sd, int amount, int max_amount); diff --git a/src/map/intif.c b/src/map/intif.c index ee78f33d2b3..eeedaa02dda 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -306,26 +306,32 @@ static int intif_request_registry(struct map_session_data *sd, int flag) /** * Request the inter-server for a character's storage data. - * @packet 0x3010 [out] .L + * @packet 0x3010 [out] .L .W .W * @param sd [in] pointer to session data. + * @param storage_id [in] storage id to retrieve */ -static void intif_request_account_storage(const struct map_session_data *sd) +static void intif_request_account_storage(const struct map_session_data *sd, int storage_id) { nullpo_retv(sd); + + const struct storage_settings* stst = storage->get_settings(storage_id); + nullpo_retv(stst); /* Check for character server availability */ if (intif->CheckForCharServer()) return; - WFIFOHEAD(inter_fd, 6); + WFIFOHEAD(inter_fd, 10); WFIFOW(inter_fd, 0) = 0x3010; WFIFOL(inter_fd, 2) = sd->status.account_id; - WFIFOSET(inter_fd, 6); + WFIFOW(inter_fd, 6) = storage_id; + WFIFOW(inter_fd, 8) = stst->capacity; + WFIFOSET(inter_fd, 10); } /** * Parse the reception of account storage from the inter-server. - * @packet 0x3805 [in] .W .L .P + * @packet 0x3805 [in] .W .L .W .P * @param fd [in] file/socket descriptor. */ static void intif_parse_account_storage(int fd) @@ -336,31 +342,35 @@ static void intif_parse_account_storage(int fd) Assert_retv(fd > 0); - payload_size = RFIFOW(fd, 2) - 8; + payload_size = RFIFOW(fd, 2) - 10; if ((account_id = RFIFOL(fd, 4)) == 0 || (sd = map->id2sd(account_id)) == NULL) { ShowError("intif_parse_account_storage: Session pointer was null for account id %d!\n", account_id); return; } - if (sd->storage.received == true) { + struct storage_data* stor = storage->ensure(sd, RFIFOW(fd, 8)); + if (stor == NULL) + return; + + if (stor->received == true) { ShowError("intif_parse_account_storage: Multiple calls from the inter-server received.\n"); return; } storage_count = (payload_size/sizeof(struct item)); - VECTOR_ENSURE(sd->storage.item, storage_count, 1); + VECTOR_ENSURE(stor->item, storage_count, 1); - sd->storage.aggregate = storage_count; // Total items in storage. + stor->aggregate = storage_count; // Total items in storage. for (i = 0; i < storage_count; i++) { - const struct item *it = RFIFOP(fd, 8 + i * sizeof(struct item)); - VECTOR_PUSH(sd->storage.item, *it); + const struct item *it = RFIFOP(fd, 10 + i * sizeof(struct item)); + VECTOR_PUSH(stor->item, *it); } - sd->storage.received = true; // Mark the storage state as received. - sd->storage.save = false; // Initialize the save flag as false. + stor->received = true; // Mark the storage state as received. + stor->save = false; // Initialize the save flag as false. pc->checkitem(sd); // re-check remaining items. } @@ -369,7 +379,7 @@ static void intif_parse_account_storage(int fd) * Sends account storage information for saving to the character server. * * @code{.unparsed} - * @packet 0x3011 [out] .W .L .P + * @packet 0x3011 [out] .W .L .W .P * @endcode * * @attention If the size of packet 0x3011 changes, @@ -379,62 +389,80 @@ static void intif_parse_account_storage(int fd) * @see mapif_parse_AccountStorageSave() * * @param[in] sd Pointer to the session data containing the account storage information to save. + * @param storage_id [in] storage id to be saved. * **/ -static void intif_send_account_storage(struct map_session_data *sd) +static void intif_send_account_storage(struct map_session_data *sd, int storage_id) { int len = 0, i = 0, c = 0; nullpo_retv(sd); + struct storage_data* stor = storage->ensure(sd, storage_id); + if (stor == NULL) + return; + // Assert that at this point in the code, both flags are true. - Assert_retv(sd->storage.save == true); - Assert_retv(sd->storage.received == true); + Assert_retv(stor->save == true); + Assert_retv(stor->received == true); if (intif->CheckForCharServer()) return; - len = 8 + sd->storage.aggregate * sizeof(struct item); + len = 10 + stor->aggregate * sizeof(struct item); WFIFOHEAD(inter_fd, len); WFIFOW(inter_fd, 0) = 0x3011; WFIFOW(inter_fd, 2) = (uint16) len; WFIFOL(inter_fd, 4) = sd->status.account_id; - for (i = 0, c = 0; i < VECTOR_LENGTH(sd->storage.item); i++) { - if (VECTOR_INDEX(sd->storage.item, i).nameid == 0) + WFIFOW(inter_fd, 8) = storage_id; + + for (i = 0, c = 0; i < VECTOR_LENGTH(stor->item); i++) { + if (VECTOR_INDEX(stor->item, i).nameid == 0) continue; - memcpy(WFIFOP(inter_fd, 8 + c * sizeof(struct item)), &VECTOR_INDEX(sd->storage.item, i), sizeof(struct item)); + memcpy(WFIFOP(inter_fd, 10 + c * sizeof(struct item)), &VECTOR_INDEX(stor->item, i), sizeof(struct item)); c++; } WFIFOSET(inter_fd, len); - sd->storage.save = false; // Save request has been sent + if ((stor = storage->ensure(sd, storage_id)) == NULL) + return; + + stor->save = false; // Save request has been sent } /** * Parse acknowledgement packet for the saving of an account's storage. - * @packet 0x3808 [in] .L .B + * @packet 0x3808 [in] .L .W .B * @param fd [in] file/socket descriptor. */ static void intif_parse_account_storage_save_ack(int fd) { int account_id = RFIFOL(fd, 2); - uint8 saved = RFIFOB(fd, 6); - struct map_session_data *sd = NULL; + int storage_id = RFIFOW(fd, 6); + char saved = RFIFOB(fd, 8); Assert_retv(account_id > 0); Assert_retv(fd > 0); + Assert_retv(storage_id > 0); - if ((sd = map->id2sd(account_id)) == NULL) + struct map_session_data* sd = map->id2sd(account_id); + if (sd == NULL) return; // character is most probably offline. - if (saved == 0) { - ShowError("intif_parse_account_storage_save_ack: Storage has not been saved! (AID: %d)\n", account_id); - sd->storage.save = true; // Flag it as unsaved, to re-attempt later + struct storage_data *stor = storage->ensure(sd, storage_id); + if (stor == NULL) return; + + if (saved == 0) { + ShowError("intif_parse_account_storage_save_ack: Storage id %d has not been saved! (AID: %d)\n", storage_id, account_id); + stor->save = true; + return; // Flag it as unsaved, to re-attempt later } + + stor->save = false; // Storage has been saved. } //================================================================= diff --git a/src/map/intif.h b/src/map/intif.h index 17531f0b55f..29dddc657e1 100644 --- a/src/map/intif.h +++ b/src/map/intif.h @@ -65,8 +65,8 @@ struct intif_interface { int pet_equip, short intimate, short hungry, char rename_flag, char incubate, char *pet_name); int (*saveregistry) (struct map_session_data *sd); int (*request_registry) (struct map_session_data *sd, int flag); - void (*request_account_storage) (const struct map_session_data *sd); - void (*send_account_storage) (struct map_session_data *sd); + void (*request_account_storage) (const struct map_session_data *sd, int storage_id); + void (*send_account_storage) (struct map_session_data *sd, int storage_id); int (*request_guild_storage) (int account_id, int guild_id); int (*send_guild_storage) (int account_id, struct guild_storage *gstor); int (*create_party) (struct party_member *member, const char *name, int item, int item2); diff --git a/src/map/map.c b/src/map/map.c index d181fe56323..edd062aa80b 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -6527,6 +6527,7 @@ int do_final(void) script->final(); itemdb->final(); instance->final(); + storage->final(); gstorage->final(); guild->final(); party->final(); @@ -6597,6 +6598,7 @@ int do_final(void) aFree(map->GRF_PATH_FILENAME); aFree(map->INTER_CONF_NAME); aFree(map->LOG_CONF_NAME); + aFree(map->STORAGE_CONF_FILENAME); HPM->event(HPET_POST_FINAL); @@ -6858,6 +6860,18 @@ static CMDLINEARG(grfpath) map->GRF_PATH_FILENAME = aStrdup(params); return true; } +/** + * --storage-path handler + * + * Overrides the default storage configuration filename. + * @see cmdline->exec + */ +static CMDLINEARG(storagepath) +{ + aFree(map->STORAGE_CONF_FILENAME); + map->STORAGE_CONF_FILENAME = aStrdup(params); + return true; +} /** * --inter-config handler * @@ -6920,6 +6934,7 @@ void cmdline_args_init_local(void) CMDLINEARG_DEF2(script-config, scriptconfig, "Alternative script configuration.", CMDLINE_OPT_NORMAL|CMDLINE_OPT_PARAM); CMDLINEARG_DEF2(msg-config, msgconfig, "Alternative message configuration.", CMDLINE_OPT_NORMAL|CMDLINE_OPT_PARAM); CMDLINEARG_DEF2(grf-path, grfpath, "Alternative GRF path configuration.", CMDLINE_OPT_NORMAL|CMDLINE_OPT_PARAM); + CMDLINEARG_DEF2(storage-path, storagepath, "Alternative Storage configuration path.", CMDLINE_OPT_NORMAL|CMDLINE_OPT_PARAM); CMDLINEARG_DEF2(inter-config, interconfig, "Alternative inter-server configuration.", CMDLINE_OPT_NORMAL|CMDLINE_OPT_PARAM); CMDLINEARG_DEF2(log-config, logconfig, "Alternative logging configuration.", CMDLINE_OPT_NORMAL|CMDLINE_OPT_PARAM); CMDLINEARG_DEF2(script-check, scriptcheck, "Doesn't run the server, only tests the scripts passed through --load-script.", CMDLINE_OPT_SILENT); @@ -6946,6 +6961,7 @@ int do_init(int argc, char *argv[]) map->SCRIPT_CONF_NAME = aStrdup("conf/map/script.conf"); map->MSG_CONF_NAME = aStrdup("conf/messages.conf"); map->GRF_PATH_FILENAME = aStrdup("conf/grf-files.txt"); + map->STORAGE_CONF_FILENAME = aStrdup("conf/storage.conf"); HPM_map_do_init(); cmdline->exec(argc, argv, CMDLINE_OPT_PREINIT); @@ -7086,6 +7102,7 @@ int do_init(int argc, char *argv[]) status->init(minimal); party->init(minimal); guild->init(minimal); + storage->init(minimal); gstorage->init(minimal); pet->init(minimal); homun->init(minimal); @@ -7196,6 +7213,7 @@ void map_defaults(void) map->SCRIPT_CONF_NAME = "conf/map/script.conf"; map->MSG_CONF_NAME = "conf/messages.conf"; map->GRF_PATH_FILENAME = "conf/grf-files.txt"; + map->STORAGE_CONF_FILENAME = "conf/storage.conf"; map->default_codepage[0] = '\0'; map->server_port = 3306; diff --git a/src/map/map.h b/src/map/map.h index e2814f75c7c..327fce5ebb4 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -1292,6 +1292,7 @@ struct map_interface { char *SCRIPT_CONF_NAME; char *MSG_CONF_NAME; char *GRF_PATH_FILENAME; + char *STORAGE_CONF_FILENAME; char autotrade_merchants_db[32]; char autotrade_data_db[32]; diff --git a/src/map/pc.c b/src/map/pc.c index 2decb491b0e..ba3f10db889 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -1342,7 +1342,7 @@ static bool pc_authok(struct map_session_data *sd, int login_id2, time_t expirat VECTOR_INIT(sd->channels); VECTOR_INIT(sd->script_queues); VECTOR_INIT(sd->achievement); // Achievements [Smokexyz/Hercules] - VECTOR_INIT(sd->storage.item); // initialize storage item vector. + VECTOR_INIT(sd->storage.list); // Storage [Smokexyz/Hercules] VECTOR_INIT(sd->hatEffectId); VECTOR_INIT(sd->agency_requests); @@ -1592,7 +1592,8 @@ static int pc_reg_received(struct map_session_data *sd) sd->status.last_login = time(NULL); // Storage Request - intif->request_account_storage(sd); + for (i = 0; i < VECTOR_LENGTH(storage->configuration); i++) + intif->request_account_storage(sd, VECTOR_INDEX(storage->configuration, i).uid); intif->Mail_requestinbox(sd->status.char_id, 0); // MAIL SYSTEM - Request Mail Inbox intif->request_questlog(sd); @@ -10599,21 +10600,28 @@ static int pc_checkitem(struct map_session_data *sd) sd->itemcheck &= ~PCCHECKITEM_CART; } - if (sd->itemcheck & PCCHECKITEM_STORAGE && sd->storage.received == true) { - for (i = 0; i < VECTOR_LENGTH(sd->storage.item); i++) { - struct item *it = &VECTOR_INDEX(sd->storage.item, i); - - if ((id = it->nameid) == 0) + if ((sd->itemcheck & PCCHECKITEM_STORAGE) != 0) { + for (i = 0; i < VECTOR_LENGTH(sd->storage.list); i++) { + struct storage_data *stor = &VECTOR_INDEX(sd->storage.list, i); + + if (stor == NULL || stor->received == false) continue; - if (!itemdb_available(id)) { - ShowWarning("pc_checkitem: Removed invalid/disabled item id %d from storage (amount=%d, char_id=%d).\n", id, it->amount, sd->status.char_id); - storage->delitem(sd, i, it->amount); - continue; - } + for (int j = 0; j < VECTOR_LENGTH(stor->item); j++) { + struct item *it = &VECTOR_INDEX(stor->item, j); + + if ((id = it->nameid) == 0) + continue; - if (it->unique_id == 0 && itemdb->isstackable(id) == 0) - it->unique_id = itemdb->unique_id(sd); + if (!itemdb_available(id)) { + ShowWarning("pc_checkitem: Removed invalid/disabled item id %d from storage %d (amount=%d, char_id=%d).\n", id, stor->uid, it->amount, sd->status.char_id); + storage->delitem(sd, stor, j, it->amount); + continue; + } + + if (it->unique_id == 0 && itemdb->isstackable(id) == 0) + it->unique_id = itemdb->unique_id(sd); + } } storage->close(sd); diff --git a/src/map/pc.h b/src/map/pc.h index 6b8b32bf7bf..1da819685e9 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -34,6 +34,7 @@ #include "map/script.h" // struct reg_db #include "map/searchstore.h" // struct s_search_store_info #include "map/status.h" // enum sc_type, OPTION_* +#include "map/storage.h" #include "map/unit.h" // struct unit_data, struct view_data #include "map/vending.h" // struct s_vending #include "common/db.h" @@ -292,7 +293,11 @@ struct map_session_data { struct mmo_charstatus status; struct item_data *inventory_data[MAX_INVENTORY]; // direct pointers to itemdb entries (faster than doing item_id lookups) - struct storage_data storage; ///< Account Storage + struct { + int current; ///< Marker for the current storage ID in use. + enum storage_access_modes access; ///< Access level for the user. + VECTOR_DECL(struct storage_data) list; ///< Account Storage + } storage; enum pc_checkitem_types itemcheck; short equip_index[EQI_MAX]; unsigned int weight,max_weight; diff --git a/src/map/script.c b/src/map/script.c index 3a7dc50b2ec..152cbcb27b7 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11997,10 +11997,31 @@ static BUILDIN(gettimestr) static BUILDIN(openstorage) { struct map_session_data *sd = script->rid2sd(st); - if (sd == NULL) + int storage_id = script_getnum(st, 2); + const struct storage_settings* stst = storage->get_settings(storage_id); + + if (stst == NULL) { + script_pushint(st, 0); + ShowWarning("buildin_openstorage: Storage with ID %d was not found!\n", storage_id); + return false; + } + + if (sd == NULL) { + script_pushint(st, 0); + ShowWarning("buildin_openstorage: Player not attached for Storage with ID %d!\n", storage_id); return false; + } + + enum storage_access_modes storage_access = script_hasdata(st, 3) ? script_getnum(st, 3) : STORAGE_ACCESS_ALL; - if (sd->storage.received == false) { + struct storage_data* stor = storage->ensure(sd, storage_id); + if (stor == NULL) { + script_pushint(st, 0); + ShowError("buildin_openstorage: Error ensuring storage for player aid %d, storage id %d.\n", sd->bl.id, storage_id); + return false; + } + + if (stor->received == false) { script_pushint(st, 0); ShowWarning("buildin_openstorage: Storage data for AID %d has not been loaded.\n", sd->bl.id); return false; @@ -12012,9 +12033,11 @@ static BUILDIN(openstorage) return true; } - storage->open(sd); - - script_pushint(st, 1); // success flag. + if (storage->open(sd, stor, storage_access) == 0) { + script_pushint(st, 1); // success + } else { + script_pushint(st, 0); + } return true; } @@ -29155,7 +29178,7 @@ static void script_parse_builtin(void) BUILDIN_DEF(gettimetick,"i"), BUILDIN_DEF(gettime,"i?"), BUILDIN_DEF(gettimestr, "si?"), - BUILDIN_DEF(openstorage,""), + BUILDIN_DEF(openstorage, "i?"), BUILDIN_DEF(guildopenstorage,""), BUILDIN_DEF(itemskill,"vi?"), BUILDIN_DEF(produce,"i"), @@ -30460,6 +30483,12 @@ static void script_hardcoded_constants(void) script->set_constant("MF_SPECIALPOPUP", MF_SPECIALPOPUP, false, false); script->set_constant("MF_NOSENDMAIL", MF_NOSENDMAIL, false, false); + script->constdb_comment("Storage Access Types"); + script->set_constant("STORAGE_ACCESS_VIEW", STORAGE_ACCESS_VIEW, false, false); + script->set_constant("STORAGE_ACCESS_GET", STORAGE_ACCESS_GET, false, false); + script->set_constant("STORAGE_ACCESS_PUT", STORAGE_ACCESS_PUT, false, false); + script->set_constant("STORAGE_ACCESS_ALL", STORAGE_ACCESS_ALL, false, false); + script->constdb_comment("Job masks / Job map_ids"); script->set_constant("EAJL_2_1", JOBL_2_1, false, false); diff --git a/src/map/storage.c b/src/map/storage.c index 6542da49c89..141a24bcacc 100644 --- a/src/map/storage.c +++ b/src/map/storage.c @@ -32,11 +32,14 @@ #include "map/log.h" #include "map/map.h" // struct map_session_data #include "map/pc.h" -#include "common/cbasetypes.h" #include "common/db.h" +#include "common/cbasetypes.h" +#include "common/conf.h" #include "common/memmgr.h" +#include "common/mmo.h" #include "common/msgtable.h" #include "common/nullpo.h" +#include "common/showmsg.h" #include #include @@ -96,37 +99,115 @@ static void do_reconnect_storage(void) gstorage->db->foreach(gstorage->db, storage->reconnect_sub); } +/** + * Get a storage id by its name (through @commands etc...) + * + * @param[in] storage_name pointer to the storage name char array. + * @return id of the storage or 0 if not found. + */ +int storage_get_id_by_name(const char* storage_name) +{ + nullpo_ret(storage_name); + int i = 0; + + ARR_FIND(0, VECTOR_LENGTH(storage->configuration), i, strcmp(VECTOR_INDEX(storage->configuration, i).name, storage_name) == 0); + + if (i == VECTOR_LENGTH(storage->configuration)) + return 0; + + return VECTOR_INDEX(storage->configuration, i).uid; +} + +/** + * Get storage with a particular ID from a player. + * + * @param[in] sd pointer to map session data. + * @param[in] storage_id ID of the storage to receive. + * @return pointer to player's storage data structure or null if not found. + */ +struct storage_data* storage_ensure(struct map_session_data* sd, int storage_id) +{ + nullpo_retr(NULL, sd); + + if (storage_id <= 0) + return NULL; + + int i = 0; + struct storage_data* stor = NULL; + + ARR_FIND(0, VECTOR_LENGTH(sd->storage.list), i, (stor = &VECTOR_INDEX(sd->storage.list, i)) != NULL && stor->uid == storage_id); + + if (i == VECTOR_LENGTH(sd->storage.list)) { + struct storage_data t_stor = { 0 }; + + t_stor.uid = storage_id; + VECTOR_INIT(t_stor.item); + VECTOR_ENSURE(sd->storage.list, 1, 1); + VECTOR_PUSH(sd->storage.list, t_stor); + stor = &VECTOR_LAST(sd->storage.list); + } + + return stor; +} + +/** + * Get a storage's settings through its ID. + * + * @param[in] storage_id the ID of the storage to find. + * @return storage settings of the storage in question. + */ +const struct storage_settings* storage_get_settings(int storage_id) +{ + if (storage_id <= 0) + return NULL; + + int i = 0; + + ARR_FIND(0, VECTOR_LENGTH(storage->configuration), i, VECTOR_INDEX(storage->configuration, i).uid == storage_id); + + struct storage_settings* tmp_stor = NULL; + if (i < VECTOR_LENGTH(storage->configuration)) + tmp_stor = &VECTOR_INDEX(storage->configuration, i); + + return tmp_stor; +} + /*========================================== * Opens a storage. Returns: * 0 - success * 1 - fail *------------------------------------------*/ -static int storage_storageopen(struct map_session_data *sd) +static int storage_storageopen(struct map_session_data *sd, struct storage_data *stor, enum storage_access_modes mode) { - nullpo_ret(sd); + nullpo_retr(1, sd); + nullpo_retr(1, stor); - if (sd->state.storage_flag != STORAGE_FLAG_CLOSED) - return 1; //Already open? + const struct storage_settings *stst = storage->get_settings(stor->uid); + nullpo_retr(1, stst); - if (sd->storage.received == false) { - clif->message(sd->fd, msg_sd(sd, MSGTBL_STORAGE_NOT_LOADED)); // Storage has not been loaded yet. - return 1; - } + if (sd->state.storage_flag != STORAGE_FLAG_CLOSED) + return 1; // Storage is already open. - if( !pc_can_give_items(sd) ) { + // GM Permission check. + if (!pc_can_give_items(sd)) { //check is this GM level is allowed to put items to storage clif->message(sd->fd, msg_sd(sd, MSGTBL_CANT_GIVE_ITEMS)); // Your GM level doesn't authorize you to perform this action. return 1; } - sd->state.storage_flag = STORAGE_FLAG_NORMAL; + sd->state.storage_flag = STORAGE_FLAG_NORMAL; // Set the storage use state. + sd->storage.current = stor->uid; // Set current storage ID used. + sd->storage.access = mode; - if (sd->storage.aggregate > 0) { - storage->sortitem(VECTOR_DATA(sd->storage.item), VECTOR_LENGTH(sd->storage.item)); + /* Send item list to client if available. */ + if (stor->aggregate > 0) { + storage->sortitem(VECTOR_DATA(stor->item), VECTOR_LENGTH(stor->item)); } - clif->storageList(sd, VECTOR_DATA(sd->storage.item), VECTOR_LENGTH(sd->storage.item)); + clif->storageList(sd, VECTOR_DATA(stor->item), VECTOR_LENGTH(stor->item)); + + /* Send storage total items and max amount update. */ + clif->updatestorageamount(sd, stor->aggregate, stst->capacity); - clif->updatestorageamount(sd, sd->storage.aggregate, MAX_STORAGE); return 0; } @@ -156,21 +237,19 @@ static int compare_item(struct item *a, struct item *b) /*========================================== * Internal add-item function. *------------------------------------------*/ -static int storage_additem(struct map_session_data *sd, struct item *item_data, int amount) +static int storage_additem(struct map_session_data *sd, struct storage_data* stor, struct item *item_data, int amount) { - struct item_data *data = NULL; - struct item *it = NULL; - int i; - nullpo_retr(1, sd); - Assert_retr(1, sd->storage.received == true); - - nullpo_retr(1, item_data); - Assert_retr(1, item_data->nameid > 0); + nullpo_retr(1, stor); // Assert Storage + Assert_retr(1, stor->received); // Assert the availability of the storage. + nullpo_retr(1, item_data); // Assert availability of item data. + Assert_retr(1, item_data->nameid > 0); // Assert existence of item in the database. + Assert_retr(1, amount > 0); // Assert quantity of item. - Assert_retr(1, amount > 0); + const struct storage_settings *stst = storage->get_settings(stor->uid); + nullpo_retr(1, stst); // Assert existence of storage configuration. - data = itemdb->search(item_data->nameid); + struct item_data *data = itemdb->search(item_data->nameid); if (data->stack.storage && amount > data->stack.amount) // item stack limitation return 1; @@ -186,9 +265,11 @@ static int storage_additem(struct map_session_data *sd, struct item *item_data, return 1; } + int i; + struct item* it = NULL; if (itemdb->isstackable2(data)) {//Stackable - for (i = 0; i < VECTOR_LENGTH(sd->storage.item); i++) { - it = &VECTOR_INDEX(sd->storage.item, i); + for (i = 0; i < VECTOR_LENGTH(stor->item); i++) { + it = &VECTOR_INDEX(stor->item, i); if (it->nameid == 0) continue; @@ -200,8 +281,7 @@ static int storage_additem(struct map_session_data *sd, struct item *item_data, it->amount += amount; clif->storageitemadded(sd, it, i, amount); - - sd->storage.save = true; // set a save flag. + stor->save = true; // set a save flag. return 0; } @@ -209,29 +289,29 @@ static int storage_additem(struct map_session_data *sd, struct item *item_data, } // Check if storage exceeds limit. - if (sd->storage.aggregate >= MAX_STORAGE) + if (stor->aggregate >= stst->capacity) return 1; - ARR_FIND(0, VECTOR_LENGTH(sd->storage.item), i, VECTOR_INDEX(sd->storage.item, i).nameid == 0); + ARR_FIND(0, VECTOR_LENGTH(stor->item), i, VECTOR_INDEX(stor->item, i).nameid == 0); - if (i == VECTOR_LENGTH(sd->storage.item)) { - VECTOR_ENSURE(sd->storage.item, 1, 1); - VECTOR_PUSH(sd->storage.item, *item_data); - it = &VECTOR_LAST(sd->storage.item); + if (i == VECTOR_LENGTH(stor->item)) { + VECTOR_ENSURE(stor->item, 1, 1); + VECTOR_PUSH(stor->item, *item_data); + it = &VECTOR_LAST(stor->item); } else { - it = &VECTOR_INDEX(sd->storage.item, i); + it = &VECTOR_INDEX(stor->item, i); *it = *item_data; } it->amount = amount; - sd->storage.aggregate++; + stor->aggregate++; clif->storageitemadded(sd, it, i, amount); - clif->updatestorageamount(sd, sd->storage.aggregate, MAX_STORAGE); + clif->updatestorageamount(sd, stor->aggregate, stst->capacity); - sd->storage.save = true; // set a save flag. + stor->save = true; // set a save flag. return 0; } @@ -239,30 +319,30 @@ static int storage_additem(struct map_session_data *sd, struct item *item_data, /*========================================== * Internal del-item function *------------------------------------------*/ -static int storage_delitem(struct map_session_data *sd, int n, int amount) +static int storage_delitem(struct map_session_data *sd, struct storage_data* stor, int n, int amount) { - struct item *it = NULL; - nullpo_retr(1, sd); + nullpo_retr(1, stor); + Assert_retr(1, stor->received); - Assert_retr(1, sd->storage.received == true); + const struct storage_settings *stst = storage->get_settings(stor->uid); + nullpo_retr(1, stst); - Assert_retr(1, n >= 0 && n < VECTOR_LENGTH(sd->storage.item)); + Assert_retr(1, n >= 0 && n < VECTOR_LENGTH(stor->item)); - it = &VECTOR_INDEX(sd->storage.item, n); + struct item* it = &VECTOR_INDEX(stor->item, n); Assert_retr(1, amount <= it->amount); - Assert_retr(1, it->nameid > 0); it->amount -= amount; if (it->amount == 0) { memset(it, 0, sizeof(struct item)); - clif->updatestorageamount(sd, --sd->storage.aggregate, MAX_STORAGE); + clif->updatestorageamount(sd, --stor->aggregate, stst->capacity); } - sd->storage.save = true; + stor->save = true; if (sd->state.storage_flag == STORAGE_FLAG_NORMAL) clif->storageitemremoved(sd, n, amount); @@ -277,14 +357,20 @@ static int storage_delitem(struct map_session_data *sd, int n, int amount) * 0 : fail * 1 : success *------------------------------------------*/ -static int storage_add_from_inventory(struct map_session_data *sd, int index, int amount) +static int storage_add_from_inventory(struct map_session_data *sd, struct storage_data* stor, int index, int amount) { nullpo_ret(sd); + nullpo_ret(stor); + Assert_ret(stor->received); - Assert_ret(sd->storage.received == true); + const struct storage_settings *stst = storage->get_settings(stor->uid); + nullpo_ret(stst); - if (sd->storage.aggregate > MAX_STORAGE) - return 0; // storage full + if ((sd->storage.access & STORAGE_ACCESS_PUT) == 0) { + clif->delitem(sd, index, amount, DELITEM_NORMAL); + clif->additem(sd, index, amount, 0); + return 0; + } if (index < 0 || index >= sd->status.inventorySize) return 0; @@ -295,7 +381,7 @@ static int storage_add_from_inventory(struct map_session_data *sd, int index, in if (amount < 1 || amount > sd->status.inventory[index].amount) return 0; - if (storage->additem(sd, &sd->status.inventory[index], amount) == 0) + if (storage->additem(sd, stor, &sd->status.inventory[index], amount) == 0) pc->delitem(sd, index, amount, 0, DELITEM_TOSTORAGE, LOG_TYPE_STORAGE); else clif->item_movefailed(sd, index, amount); @@ -310,19 +396,20 @@ static int storage_add_from_inventory(struct map_session_data *sd, int index, in * 0 : fail * 1 : success *------------------------------------------*/ -static int storage_add_to_inventory(struct map_session_data *sd, int index, int amount) +static int storage_add_to_inventory(struct map_session_data *sd, struct storage_data* stor, int index, int amount) { - int flag; - struct item *it = NULL; - nullpo_ret(sd); + nullpo_ret(stor); + + Assert_ret(stor->received); - Assert_ret(sd->storage.received == true); + if ((sd->storage.access & STORAGE_ACCESS_GET) == 0) + return 0; - if (index < 0 || index >= VECTOR_LENGTH(sd->storage.item)) + if (index < 0 || index >= VECTOR_LENGTH(stor->item)) return 0; - it = &VECTOR_INDEX(sd->storage.item, index); + struct item* it = &VECTOR_INDEX(stor->item, index); if (it->nameid <= 0) return 0; //Nothing there @@ -330,8 +417,9 @@ static int storage_add_to_inventory(struct map_session_data *sd, int index, int if (amount < 1 || amount > it->amount) return 0; + int flag; if ((flag = pc->additem(sd, it, amount, LOG_TYPE_STORAGE)) == 0) - storage->delitem(sd, index, amount); + storage->delitem(sd, stor, index, amount); else clif->additem(sd, 0, 0, flag); @@ -345,26 +433,32 @@ static int storage_add_to_inventory(struct map_session_data *sd, int index, int * 0 : fail * 1 : success *------------------------------------------*/ -static int storage_storageaddfromcart(struct map_session_data *sd, int index, int amount) +static int storage_storageaddfromcart(struct map_session_data *sd, struct storage_data* stor, int index, int amount) { nullpo_ret(sd); + nullpo_ret(stor); + Assert_ret(stor->received); - Assert_ret(sd->storage.received == true); + const struct storage_settings *stst = storage->get_settings(stor->uid); + nullpo_ret(stst); - if (sd->storage.aggregate > MAX_STORAGE) - return 0; // storage full / storage closed + if ((sd->storage.access & STORAGE_ACCESS_PUT) == 0) { + clif->cart_delitem(sd, index, amount); + clif->cart_additem(sd, index, amount, 0); + return 0; + } if (index < 0 || index >= MAX_CART) return 0; - if( sd->status.cart[index].nameid <= 0 ) + if (sd->status.cart[index].nameid <= 0) return 0; //No item there. if (amount < 1 || amount > sd->status.cart[index].amount) return 0; - if (storage->additem(sd,&sd->status.cart[index],amount) == 0) - pc->cart_delitem(sd,index,amount,0,LOG_TYPE_STORAGE); + if (storage->additem(sd, stor, &sd->status.cart[index], amount) == 0) + pc->cart_delitem(sd, index, amount, 0, LOG_TYPE_STORAGE); return 1; } @@ -376,19 +470,19 @@ static int storage_storageaddfromcart(struct map_session_data *sd, int index, in * 0 : fail * 1 : success *------------------------------------------*/ -static int storage_storagegettocart(struct map_session_data *sd, int index, int amount) +static int storage_storagegettocart(struct map_session_data *sd, struct storage_data* stor, int index, int amount) { - int flag = 0; - struct item *it = NULL; - - nullpo_ret(sd); + nullpo_retr(0, sd); + nullpo_retr(0, stor); + Assert_retr(0, stor->received); - Assert_ret(sd->storage.received == true); + if ((sd->storage.access & STORAGE_ACCESS_GET) == 0) + return 0; - if (index < 0 || index >= VECTOR_LENGTH(sd->storage.item)) + if (index < 0 || index >= VECTOR_LENGTH(stor->item)) return 0; - it = &VECTOR_INDEX(sd->storage.item, index); + struct item* it = &VECTOR_INDEX(stor->item, index); if (it->nameid <= 0) return 0; //Nothing there. @@ -396,11 +490,12 @@ static int storage_storagegettocart(struct map_session_data *sd, int index, int if (amount < 1 || amount > it->amount) return 0; + int flag = 0; if ((flag = pc->cart_additem(sd, it, amount, LOG_TYPE_STORAGE)) == 0) - storage->delitem(sd, index, amount); + storage->delitem(sd, stor, index, amount); else { // probably this line is useless? it remove inventory lock but not storage [4144] - clif->dropitem(sd, index,0); + clif->dropitem(sd, index, 0); clif->cart_additem_ack(sd, flag == 1?0x0:0x1); } @@ -414,11 +509,11 @@ static int storage_storagegettocart(struct map_session_data *sd, int index, int *------------------------------------------*/ static void storage_storageclose(struct map_session_data *sd) { - int i = 0; - nullpo_retv(sd); + Assert_retv(sd->storage.current > 0); - Assert_retv(sd->storage.received == true); + struct storage_data *curr_stor = storage->ensure(sd, sd->storage.current); + nullpo_retv(curr_stor); clif->storageclose(sd); @@ -427,15 +522,18 @@ static void storage_storageclose(struct map_session_data *sd) /* Erase deleted account storage items from memory * and resize the vector. */ - while (i < VECTOR_LENGTH(sd->storage.item)) { - if (VECTOR_INDEX(sd->storage.item, i).nameid == 0) { - VECTOR_ERASE(sd->storage.item, i); + int i = 0; + while (i < VECTOR_LENGTH(curr_stor->item)) { + if (VECTOR_INDEX(curr_stor->item, i).nameid == 0) { + VECTOR_ERASE(curr_stor->item, i); } else { i++; } } sd->state.storage_flag = STORAGE_FLAG_CLOSED; + sd->storage.current = 0; // Reset current storage identifier. + sd->storage.access = STORAGE_ACCESS_ALL; // Reset access level to all levels. } /*========================================== @@ -887,6 +985,154 @@ static int storage_guild_storage_quit(struct map_session_data *sd, int flag) return 0; } +/** + * Read additional storage configuration fields for plugins. + * + * @param t [in] pointer to the config element being parsed. + * @param s_conf [in] pointer to the config struct being written to. + * @param filename [in] pointer to the filename string. + */ +static void storage_config_read_additional_fields(struct config_setting_t* t, struct storage_settings* s_conf, const char* filename) +{ + // plugins do their own thing. +} + +/** + * Dynamically reads storage configuration and initializes required variables. + * + * @param filename Path to configuration file. + * @param imported Whether the current config is imported from another file. + * @retval false in case of error. + */ +bool storage_config_read(const char *filename, bool imported) +{ + nullpo_retr(false, filename); + + if (!imported) + VECTOR_CLEAR(storage->configuration); + + struct config_t stor_libconf; + if (libconfig->load_file(&stor_libconf, filename) == CONFIG_FALSE) + return false; // Error message is already shown by libconfig->load_file() + + const struct config_setting_t* setting = NULL; + if ((setting = libconfig->setting_get_member(stor_libconf.root, "storage_conf")) == NULL && !imported) { + ShowError("storage_config_read: Error in reading file '%s'\n", filename); + libconfig->destroy(&stor_libconf); + return false; + } + + struct config_setting_t* t = NULL; + int i = 0; + while ((t = libconfig->setting_get_elem(setting, i++)) != NULL) { + struct storage_settings s_conf = { 0 }; + const char *constant = NULL; + + /* Id */ + if (libconfig->setting_lookup_int(t, "Id", &s_conf.uid) == CONFIG_FALSE) { + ShowError("storage_config_read: Id field not found for storage configuration in '%s'. Skipping...\n", filename); + continue; + } + + // Duplicate ID search and report... + if (!imported) { + int d = 0; + ARR_FIND(0, VECTOR_LENGTH(storage->configuration), d, VECTOR_INDEX(storage->configuration, d).uid == s_conf.uid); + if (d < VECTOR_LENGTH(storage->configuration)) { + ShowError("storage_config_read: Duplicate ID %d for storage. Skipping...\n", s_conf.uid); + continue; + } + } + + // Check for an invalid ID... + if (s_conf.uid <= 0) { + ShowError("storage_config_read: ID for storage cannot be less than or equal to zero. Skipping...\n"); + continue; + } + + /* Name */ + if (libconfig->setting_lookup_mutable_string(t, "Name", s_conf.name, NAME_LENGTH) == CONFIG_FALSE) { + ShowError("storage_config_read: Name field not found for storage configuration (Id: %d) in '%s'. Skipping...\n", s_conf.uid, filename); + continue; + } + + /* Capacity */ + if (libconfig->setting_lookup_int(t, "Capacity", &s_conf.capacity) == CONFIG_FALSE) { + ShowError("storage_config_read: Capacity field not found for storage configuration (Id: %d) in '%s'. Skipping...\n", s_conf.uid, filename); + continue; + } + + if (s_conf.capacity < 1) { + ShowWarning("storage_config_read: Invalid capacity for Storage #%d ('%s'). Skipping...\n", s_conf.uid, s_conf.name); + continue; + } + + if (s_conf.capacity > MAX_STORAGE) { + ShowWarning("storage_config_read: Capacity for Storage #%d ('%s') is over MAX_STORAGE. Capping to %d.\n", s_conf.uid, s_conf.name, MAX_STORAGE); + s_conf.capacity = min(s_conf.capacity, MAX_STORAGE); + } + + if (libconfig->setting_lookup_string(t, "Constant", &constant) == CONFIG_FALSE) { + ShowError("storage_config_read: Constant field not found for storage configuration (Id: %d) in '%s'. Skipping...\n", s_conf.uid, filename); + continue; + } + + script->set_constant(constant, s_conf.uid, false, false); + + /* Additional Fields */ + storage->config_read_additional_fields(t, &s_conf, filename); + + if (imported) { + ARR_FIND(0, VECTOR_LENGTH(storage->configuration), i, VECTOR_INDEX(storage->configuration, i).uid == s_conf.uid); + if (i < VECTOR_LENGTH(storage->configuration)) + VECTOR_ERASE(storage->configuration, i); + } + + VECTOR_ENSURE(storage->configuration, 1, 1); + VECTOR_PUSH(storage->configuration, s_conf); + } + + // import should overwrite any previous configuration, so it should be called last + const char* import = NULL; + if (libconfig->lookup_string(&stor_libconf, "import", &import) == CONFIG_TRUE) { + if (strcmp(import, filename) == 0 || strcmp(import, map->STORAGE_CONF_FILENAME) == 0) { + ShowWarning("storage_config_read: Loop detected! Skipping 'import'...\n"); + libconfig->destroy(&stor_libconf); + return false; + } else if (storage->config_read(import, true) == false) { + libconfig->destroy(&stor_libconf); + return false; + } + } + + libconfig->destroy(&stor_libconf); + + ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", VECTOR_LENGTH(storage->configuration), map->STORAGE_CONF_FILENAME); + + return true; +} + +/** +* This function initializes storage. +*/ +static void do_init_storage(bool minimal) +{ + if (minimal) + return; + VECTOR_INIT(storage->configuration); + storage->config_read(map->STORAGE_CONF_FILENAME, false); +} + +/** + * Finalizes the storage by clearing the storage configuration vector. + */ +static void do_final_storage(void) +{ + // Clear storage configuration vector. + if (VECTOR_LENGTH(storage->configuration) > 0) + VECTOR_CLEAR(storage->configuration); +} + static void do_init_gstorage(bool minimal) { if (minimal) @@ -918,9 +1164,16 @@ void storage_defaults(void) { storage = &storage_s; + storage->init = do_init_storage; + storage->final = do_final_storage; /* */ storage->reconnect = do_reconnect_storage; + storage->config_read = storage_config_read; + storage->config_read_additional_fields = storage_config_read_additional_fields; /* */ + storage->get_id_by_name = storage_get_id_by_name; + storage->ensure = storage_ensure; + storage->get_settings = storage_get_settings; storage->delitem = storage_delitem; storage->open = storage_storageopen; storage->add = storage_add_from_inventory; diff --git a/src/map/storage.h b/src/map/storage.h index b9653e15fe4..343fa13c83b 100644 --- a/src/map/storage.h +++ b/src/map/storage.h @@ -23,10 +23,20 @@ #include "common/hercules.h" #include "common/db.h" +#include "common/mmo.h" +struct config_setting_t; struct guild_storage; struct item; struct map_session_data; +struct storage_data; + +// Hercules Ultimate Storage System [Smokexyz/Hercules] +struct storage_settings { + int uid; ///< Storage Identifier. + char name[NAME_LENGTH]; ///< Storage Name + int capacity; ///< Item Capacity. +}; /** * Acceptable values for map_session_data.state.storage_flag @@ -37,21 +47,37 @@ enum storage_flag { STORAGE_FLAG_GUILD = 2, // Guild Storage open }; +// Storage Access Modes [Smokexyz/Hercules] +enum storage_access_modes { + STORAGE_ACCESS_VIEW = 0x0, + STORAGE_ACCESS_GET = 0x1, + STORAGE_ACCESS_PUT = 0x2, + STORAGE_ACCESS_ALL = STORAGE_ACCESS_VIEW | STORAGE_ACCESS_GET | STORAGE_ACCESS_PUT +}; + struct storage_interface { + VECTOR_DECL(struct storage_settings) configuration; + void (*init) (bool minimal); + void (*final) (void); /* */ void (*reconnect) (void); + bool (*config_read) (const char *filename, bool imported); + void (*config_read_additional_fields) (struct config_setting_t *t, struct storage_settings *s_conf, const char *filename); /* */ - int (*delitem) (struct map_session_data* sd, int n, int amount); - int (*open) (struct map_session_data *sd); - int (*add) (struct map_session_data *sd,int index,int amount); - int (*get) (struct map_session_data *sd,int index,int amount); - int (*additem) (struct map_session_data* sd, struct item* item_data, int amount); - int (*addfromcart) (struct map_session_data *sd,int index,int amount); - int (*gettocart) (struct map_session_data *sd,int index,int amount); + int (*get_id_by_name) (const char *storage_name); + struct storage_data* (*ensure) (struct map_session_data *sd, int storage_id); + const struct storage_settings* (*get_settings) (int storage_id); + int (*delitem) (struct map_session_data *sd, struct storage_data *stor, int n, int amount); + int (*open) (struct map_session_data *sd, struct storage_data *stor, enum storage_access_modes mode); + int (*add) (struct map_session_data *sd, struct storage_data *stor, int index, int amount); + int (*get) (struct map_session_data *sd, struct storage_data *stor, int index, int amount); + int (*additem) (struct map_session_data *sd, struct storage_data *stor, struct item *item_data, int amount); + int (*addfromcart) (struct map_session_data *sd, struct storage_data *stor, int index, int amount); + int (*gettocart) (struct map_session_data *sd, struct storage_data *stor, int index, int amount); void (*close) (struct map_session_data *sd); void (*pc_quit) (struct map_session_data *sd, int flag); int (*comp_item) (const void *i1_, const void *i2_); - void (*sortitem) (struct item* items, unsigned int size); + void (*sortitem) (struct item *items, unsigned int size); int (*reconnect_sub) (union DBKey key, struct DBData *data, va_list ap); }; diff --git a/src/map/unit.c b/src/map/unit.c index 26e39f36909..19fbc6b4f3f 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -3001,11 +3001,14 @@ static int unit_free(struct block_list *bl, enum clr_type clrtype) VECTOR_CLEAR(sd->channels); VECTOR_CLEAR(sd->script_queues); VECTOR_CLEAR(sd->achievement); // Achievement [Smokexyz/Hercules] - VECTOR_CLEAR(sd->storage.item); VECTOR_CLEAR(sd->hatEffectId); VECTOR_CLEAR(sd->title_ids); // Title [Dastgir/Hercules] VECTOR_CLEAR(sd->agency_requests); - sd->storage.received = false; + + for (int i = 0; i < VECTOR_LENGTH(sd->storage.list); i++) + VECTOR_CLEAR(VECTOR_INDEX(sd->storage.list, i).item); + VECTOR_CLEAR(sd->storage.list); + if( sd->quest_log != NULL ) { aFree(sd->quest_log); sd->quest_log = NULL; diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc index d61e0fc3c46..b1281acb826 100644 --- a/src/plugins/HPMHooking/HPMHooking.Defs.inc +++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc @@ -30,12 +30,12 @@ typedef void (*HPMHOOK_pre_HCache_init) (void); typedef void (*HPMHOOK_post_HCache_init) (void); typedef bool (*HPMHOOK_pre_HCache_check) (const char **file); typedef bool (*HPMHOOK_post_HCache_check) (bool retVal___, const char *file); -typedef FILE* (*HPMHOOK_pre_HCache_open) (const char **file, const char **opt); -typedef FILE* (*HPMHOOK_post_HCache_open) (FILE* retVal___, const char *file, const char *opt); +typedef FILE * (*HPMHOOK_pre_HCache_open) (const char **file, const char **opt); +typedef FILE * (*HPMHOOK_post_HCache_open) (FILE * retVal___, const char *file, const char *opt); #endif // COMMON_UTILS_H #ifdef LOGIN_ACCOUNT_H /* account */ -typedef struct Sql* (*HPMHOOK_pre_account_db_sql_up) (AccountDB **self); -typedef struct Sql* (*HPMHOOK_post_account_db_sql_up) (struct Sql* retVal___, AccountDB *self); +typedef struct Sql * (*HPMHOOK_pre_account_db_sql_up) (AccountDB **self); +typedef struct Sql * (*HPMHOOK_post_account_db_sql_up) (struct Sql * retVal___, AccountDB *self); typedef void (*HPMHOOK_pre_account_mmo_send_accreg2) (AccountDB **self, int *fd, int *account_id, int *char_id); typedef void (*HPMHOOK_post_account_mmo_send_accreg2) (AccountDB *self, int fd, int account_id, int char_id); typedef void (*HPMHOOK_pre_account_mmo_save_accreg2) (AccountDB **self, int *fd, int *account_id, int *char_id); @@ -44,8 +44,8 @@ typedef bool (*HPMHOOK_pre_account_mmo_auth_fromsql) (AccountDB_SQL **db, struct typedef bool (*HPMHOOK_post_account_mmo_auth_fromsql) (bool retVal___, AccountDB_SQL *db, struct mmo_account *acc, int account_id); typedef bool (*HPMHOOK_pre_account_mmo_auth_tosql) (AccountDB_SQL **db, const struct mmo_account **acc, bool *is_new); typedef bool (*HPMHOOK_post_account_mmo_auth_tosql) (bool retVal___, AccountDB_SQL *db, const struct mmo_account *acc, bool is_new); -typedef AccountDB* (*HPMHOOK_pre_account_db_sql) (void); -typedef AccountDB* (*HPMHOOK_post_account_db_sql) (AccountDB* retVal___); +typedef AccountDB * (*HPMHOOK_pre_account_db_sql) (void); +typedef AccountDB * (*HPMHOOK_post_account_db_sql) (AccountDB * retVal___); typedef bool (*HPMHOOK_pre_account_db_sql_init) (AccountDB **self); typedef bool (*HPMHOOK_post_account_db_sql_init) (bool retVal___, AccountDB *self); typedef void (*HPMHOOK_pre_account_db_sql_destroy) (AccountDB **self); @@ -64,8 +64,8 @@ typedef bool (*HPMHOOK_pre_account_db_sql_load_num) (AccountDB **self, struct mm typedef bool (*HPMHOOK_post_account_db_sql_load_num) (bool retVal___, AccountDB *self, struct mmo_account *acc, const int account_id); typedef bool (*HPMHOOK_pre_account_db_sql_load_str) (AccountDB **self, struct mmo_account **acc, const char **userid); typedef bool (*HPMHOOK_post_account_db_sql_load_str) (bool retVal___, AccountDB *self, struct mmo_account *acc, const char *userid); -typedef AccountDBIterator* (*HPMHOOK_pre_account_db_sql_iterator) (AccountDB **self); -typedef AccountDBIterator* (*HPMHOOK_post_account_db_sql_iterator) (AccountDBIterator* retVal___, AccountDB *self); +typedef AccountDBIterator * (*HPMHOOK_pre_account_db_sql_iterator) (AccountDB **self); +typedef AccountDBIterator * (*HPMHOOK_post_account_db_sql_iterator) (AccountDBIterator * retVal___, AccountDB *self); typedef void (*HPMHOOK_pre_account_db_sql_iter_destroy) (AccountDBIterator **self); typedef void (*HPMHOOK_post_account_db_sql_iter_destroy) (AccountDBIterator *self); typedef bool (*HPMHOOK_pre_account_db_sql_iter_next) (AccountDBIterator **self, struct mmo_account **acc); @@ -114,10 +114,10 @@ typedef void (*HPMHOOK_pre_achievement_readdb_additional_fields) (const struct c typedef void (*HPMHOOK_post_achievement_readdb_additional_fields) (const struct config_setting_t *conf, struct achievement_data *entry, const char *source); typedef void (*HPMHOOK_pre_achievement_readdb_ranks) (void); typedef void (*HPMHOOK_post_achievement_readdb_ranks) (void); -typedef const struct achievement_data* (*HPMHOOK_pre_achievement_get) (int *aid); -typedef const struct achievement_data* (*HPMHOOK_post_achievement_get) (const struct achievement_data* retVal___, int aid); -typedef struct achievement* (*HPMHOOK_pre_achievement_ensure) (struct map_session_data **sd, const struct achievement_data **ad); -typedef struct achievement* (*HPMHOOK_post_achievement_ensure) (struct achievement* retVal___, struct map_session_data *sd, const struct achievement_data *ad); +typedef const struct achievement_data * (*HPMHOOK_pre_achievement_get) (int *aid); +typedef const struct achievement_data * (*HPMHOOK_post_achievement_get) (const struct achievement_data * retVal___, int aid); +typedef struct achievement * (*HPMHOOK_pre_achievement_ensure) (struct map_session_data **sd, const struct achievement_data **ad); +typedef struct achievement * (*HPMHOOK_post_achievement_ensure) (struct achievement * retVal___, struct map_session_data *sd, const struct achievement_data *ad); typedef void (*HPMHOOK_pre_achievement_calculate_totals) (const struct map_session_data **sd, int **points, int **completed, int **rank, int **curr_rank_points); typedef void (*HPMHOOK_post_achievement_calculate_totals) (const struct map_session_data *sd, int *points, int *completed, int *rank, int *curr_rank_points); typedef bool (*HPMHOOK_pre_achievement_check_complete) (struct map_session_data **sd, const struct achievement_data **ad); @@ -298,8 +298,8 @@ typedef void (*HPMHOOK_pre_aclif_add_remove_timer) (struct online_api_login_data typedef void (*HPMHOOK_post_aclif_add_remove_timer) (struct online_api_login_data *data); typedef void (*HPMHOOK_pre_aclif_remove_remove_timer) (struct online_api_login_data **data); typedef void (*HPMHOOK_post_aclif_remove_remove_timer) (struct online_api_login_data *data); -typedef const char* (*HPMHOOK_pre_aclif_get_first_world_name) (void); -typedef const char* (*HPMHOOK_post_aclif_get_first_world_name) (const char* retVal___); +typedef const char * (*HPMHOOK_pre_aclif_get_first_world_name) (void); +typedef const char * (*HPMHOOK_post_aclif_get_first_world_name) (const char * retVal___); typedef void (*HPMHOOK_pre_aclif_show_request) (int *fd, struct api_session_data **sd, bool *show_http_headers); typedef void (*HPMHOOK_post_aclif_show_request) (int fd, struct api_session_data *sd, bool show_http_headers); #endif // API_ACLIF_H @@ -384,18 +384,18 @@ typedef bool (*HPMHOOK_pre_atcommand_can_use2) (struct map_session_data **sd, co typedef bool (*HPMHOOK_post_atcommand_can_use2) (bool retVal___, struct map_session_data *sd, const char *command, AtCommandType type); typedef void (*HPMHOOK_pre_atcommand_load_groups) (GroupSettings ***groups, struct config_setting_t ***commands_, size_t *sz); typedef void (*HPMHOOK_post_atcommand_load_groups) (GroupSettings **groups, struct config_setting_t **commands_, size_t sz); -typedef AtCommandInfo* (*HPMHOOK_pre_atcommand_exists) (const char **name); -typedef AtCommandInfo* (*HPMHOOK_post_atcommand_exists) (AtCommandInfo* retVal___, const char *name); +typedef AtCommandInfo * (*HPMHOOK_pre_atcommand_exists) (const char **name); +typedef AtCommandInfo * (*HPMHOOK_post_atcommand_exists) (AtCommandInfo * retVal___, const char *name); typedef bool (*HPMHOOK_pre_atcommand_msg_read) (const char **cfg_name, bool *allow_override); typedef bool (*HPMHOOK_post_atcommand_msg_read) (bool retVal___, const char *cfg_name, bool allow_override); typedef void (*HPMHOOK_pre_atcommand_final_msg) (void); typedef void (*HPMHOOK_post_atcommand_final_msg) (void); -typedef struct atcmd_binding_data* (*HPMHOOK_pre_atcommand_get_bind_byname) (const char **name); -typedef struct atcmd_binding_data* (*HPMHOOK_post_atcommand_get_bind_byname) (struct atcmd_binding_data* retVal___, const char *name); -typedef AtCommandInfo* (*HPMHOOK_pre_atcommand_get_info_byname) (const char **name); -typedef AtCommandInfo* (*HPMHOOK_post_atcommand_get_info_byname) (AtCommandInfo* retVal___, const char *name); -typedef const char* (*HPMHOOK_pre_atcommand_check_alias) (const char **aliasname); -typedef const char* (*HPMHOOK_post_atcommand_check_alias) (const char* retVal___, const char *aliasname); +typedef struct atcmd_binding_data * (*HPMHOOK_pre_atcommand_get_bind_byname) (const char **name); +typedef struct atcmd_binding_data * (*HPMHOOK_post_atcommand_get_bind_byname) (struct atcmd_binding_data * retVal___, const char *name); +typedef AtCommandInfo * (*HPMHOOK_pre_atcommand_get_info_byname) (const char **name); +typedef AtCommandInfo * (*HPMHOOK_post_atcommand_get_info_byname) (AtCommandInfo * retVal___, const char *name); +typedef const char * (*HPMHOOK_pre_atcommand_check_alias) (const char **aliasname); +typedef const char * (*HPMHOOK_post_atcommand_check_alias) (const char * retVal___, const char *aliasname); typedef void (*HPMHOOK_pre_atcommand_get_suggestions) (struct map_session_data **sd, const char **name, bool *is_atcmd_cmd); typedef void (*HPMHOOK_post_atcommand_get_suggestions) (struct map_session_data *sd, const char *name, bool is_atcmd_cmd); typedef void (*HPMHOOK_pre_atcommand_config_read) (const char **config_filename); @@ -434,14 +434,14 @@ typedef void (*HPMHOOK_pre_atcommand_base_commands) (void); typedef void (*HPMHOOK_post_atcommand_base_commands) (void); typedef bool (*HPMHOOK_pre_atcommand_add) (char **name, AtCommandFunc *func, bool *replace); typedef bool (*HPMHOOK_post_atcommand_add) (bool retVal___, char *name, AtCommandFunc func, bool replace); -typedef const char* (*HPMHOOK_pre_atcommand_msg) (int *msg_number); -typedef const char* (*HPMHOOK_post_atcommand_msg) (const char* retVal___, int msg_number); +typedef const char * (*HPMHOOK_pre_atcommand_msg) (int *msg_number); +typedef const char * (*HPMHOOK_post_atcommand_msg) (const char * retVal___, int msg_number); typedef void (*HPMHOOK_pre_atcommand_expand_message_table) (void); typedef void (*HPMHOOK_post_atcommand_expand_message_table) (void); -typedef const char* (*HPMHOOK_pre_atcommand_msgfd) (int *fd, int *msg_number); -typedef const char* (*HPMHOOK_post_atcommand_msgfd) (const char* retVal___, int fd, int msg_number); -typedef const char* (*HPMHOOK_pre_atcommand_msgsd) (struct map_session_data **sd, int *msg_number); -typedef const char* (*HPMHOOK_post_atcommand_msgsd) (const char* retVal___, struct map_session_data *sd, int msg_number); +typedef const char * (*HPMHOOK_pre_atcommand_msgfd) (int *fd, int *msg_number); +typedef const char * (*HPMHOOK_post_atcommand_msgfd) (const char * retVal___, int fd, int msg_number); +typedef const char * (*HPMHOOK_pre_atcommand_msgsd) (struct map_session_data **sd, int *msg_number); +typedef const char * (*HPMHOOK_post_atcommand_msgsd) (const char * retVal___, struct map_session_data *sd, int msg_number); #endif // MAP_ATCOMMAND_H #ifdef COMMON_BASE62_H /* base62 */ typedef bool (*HPMHOOK_pre_base62_encode_int_padded) (int *value, char **buf, int *min_len, int *buf_len); @@ -500,12 +500,12 @@ typedef int64 (*HPMHOOK_pre_battle_calc_weapon_damage) (struct block_list **src, typedef int64 (*HPMHOOK_post_battle_calc_weapon_damage) (int64 retVal___, struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, struct weapon_atk *watk, int nk, bool n_ele, short s_ele, short s_ele_, int size, int type, int flag, int flag2); typedef int64 (*HPMHOOK_pre_battle_calc_defense) (int *attack_type, struct block_list **src, struct block_list **target, uint16 *skill_id, uint16 *skill_lv, int64 *damage, int *flag, int *pdef); typedef int64 (*HPMHOOK_post_battle_calc_defense) (int64 retVal___, int attack_type, struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int64 damage, int flag, int pdef); -typedef struct block_list* (*HPMHOOK_pre_battle_get_master) (struct block_list **src); -typedef struct block_list* (*HPMHOOK_post_battle_get_master) (struct block_list* retVal___, struct block_list *src); -typedef struct block_list* (*HPMHOOK_pre_battle_get_targeted) (struct block_list **target); -typedef struct block_list* (*HPMHOOK_post_battle_get_targeted) (struct block_list* retVal___, struct block_list *target); -typedef struct block_list* (*HPMHOOK_pre_battle_get_enemy) (struct block_list **target, int *type, int *range); -typedef struct block_list* (*HPMHOOK_post_battle_get_enemy) (struct block_list* retVal___, struct block_list *target, int type, int range); +typedef struct block_list * (*HPMHOOK_pre_battle_get_master) (struct block_list **src); +typedef struct block_list * (*HPMHOOK_post_battle_get_master) (struct block_list * retVal___, struct block_list *src); +typedef struct block_list * (*HPMHOOK_pre_battle_get_targeted) (struct block_list **target); +typedef struct block_list * (*HPMHOOK_post_battle_get_targeted) (struct block_list * retVal___, struct block_list *target); +typedef struct block_list * (*HPMHOOK_pre_battle_get_enemy) (struct block_list **target, int *type, int *range); +typedef struct block_list * (*HPMHOOK_post_battle_get_enemy) (struct block_list * retVal___, struct block_list *target, int type, int range); typedef int (*HPMHOOK_pre_battle_get_target) (struct block_list **bl); typedef int (*HPMHOOK_post_battle_get_target) (int retVal___, struct block_list *bl); typedef int (*HPMHOOK_pre_battle_get_current_skill) (struct block_list **bl); @@ -558,8 +558,8 @@ typedef bool (*HPMHOOK_pre_battle_config_get_value) (const char **w1, int **valu typedef bool (*HPMHOOK_post_battle_config_get_value) (bool retVal___, const char *w1, int *value); typedef void (*HPMHOOK_pre_battle_config_adjust) (void); typedef void (*HPMHOOK_post_battle_config_adjust) (void); -typedef struct block_list* (*HPMHOOK_pre_battle_get_enemy_area) (struct block_list **src, int *x, int *y, int *range, int *type, int *ignore_id); -typedef struct block_list* (*HPMHOOK_post_battle_get_enemy_area) (struct block_list* retVal___, struct block_list *src, int x, int y, int range, int type, int ignore_id); +typedef struct block_list * (*HPMHOOK_pre_battle_get_enemy_area) (struct block_list **src, int *x, int *y, int *range, int *type, int *ignore_id); +typedef struct block_list * (*HPMHOOK_post_battle_get_enemy_area) (struct block_list * retVal___, struct block_list *src, int x, int y, int range, int type, int ignore_id); typedef int (*HPMHOOK_pre_battle_damage_area) (struct block_list **bl, va_list ap); typedef int (*HPMHOOK_post_battle_damage_area) (int retVal___, struct block_list *bl, va_list ap); typedef void (*HPMHOOK_pre_battle_calc_masteryfix_unknown) (struct block_list **src, struct block_list **target, uint16 **skill_id, uint16 **skill_lv, int64 **damage, int **div, bool **left, bool **weapon); @@ -576,8 +576,8 @@ typedef void (*HPMHOOK_pre_bg_init) (bool *minimal); typedef void (*HPMHOOK_post_bg_init) (bool minimal); typedef void (*HPMHOOK_pre_bg_final) (void); typedef void (*HPMHOOK_post_bg_final) (void); -typedef struct bg_arena* (*HPMHOOK_pre_bg_name2arena) (const char **name); -typedef struct bg_arena* (*HPMHOOK_post_bg_name2arena) (struct bg_arena* retVal___, const char *name); +typedef struct bg_arena * (*HPMHOOK_pre_bg_name2arena) (const char **name); +typedef struct bg_arena * (*HPMHOOK_post_bg_name2arena) (struct bg_arena * retVal___, const char *name); typedef void (*HPMHOOK_pre_bg_queue_add) (struct map_session_data **sd, struct bg_arena **arena, enum bg_queue_types *type); typedef void (*HPMHOOK_post_bg_queue_add) (struct map_session_data *sd, struct bg_arena *arena, enum bg_queue_types type); typedef enum BATTLEGROUNDS_QUEUE_ACK (*HPMHOOK_pre_bg_can_queue) (struct map_session_data **sd, struct bg_arena **arena, enum bg_queue_types *type); @@ -600,10 +600,10 @@ typedef void (*HPMHOOK_pre_bg_match_over) (struct bg_arena **arena, bool *cancel typedef void (*HPMHOOK_post_bg_match_over) (struct bg_arena *arena, bool canceled); typedef void (*HPMHOOK_pre_bg_queue_check) (struct bg_arena **arena); typedef void (*HPMHOOK_post_bg_queue_check) (struct bg_arena *arena); -typedef struct battleground_data* (*HPMHOOK_pre_bg_team_search) (int *bg_id); -typedef struct battleground_data* (*HPMHOOK_post_bg_team_search) (struct battleground_data* retVal___, int bg_id); -typedef struct map_session_data* (*HPMHOOK_pre_bg_getavailablesd) (struct battleground_data **bgd); -typedef struct map_session_data* (*HPMHOOK_post_bg_getavailablesd) (struct map_session_data* retVal___, struct battleground_data *bgd); +typedef struct battleground_data * (*HPMHOOK_pre_bg_team_search) (int *bg_id); +typedef struct battleground_data * (*HPMHOOK_post_bg_team_search) (struct battleground_data * retVal___, int bg_id); +typedef struct map_session_data * (*HPMHOOK_pre_bg_getavailablesd) (struct battleground_data **bgd); +typedef struct map_session_data * (*HPMHOOK_post_bg_getavailablesd) (struct map_session_data * retVal___, struct battleground_data *bgd); typedef bool (*HPMHOOK_pre_bg_team_delete) (int *bg_id); typedef bool (*HPMHOOK_post_bg_team_delete) (bool retVal___, int bg_id); typedef bool (*HPMHOOK_pre_bg_team_warp) (int *bg_id, unsigned short *map_index, short *x, short *y); @@ -658,8 +658,8 @@ typedef void (*HPMHOOK_pre_capiif_init) (void); typedef void (*HPMHOOK_post_capiif_init) (void); typedef void (*HPMHOOK_pre_capiif_final) (void); typedef void (*HPMHOOK_post_capiif_final) (void); -typedef struct online_char_data* (*HPMHOOK_pre_capiif_get_online_character) (const struct PACKET_API_PROXY **p); -typedef struct online_char_data* (*HPMHOOK_post_capiif_get_online_character) (struct online_char_data* retVal___, const struct PACKET_API_PROXY *p); +typedef struct online_char_data * (*HPMHOOK_pre_capiif_get_online_character) (const struct PACKET_API_PROXY **p); +typedef struct online_char_data * (*HPMHOOK_post_capiif_get_online_character) (struct online_char_data * retVal___, const struct PACKET_API_PROXY *p); typedef void (*HPMHOOK_pre_capiif_emblem_download) (int *fd, int *guild_id, int *emblem_id); typedef void (*HPMHOOK_post_capiif_emblem_download) (int fd, int guild_id, int emblem_id); typedef void (*HPMHOOK_pre_capiif_parse_userconfig_load_emotes) (int *fd); @@ -698,10 +698,10 @@ typedef int (*HPMHOOK_pre_channel_init) (bool *minimal); typedef int (*HPMHOOK_post_channel_init) (int retVal___, bool minimal); typedef void (*HPMHOOK_pre_channel_final) (void); typedef void (*HPMHOOK_post_channel_final) (void); -typedef struct channel_data* (*HPMHOOK_pre_channel_search) (const char **name, struct map_session_data **sd); -typedef struct channel_data* (*HPMHOOK_post_channel_search) (struct channel_data* retVal___, const char *name, struct map_session_data *sd); -typedef struct channel_data* (*HPMHOOK_pre_channel_create) (enum channel_types *type, const char **name, unsigned char *color); -typedef struct channel_data* (*HPMHOOK_post_channel_create) (struct channel_data* retVal___, enum channel_types type, const char *name, unsigned char color); +typedef struct channel_data * (*HPMHOOK_pre_channel_search) (const char **name, struct map_session_data **sd); +typedef struct channel_data * (*HPMHOOK_post_channel_search) (struct channel_data * retVal___, const char *name, struct map_session_data *sd); +typedef struct channel_data * (*HPMHOOK_pre_channel_create) (enum channel_types *type, const char **name, unsigned char *color); +typedef struct channel_data * (*HPMHOOK_post_channel_create) (struct channel_data * retVal___, enum channel_types type, const char *name, unsigned char color); typedef void (*HPMHOOK_pre_channel_delete) (struct channel_data **chan); typedef void (*HPMHOOK_post_channel_delete) (struct channel_data *chan); typedef void (*HPMHOOK_pre_channel_set_password) (struct channel_data **chan, const char **password); @@ -1116,8 +1116,8 @@ typedef bool (*HPMHOOK_pre_chat_npc_kick_all) (struct chat_data **cd); typedef bool (*HPMHOOK_post_chat_npc_kick_all) (bool retVal___, struct chat_data *cd); typedef bool (*HPMHOOK_pre_chat_trigger_event) (struct chat_data **cd); typedef bool (*HPMHOOK_post_chat_trigger_event) (bool retVal___, struct chat_data *cd); -typedef struct chat_data* (*HPMHOOK_pre_chat_create) (struct block_list **bl, const char **title, const char **pass, int *limit, bool *pub, int *trigger, const char **ev, int *zeny, int *min_level, int *max_level); -typedef struct chat_data* (*HPMHOOK_post_chat_create) (struct chat_data* retVal___, struct block_list *bl, const char *title, const char *pass, int limit, bool pub, int trigger, const char *ev, int zeny, int min_level, int max_level); +typedef struct chat_data * (*HPMHOOK_pre_chat_create) (struct block_list **bl, const char **title, const char **pass, int *limit, bool *pub, int *trigger, const char **ev, int *zeny, int *min_level, int *max_level); +typedef struct chat_data * (*HPMHOOK_post_chat_create) (struct chat_data * retVal___, struct block_list *bl, const char *title, const char *pass, int limit, bool pub, int trigger, const char *ev, int zeny, int min_level, int max_level); #endif // MAP_CHAT_H #ifdef MAP_CHRIF_H /* chrif */ typedef void (*HPMHOOK_pre_chrif_init) (bool *minimal); @@ -1138,10 +1138,10 @@ typedef int (*HPMHOOK_pre_chrif_isconnected) (void); typedef int (*HPMHOOK_post_chrif_isconnected) (int retVal___); typedef void (*HPMHOOK_pre_chrif_check_shutdown) (void); typedef void (*HPMHOOK_post_chrif_check_shutdown) (void); -typedef struct auth_node* (*HPMHOOK_pre_chrif_search) (int *account_id); -typedef struct auth_node* (*HPMHOOK_post_chrif_search) (struct auth_node* retVal___, int account_id); -typedef struct auth_node* (*HPMHOOK_pre_chrif_auth_check) (int *account_id, int *char_id, enum sd_state *state); -typedef struct auth_node* (*HPMHOOK_post_chrif_auth_check) (struct auth_node* retVal___, int account_id, int char_id, enum sd_state state); +typedef struct auth_node * (*HPMHOOK_pre_chrif_search) (int *account_id); +typedef struct auth_node * (*HPMHOOK_post_chrif_search) (struct auth_node * retVal___, int account_id); +typedef struct auth_node * (*HPMHOOK_pre_chrif_auth_check) (int *account_id, int *char_id, enum sd_state *state); +typedef struct auth_node * (*HPMHOOK_post_chrif_auth_check) (struct auth_node * retVal___, int account_id, int char_id, enum sd_state state); typedef bool (*HPMHOOK_pre_chrif_auth_delete) (int *account_id, int *char_id, enum sd_state *state); typedef bool (*HPMHOOK_post_chrif_auth_delete) (bool retVal___, int account_id, int char_id, enum sd_state state); typedef bool (*HPMHOOK_pre_chrif_auth_finished) (struct map_session_data **sd); @@ -1268,12 +1268,12 @@ typedef void (*HPMHOOK_pre_clan_read_db_additional_fields) (struct clan **entry, typedef void (*HPMHOOK_post_clan_read_db_additional_fields) (struct clan *entry, struct config_setting_t *t, int n, const char *source); typedef void (*HPMHOOK_pre_clan_read_buffs) (struct clan **c, struct config_setting_t **buff, const char **source); typedef void (*HPMHOOK_post_clan_read_buffs) (struct clan *c, struct config_setting_t *buff, const char *source); -typedef struct clan* (*HPMHOOK_pre_clan_search) (int *clan_id); -typedef struct clan* (*HPMHOOK_post_clan_search) (struct clan* retVal___, int clan_id); -typedef struct clan* (*HPMHOOK_pre_clan_searchname) (const char **name); -typedef struct clan* (*HPMHOOK_post_clan_searchname) (struct clan* retVal___, const char *name); -typedef struct map_session_data* (*HPMHOOK_pre_clan_getonlinesd) (struct clan **c); -typedef struct map_session_data* (*HPMHOOK_post_clan_getonlinesd) (struct map_session_data* retVal___, struct clan *c); +typedef struct clan * (*HPMHOOK_pre_clan_search) (int *clan_id); +typedef struct clan * (*HPMHOOK_post_clan_search) (struct clan * retVal___, int clan_id); +typedef struct clan * (*HPMHOOK_pre_clan_searchname) (const char **name); +typedef struct clan * (*HPMHOOK_post_clan_searchname) (struct clan * retVal___, const char *name); +typedef struct map_session_data * (*HPMHOOK_pre_clan_getonlinesd) (struct clan **c); +typedef struct map_session_data * (*HPMHOOK_post_clan_getonlinesd) (struct map_session_data * retVal___, struct clan *c); typedef int (*HPMHOOK_pre_clan_getindex) (const struct clan **c, int *char_id); typedef int (*HPMHOOK_post_clan_getindex) (int retVal___, const struct clan *c, int char_id); typedef bool (*HPMHOOK_pre_clan_join) (struct map_session_data **sd, int *clan_id); @@ -1328,8 +1328,8 @@ typedef int (*HPMHOOK_pre_clif_send_actual) (int *fd, void **buf, int *len); typedef int (*HPMHOOK_post_clif_send_actual) (int retVal___, int fd, void *buf, int len); typedef int (*HPMHOOK_pre_clif_parse) (int *fd); typedef int (*HPMHOOK_post_clif_parse) (int retVal___, int fd); -typedef const struct s_packet_db* (*HPMHOOK_pre_clif_packet) (int *packet_id); -typedef const struct s_packet_db* (*HPMHOOK_post_clif_packet) (const struct s_packet_db* retVal___, int packet_id); +typedef const struct s_packet_db * (*HPMHOOK_pre_clif_packet) (int *packet_id); +typedef const struct s_packet_db * (*HPMHOOK_post_clif_packet) (const struct s_packet_db * retVal___, int packet_id); typedef unsigned short (*HPMHOOK_pre_clif_parse_cmd) (int *fd, struct map_session_data **sd); typedef unsigned short (*HPMHOOK_post_clif_parse_cmd) (unsigned short retVal___, int fd, struct map_session_data *sd); typedef unsigned short (*HPMHOOK_pre_clif_decrypt_cmd) (int *cmd, struct map_session_data **sd); @@ -1910,8 +1910,8 @@ typedef void (*HPMHOOK_pre_clif_message) (const int *fd, const char **mes); typedef void (*HPMHOOK_post_clif_message) (const int fd, const char *mes); typedef void (*HPMHOOK_pre_clif_messageln) (const int *fd, const char **mes); typedef void (*HPMHOOK_post_clif_messageln) (const int fd, const char *mes); -typedef const char* (*HPMHOOK_pre_clif_process_chat_message) (struct map_session_data **sd, const struct packet_chat_message **packet, char **out_buf, int *out_buflen); -typedef const char* (*HPMHOOK_post_clif_process_chat_message) (const char* retVal___, struct map_session_data *sd, const struct packet_chat_message *packet, char *out_buf, int out_buflen); +typedef const char * (*HPMHOOK_pre_clif_process_chat_message) (struct map_session_data **sd, const struct packet_chat_message **packet, char **out_buf, int *out_buflen); +typedef const char * (*HPMHOOK_post_clif_process_chat_message) (const char * retVal___, struct map_session_data *sd, const struct packet_chat_message *packet, char *out_buf, int out_buflen); typedef bool (*HPMHOOK_pre_clif_process_whisper_message) (struct map_session_data **sd, const struct packet_whisper_message **packet, char **out_name, char **out_message, int *out_messagelen); typedef bool (*HPMHOOK_post_clif_process_whisper_message) (bool retVal___, struct map_session_data *sd, const struct packet_whisper_message *packet, char *out_name, char *out_message, int out_messagelen); typedef void (*HPMHOOK_pre_clif_wisexin) (struct map_session_data **sd, int *type, int *flag); @@ -1958,8 +1958,8 @@ typedef void (*HPMHOOK_pre_clif_storageList) (struct map_session_data **sd, stru typedef void (*HPMHOOK_post_clif_storageList) (struct map_session_data *sd, struct item *items, int items_length); typedef void (*HPMHOOK_pre_clif_guildStorageList) (struct map_session_data **sd, struct item **items, int *items_length); typedef void (*HPMHOOK_post_clif_guildStorageList) (struct map_session_data *sd, struct item *items, int items_length); -typedef void (*HPMHOOK_pre_clif_storageItems) (struct map_session_data **sd, enum inventory_type *type, struct item **items, int *items_length); -typedef void (*HPMHOOK_post_clif_storageItems) (struct map_session_data *sd, enum inventory_type type, struct item *items, int items_length); +typedef void (*HPMHOOK_pre_clif_storageItems) (struct map_session_data **sd, enum inventory_type *type, struct item **items, int *items_length, const char **name); +typedef void (*HPMHOOK_post_clif_storageItems) (struct map_session_data *sd, enum inventory_type type, struct item *items, int items_length, const char *name); typedef void (*HPMHOOK_pre_clif_inventoryStart) (struct map_session_data **sd, enum inventory_type *type, const char **name); typedef void (*HPMHOOK_post_clif_inventoryStart) (struct map_session_data *sd, enum inventory_type type, const char *name); typedef void (*HPMHOOK_pre_clif_inventoryEnd) (struct map_session_data **sd, enum inventory_type *type); @@ -2870,8 +2870,8 @@ typedef void (*HPMHOOK_pre_clif_selectcart) (struct map_session_data **sd); typedef void (*HPMHOOK_post_clif_selectcart) (struct map_session_data *sd); typedef void (*HPMHOOK_pre_clif_pSelectCart) (int *fd, struct map_session_data **sd); typedef void (*HPMHOOK_post_clif_pSelectCart) (int fd, struct map_session_data *sd); -typedef const char* (*HPMHOOK_pre_clif_get_bl_name) (const struct block_list **bl); -typedef const char* (*HPMHOOK_post_clif_get_bl_name) (const char* retVal___, const struct block_list *bl); +typedef const char * (*HPMHOOK_pre_clif_get_bl_name) (const struct block_list **bl); +typedef const char * (*HPMHOOK_post_clif_get_bl_name) (const char * retVal___, const struct block_list *bl); typedef void (*HPMHOOK_pre_clif_pRodexOpenWriteMail) (int *fd, struct map_session_data **sd); typedef void (*HPMHOOK_post_clif_pRodexOpenWriteMail) (int fd, struct map_session_data *sd); typedef void (*HPMHOOK_pre_clif_rodex_open_write_mail) (int *fd, const char **receiver_name, int8 *result); @@ -3188,8 +3188,8 @@ typedef int (*HPMHOOK_pre_cmdline_exec) (int *argc, char ***argv, unsigned int * typedef int (*HPMHOOK_post_cmdline_exec) (int retVal___, int argc, char **argv, unsigned int options); typedef bool (*HPMHOOK_pre_cmdline_arg_next_value) (const char **name, int *current_arg, int *argc); typedef bool (*HPMHOOK_post_cmdline_arg_next_value) (bool retVal___, const char *name, int current_arg, int argc); -typedef const char* (*HPMHOOK_pre_cmdline_arg_source) (struct CmdlineArgData **arg); -typedef const char* (*HPMHOOK_post_cmdline_arg_source) (const char* retVal___, struct CmdlineArgData *arg); +typedef const char * (*HPMHOOK_pre_cmdline_arg_source) (struct CmdlineArgData **arg); +typedef const char * (*HPMHOOK_post_cmdline_arg_source) (const char * retVal___, struct CmdlineArgData *arg); #endif // COMMON_CORE_H #ifdef COMMON_CONSOLE_H /* console */ typedef void (*HPMHOOK_pre_console_init) (void); @@ -3216,8 +3216,8 @@ typedef DBReleaser (*HPMHOOK_pre_DB_default_release) (enum DBType *type, enum DB typedef DBReleaser (*HPMHOOK_post_DB_default_release) (DBReleaser retVal___, enum DBType type, enum DBOptions options); typedef DBReleaser (*HPMHOOK_pre_DB_custom_release) (enum DBReleaseOption *which); typedef DBReleaser (*HPMHOOK_post_DB_custom_release) (DBReleaser retVal___, enum DBReleaseOption which); -typedef struct DBMap* (*HPMHOOK_pre_DB_alloc) (const char **file, const char **func, int *line, enum DBType *type, enum DBOptions *options, unsigned short *maxlen); -typedef struct DBMap* (*HPMHOOK_post_DB_alloc) (struct DBMap* retVal___, const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen); +typedef struct DBMap * (*HPMHOOK_pre_DB_alloc) (const char **file, const char **func, int *line, enum DBType *type, enum DBOptions *options, unsigned short *maxlen); +typedef struct DBMap * (*HPMHOOK_post_DB_alloc) (struct DBMap * retVal___, const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen); typedef union DBKey (*HPMHOOK_pre_DB_i2key) (int *key); typedef union DBKey (*HPMHOOK_post_DB_i2key) (union DBKey retVal___, int key); typedef union DBKey (*HPMHOOK_pre_DB_ui2key) (unsigned int *key); @@ -3238,8 +3238,8 @@ typedef int (*HPMHOOK_pre_DB_data2i) (struct DBData **data); typedef int (*HPMHOOK_post_DB_data2i) (int retVal___, struct DBData *data); typedef unsigned int (*HPMHOOK_pre_DB_data2ui) (struct DBData **data); typedef unsigned int (*HPMHOOK_post_DB_data2ui) (unsigned int retVal___, struct DBData *data); -typedef void* (*HPMHOOK_pre_DB_data2ptr) (struct DBData **data); -typedef void* (*HPMHOOK_post_DB_data2ptr) (void* retVal___, struct DBData *data); +typedef void * (*HPMHOOK_pre_DB_data2ptr) (struct DBData **data); +typedef void * (*HPMHOOK_post_DB_data2ptr) (void * retVal___, struct DBData *data); typedef void (*HPMHOOK_pre_DB_init) (void); typedef void (*HPMHOOK_post_DB_init) (void); typedef void (*HPMHOOK_pre_DB_final) (void); @@ -3278,8 +3278,8 @@ typedef void (*HPMHOOK_pre_elemental_final) (void); typedef void (*HPMHOOK_post_elemental_final) (void); typedef bool (*HPMHOOK_pre_elemental_class) (int *class_); typedef bool (*HPMHOOK_post_elemental_class) (bool retVal___, int class_); -typedef struct view_data* (*HPMHOOK_pre_elemental_get_viewdata) (int *class_); -typedef struct view_data* (*HPMHOOK_post_elemental_get_viewdata) (struct view_data* retVal___, int class_); +typedef struct view_data * (*HPMHOOK_pre_elemental_get_viewdata) (int *class_); +typedef struct view_data * (*HPMHOOK_post_elemental_get_viewdata) (struct view_data * retVal___, int class_); typedef int (*HPMHOOK_pre_elemental_create) (struct map_session_data **sd, int *class_, unsigned int *lifetime); typedef int (*HPMHOOK_post_elemental_create) (int retVal___, struct map_session_data *sd, int class_, unsigned int lifetime); typedef int (*HPMHOOK_pre_elemental_data_received) (const struct s_elemental **ele, bool *flag); @@ -3344,8 +3344,8 @@ typedef void (*HPMHOOK_pre_enchantui_final) (void); typedef void (*HPMHOOK_post_enchantui_final) (void); typedef int (*HPMHOOK_pre_enchantui_db_final_sub) (union DBKey *key, struct DBData **data, va_list ap); typedef int (*HPMHOOK_post_enchantui_db_final_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap); -typedef struct enchant_info* (*HPMHOOK_pre_enchantui_exists) (int64 *id); -typedef struct enchant_info* (*HPMHOOK_post_enchantui_exists) (struct enchant_info* retVal___, int64 id); +typedef struct enchant_info * (*HPMHOOK_pre_enchantui_exists) (int64 *id); +typedef struct enchant_info * (*HPMHOOK_post_enchantui_exists) (struct enchant_info * retVal___, int64 id); typedef void (*HPMHOOK_pre_enchantui_read_db_libconfig) (void); typedef void (*HPMHOOK_post_enchantui_read_db_libconfig) (void); typedef bool (*HPMHOOK_pre_enchantui_read_db_libconfig_sub) (const struct config_setting_t **it, int *n, const char **source); @@ -3372,8 +3372,8 @@ typedef bool (*HPMHOOK_pre_enchantui_read_db_libconfig_materials_list) (const st typedef bool (*HPMHOOK_post_enchantui_read_db_libconfig_materials_list) (bool retVal___, const struct config_setting_t *it, struct itemlist *materials, int n, const char *source); typedef bool (*HPMHOOK_pre_enchantui_read_db_libconfig_itemrate_list) (const struct config_setting_t **it, struct enchant_item_list **elist, int *n, const char **source); typedef bool (*HPMHOOK_post_enchantui_read_db_libconfig_itemrate_list) (bool retVal___, const struct config_setting_t *it, struct enchant_item_list *elist, int n, const char *source); -typedef const struct enchant_info* (*HPMHOOK_pre_enchantui_validate_targetitem) (struct map_session_data **sd, int64 *enchant_group, int *index); -typedef const struct enchant_info* (*HPMHOOK_post_enchantui_validate_targetitem) (const struct enchant_info* retVal___, struct map_session_data *sd, int64 enchant_group, int index); +typedef const struct enchant_info * (*HPMHOOK_pre_enchantui_validate_targetitem) (struct map_session_data **sd, int64 *enchant_group, int *index); +typedef const struct enchant_info * (*HPMHOOK_post_enchantui_validate_targetitem) (const struct enchant_info * retVal___, struct map_session_data *sd, int64 enchant_group, int index); typedef int (*HPMHOOK_pre_enchantui_validate_slot_id) (struct map_session_data **sd, const struct enchant_info **ei, const struct item **it); typedef int (*HPMHOOK_post_enchantui_validate_slot_id) (int retVal___, struct map_session_data *sd, const struct enchant_info *ei, const struct item *it); typedef bool (*HPMHOOK_pre_enchantui_validate_requirements) (struct map_session_data **sd, const int *zeny, const struct itemlist **materials); @@ -3410,8 +3410,8 @@ typedef bool (*HPMHOOK_pre_extraconf_read_emblems) (void); typedef bool (*HPMHOOK_post_extraconf_read_emblems) (bool retVal___); #endif // COMMON_EXTRACONF_H #ifdef CHAR_GEOIP_H /* geoip */ -typedef const char* (*HPMHOOK_pre_geoip_getcountry) (uint32 *ipnum); -typedef const char* (*HPMHOOK_post_geoip_getcountry) (const char* retVal___, uint32 ipnum); +typedef const char * (*HPMHOOK_pre_geoip_getcountry) (uint32 *ipnum); +typedef const char * (*HPMHOOK_post_geoip_getcountry) (const char * retVal___, uint32 ipnum); typedef void (*HPMHOOK_pre_geoip_final) (bool *shutdown); typedef void (*HPMHOOK_post_geoip_final) (bool shutdown); typedef void (*HPMHOOK_pre_geoip_init) (void); @@ -3422,8 +3422,8 @@ typedef int (*HPMHOOK_pre_goldpc_init) (bool *minimal); typedef int (*HPMHOOK_post_goldpc_init) (int retVal___, bool minimal); typedef void (*HPMHOOK_pre_goldpc_final) (void); typedef void (*HPMHOOK_post_goldpc_final) (void); -typedef struct goldpc_mode* (*HPMHOOK_pre_goldpc_exists) (int *id); -typedef struct goldpc_mode* (*HPMHOOK_post_goldpc_exists) (struct goldpc_mode* retVal___, int id); +typedef struct goldpc_mode * (*HPMHOOK_pre_goldpc_exists) (int *id); +typedef struct goldpc_mode * (*HPMHOOK_post_goldpc_exists) (struct goldpc_mode * retVal___, int id); typedef void (*HPMHOOK_pre_goldpc_read_db_libconfig) (void); typedef void (*HPMHOOK_post_goldpc_read_db_libconfig) (void); typedef bool (*HPMHOOK_pre_goldpc_read_db_libconfig_sub) (const struct config_setting_t **it, int *n, const char **source); @@ -3462,8 +3462,8 @@ typedef bool (*HPMHOOK_pre_grader_failure_behavior_string2enum) (const char **st typedef bool (*HPMHOOK_post_grader_failure_behavior_string2enum) (bool retVal___, const char *str, enum grade_ui_failure_behavior *result); typedef bool (*HPMHOOK_pre_grader_announce_behavior_string2enum) (const char **str, enum grade_announce_condition **result); typedef bool (*HPMHOOK_post_grader_announce_behavior_string2enum) (bool retVal___, const char *str, enum grade_announce_condition *result); -typedef const struct s_grade_info* (*HPMHOOK_pre_grader_get_grade_info) (int *grade); -typedef const struct s_grade_info* (*HPMHOOK_post_grader_get_grade_info) (const struct s_grade_info* retVal___, int grade); +typedef const struct s_grade_info * (*HPMHOOK_pre_grader_get_grade_info) (int *grade); +typedef const struct s_grade_info * (*HPMHOOK_post_grader_get_grade_info) (const struct s_grade_info * retVal___, int grade); typedef void (*HPMHOOK_pre_grader_enchant_add_item) (struct map_session_data **sd, int *idx); typedef void (*HPMHOOK_post_grader_enchant_add_item) (struct map_session_data *sd, int idx); typedef void (*HPMHOOK_pre_grader_enchant_start) (struct map_session_data **sd, int *idx, int *mat_idx, bool *use_blessing, int *blessing_amount); @@ -3474,10 +3474,10 @@ typedef void (*HPMHOOK_pre_grfio_init) (const char **fname); typedef void (*HPMHOOK_post_grfio_init) (const char *fname); typedef void (*HPMHOOK_pre_grfio_final) (void); typedef void (*HPMHOOK_post_grfio_final) (void); -typedef void* (*HPMHOOK_pre_grfio_reads) (const char **fname, int **size); -typedef void* (*HPMHOOK_post_grfio_reads) (void* retVal___, const char *fname, int *size); -typedef const char* (*HPMHOOK_pre_grfio_find_file) (const char **fname); -typedef const char* (*HPMHOOK_post_grfio_find_file) (const char* retVal___, const char *fname); +typedef void * (*HPMHOOK_pre_grfio_reads) (const char **fname, int **size); +typedef void * (*HPMHOOK_post_grfio_reads) (void * retVal___, const char *fname, int *size); +typedef const char * (*HPMHOOK_pre_grfio_find_file) (const char **fname); +typedef const char * (*HPMHOOK_post_grfio_find_file) (const char * retVal___, const char *fname); typedef unsigned long (*HPMHOOK_pre_grfio_crc32) (const unsigned char **buf, unsigned int *len); typedef unsigned long (*HPMHOOK_post_grfio_crc32) (unsigned long retVal___, const unsigned char *buf, unsigned int len); typedef int (*HPMHOOK_pre_grfio_decode_zip) (void **dest, unsigned long **dest_len, const void **source, unsigned long *source_len); @@ -3486,8 +3486,8 @@ typedef int (*HPMHOOK_pre_grfio_encode_zip) (void **dest, unsigned long **dest_l typedef int (*HPMHOOK_post_grfio_encode_zip) (int retVal___, void *dest, unsigned long *dest_len, const void *source, unsigned long source_len); typedef void (*HPMHOOK_pre_grfio_report_error) (int *err); typedef void (*HPMHOOK_post_grfio_report_error) (int err); -typedef char* (*HPMHOOK_pre_grfio_decode_filename) (unsigned char **buf, int *len); -typedef char* (*HPMHOOK_post_grfio_decode_filename) (char* retVal___, unsigned char *buf, int len); +typedef char * (*HPMHOOK_pre_grfio_decode_filename) (unsigned char **buf, int *len); +typedef char * (*HPMHOOK_post_grfio_decode_filename) (char * retVal___, unsigned char *buf, int len); #endif // COMMON_GRFIO_H #ifdef MAP_GUILD_H /* guild */ typedef void (*HPMHOOK_pre_guild_init) (bool *minimal); @@ -3504,18 +3504,18 @@ typedef int (*HPMHOOK_pre_guild_checkcastles) (struct guild **g); typedef int (*HPMHOOK_post_guild_checkcastles) (int retVal___, struct guild *g); typedef bool (*HPMHOOK_pre_guild_isallied) (int *guild_id, int *guild_id2); typedef bool (*HPMHOOK_post_guild_isallied) (bool retVal___, int guild_id, int guild_id2); -typedef struct guild* (*HPMHOOK_pre_guild_search) (int *guild_id); -typedef struct guild* (*HPMHOOK_post_guild_search) (struct guild* retVal___, int guild_id); -typedef struct guild* (*HPMHOOK_pre_guild_searchname) (const char **str); -typedef struct guild* (*HPMHOOK_post_guild_searchname) (struct guild* retVal___, const char *str); -typedef struct guild_castle* (*HPMHOOK_pre_guild_castle_search) (int *gcid); -typedef struct guild_castle* (*HPMHOOK_post_guild_castle_search) (struct guild_castle* retVal___, int gcid); -typedef struct guild_castle* (*HPMHOOK_pre_guild_mapname2gc) (const char **mapname); -typedef struct guild_castle* (*HPMHOOK_post_guild_mapname2gc) (struct guild_castle* retVal___, const char *mapname); -typedef struct guild_castle* (*HPMHOOK_pre_guild_mapindex2gc) (short *map_index); -typedef struct guild_castle* (*HPMHOOK_post_guild_mapindex2gc) (struct guild_castle* retVal___, short map_index); -typedef struct map_session_data* (*HPMHOOK_pre_guild_getavailablesd) (struct guild **g); -typedef struct map_session_data* (*HPMHOOK_post_guild_getavailablesd) (struct map_session_data* retVal___, struct guild *g); +typedef struct guild * (*HPMHOOK_pre_guild_search) (int *guild_id); +typedef struct guild * (*HPMHOOK_post_guild_search) (struct guild * retVal___, int guild_id); +typedef struct guild * (*HPMHOOK_pre_guild_searchname) (const char **str); +typedef struct guild * (*HPMHOOK_post_guild_searchname) (struct guild * retVal___, const char *str); +typedef struct guild_castle * (*HPMHOOK_pre_guild_castle_search) (int *gcid); +typedef struct guild_castle * (*HPMHOOK_post_guild_castle_search) (struct guild_castle * retVal___, int gcid); +typedef struct guild_castle * (*HPMHOOK_pre_guild_mapname2gc) (const char **mapname); +typedef struct guild_castle * (*HPMHOOK_post_guild_mapname2gc) (struct guild_castle * retVal___, const char *mapname); +typedef struct guild_castle * (*HPMHOOK_pre_guild_mapindex2gc) (short *map_index); +typedef struct guild_castle * (*HPMHOOK_post_guild_mapindex2gc) (struct guild_castle * retVal___, short map_index); +typedef struct map_session_data * (*HPMHOOK_pre_guild_getavailablesd) (struct guild **g); +typedef struct map_session_data * (*HPMHOOK_post_guild_getavailablesd) (struct map_session_data * retVal___, struct guild *g); typedef int (*HPMHOOK_pre_guild_getindex) (const struct guild **g, int *account_id, int *char_id); typedef int (*HPMHOOK_post_guild_getindex) (int retVal___, const struct guild *g, int account_id, int char_id); typedef int (*HPMHOOK_pre_guild_getposition) (struct guild **g, struct map_session_data **sd); @@ -3628,8 +3628,8 @@ typedef void (*HPMHOOK_pre_guild_retrieveitembound) (int *char_id, int *aid, int typedef void (*HPMHOOK_post_guild_retrieveitembound) (int char_id, int aid, int guild_id); typedef int (*HPMHOOK_pre_guild_payexp_timer) (int *tid, int64 *tick, int *id, intptr_t *data); typedef int (*HPMHOOK_post_guild_payexp_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); -typedef struct map_session_data* (*HPMHOOK_pre_guild_sd_check) (int *guild_id, int *account_id, int *char_id); -typedef struct map_session_data* (*HPMHOOK_post_guild_sd_check) (struct map_session_data* retVal___, int guild_id, int account_id, int char_id); +typedef struct map_session_data * (*HPMHOOK_pre_guild_sd_check) (int *guild_id, int *account_id, int *char_id); +typedef struct map_session_data * (*HPMHOOK_post_guild_sd_check) (struct map_session_data * retVal___, int guild_id, int account_id, int char_id); typedef bool (*HPMHOOK_pre_guild_read_guildskill_tree_db) (char **split[], int *columns, int *current); typedef bool (*HPMHOOK_post_guild_read_guildskill_tree_db) (bool retVal___, char *split[], int columns, int current); typedef bool (*HPMHOOK_pre_guild_read_castledb_libconfig) (void); @@ -3670,8 +3670,8 @@ typedef int (*HPMHOOK_pre_guild_castle_owner_change_foreach) (struct map_session typedef int (*HPMHOOK_post_guild_castle_owner_change_foreach) (int retVal___, struct map_session_data *sd, va_list ap); #endif // MAP_GUILD_H #ifdef MAP_STORAGE_H /* gstorage */ -typedef struct guild_storage* (*HPMHOOK_pre_gstorage_ensure) (int *guild_id); -typedef struct guild_storage* (*HPMHOOK_post_gstorage_ensure) (struct guild_storage* retVal___, int guild_id); +typedef struct guild_storage * (*HPMHOOK_pre_gstorage_ensure) (int *guild_id); +typedef struct guild_storage * (*HPMHOOK_post_gstorage_ensure) (struct guild_storage * retVal___, int guild_id); typedef void (*HPMHOOK_pre_gstorage_init) (bool *minimal); typedef void (*HPMHOOK_post_gstorage_init) (bool minimal); typedef void (*HPMHOOK_pre_gstorage_final) (void); @@ -3712,8 +3712,8 @@ typedef void (*HPMHOOK_pre_handlers_final) (void); typedef void (*HPMHOOK_post_handlers_final) (void); typedef void (*HPMHOOK_pre_handlers_sendHotkeyV2Tab) (JsonP **json, struct userconfig_userhotkeys_v2 **hotkeys); typedef void (*HPMHOOK_post_handlers_sendHotkeyV2Tab) (JsonP *json, struct userconfig_userhotkeys_v2 *hotkeys); -typedef const char* (*HPMHOOK_pre_handlers_hotkeyTabIdToName) (int *tab_id); -typedef const char* (*HPMHOOK_post_handlers_hotkeyTabIdToName) (const char* retVal___, int tab_id); +typedef const char * (*HPMHOOK_pre_handlers_hotkeyTabIdToName) (int *tab_id); +typedef const char * (*HPMHOOK_post_handlers_hotkeyTabIdToName) (const char * retVal___, int tab_id); typedef bool (*HPMHOOK_pre_handlers_parse_userconfig_load) (int *fd, struct api_session_data **sd); typedef bool (*HPMHOOK_post_handlers_parse_userconfig_load) (bool retVal___, int fd, struct api_session_data *sd); typedef void (*HPMHOOK_pre_handlers_userconfig_load) (int *fd, struct api_session_data **sd, const void **data, size_t *data_size); @@ -3770,8 +3770,8 @@ typedef void (*HPMHOOK_pre_homun_reload) (void); typedef void (*HPMHOOK_post_homun_reload) (void); typedef void (*HPMHOOK_pre_homun_reload_skill) (void); typedef void (*HPMHOOK_post_homun_reload_skill) (void); -typedef struct view_data* (*HPMHOOK_pre_homun_get_viewdata) (int *class_); -typedef struct view_data* (*HPMHOOK_post_homun_get_viewdata) (struct view_data* retVal___, int class_); +typedef struct view_data * (*HPMHOOK_pre_homun_get_viewdata) (int *class_); +typedef struct view_data * (*HPMHOOK_post_homun_get_viewdata) (struct view_data * retVal___, int class_); typedef enum homun_type (*HPMHOOK_pre_homun_class2type) (enum homun_id *class_); typedef enum homun_type (*HPMHOOK_post_homun_class2type) (enum homun_type retVal___, enum homun_id class_); typedef void (*HPMHOOK_pre_homun_damaged) (struct homun_data **hd); @@ -3896,8 +3896,8 @@ typedef void (*HPMHOOK_pre_httpparser_init_settings) (void); typedef void (*HPMHOOK_post_httpparser_init_settings) (void); typedef void (*HPMHOOK_pre_httpparser_init_multi_settings) (void); typedef void (*HPMHOOK_post_httpparser_init_multi_settings) (void); -typedef const char* (*HPMHOOK_pre_httpparser_get_method_str) (struct api_session_data **sd); -typedef const char* (*HPMHOOK_post_httpparser_get_method_str) (const char* retVal___, struct api_session_data *sd); +typedef const char * (*HPMHOOK_pre_httpparser_get_method_str) (struct api_session_data **sd); +typedef const char * (*HPMHOOK_post_httpparser_get_method_str) (const char * retVal___, struct api_session_data *sd); typedef http_method (*HPMHOOK_pre_httpparser_get_method) (struct api_session_data **sd); typedef http_method (*HPMHOOK_post_httpparser_get_method) (http_method retVal___, struct api_session_data *sd); typedef int (*HPMHOOK_pre_httpparser_on_message_begin) (HTTP_PARSER **parser); @@ -3942,8 +3942,8 @@ typedef int (*HPMHOOK_pre_httpsender_init) (bool *minimal); typedef int (*HPMHOOK_post_httpsender_init) (int retVal___, bool minimal); typedef void (*HPMHOOK_pre_httpsender_final) (void); typedef void (*HPMHOOK_post_httpsender_final) (void); -typedef const char* (*HPMHOOK_pre_httpsender_http_status_name) (enum http_status *status); -typedef const char* (*HPMHOOK_post_httpsender_http_status_name) (const char* retVal___, enum http_status status); +typedef const char * (*HPMHOOK_pre_httpsender_http_status_name) (enum http_status *status); +typedef const char * (*HPMHOOK_post_httpsender_http_status_name) (const char * retVal___, enum http_status status); typedef void (*HPMHOOK_pre_httpsender_send_continue) (int *fd); typedef void (*HPMHOOK_post_httpsender_send_continue) (int fd); typedef bool (*HPMHOOK_pre_httpsender_send_plain) (int *fd, const char **data); @@ -4102,12 +4102,12 @@ typedef int (*HPMHOOK_pre_inter_guild_removemember_tosql) (int *account_id, int typedef int (*HPMHOOK_post_inter_guild_removemember_tosql) (int retVal___, int account_id, int char_id); typedef bool (*HPMHOOK_pre_inter_guild_tosql) (struct guild **g, int *flag); typedef bool (*HPMHOOK_post_inter_guild_tosql) (bool retVal___, struct guild *g, int flag); -typedef struct guild* (*HPMHOOK_pre_inter_guild_fromsql) (int *guild_id); -typedef struct guild* (*HPMHOOK_post_inter_guild_fromsql) (struct guild* retVal___, int guild_id); +typedef struct guild * (*HPMHOOK_pre_inter_guild_fromsql) (int *guild_id); +typedef struct guild * (*HPMHOOK_post_inter_guild_fromsql) (struct guild * retVal___, int guild_id); typedef int (*HPMHOOK_pre_inter_guild_castle_tosql) (struct guild_castle **gc); typedef int (*HPMHOOK_post_inter_guild_castle_tosql) (int retVal___, struct guild_castle *gc); -typedef struct guild_castle* (*HPMHOOK_pre_inter_guild_castle_fromsql) (int *castle_id); -typedef struct guild_castle* (*HPMHOOK_post_inter_guild_castle_fromsql) (struct guild_castle* retVal___, int castle_id); +typedef struct guild_castle * (*HPMHOOK_pre_inter_guild_castle_fromsql) (int *castle_id); +typedef struct guild_castle * (*HPMHOOK_post_inter_guild_castle_fromsql) (struct guild_castle * retVal___, int castle_id); typedef bool (*HPMHOOK_pre_inter_guild_exp_parse_row) (char **split[], int *column, int *current); typedef bool (*HPMHOOK_post_inter_guild_exp_parse_row) (bool retVal___, char *split[], int column, int current); typedef int (*HPMHOOK_pre_inter_guild_CharOnline) (int *char_id, int *guild_id); @@ -4138,8 +4138,8 @@ typedef int (*HPMHOOK_pre_inter_guild_parse_frommap) (int *fd); typedef int (*HPMHOOK_post_inter_guild_parse_frommap) (int retVal___, int fd); typedef int (*HPMHOOK_pre_inter_guild_broken) (int *guild_id); typedef int (*HPMHOOK_post_inter_guild_broken) (int retVal___, int guild_id); -typedef struct guild* (*HPMHOOK_pre_inter_guild_create) (const char **name, const struct guild_member **master); -typedef struct guild* (*HPMHOOK_post_inter_guild_create) (struct guild* retVal___, const char *name, const struct guild_member *master); +typedef struct guild * (*HPMHOOK_pre_inter_guild_create) (const char **name, const struct guild_member **master); +typedef struct guild * (*HPMHOOK_post_inter_guild_create) (struct guild * retVal___, const char *name, const struct guild_member *master); typedef bool (*HPMHOOK_pre_inter_guild_add_member) (int *guild_id, const struct guild_member **member); typedef bool (*HPMHOOK_post_inter_guild_add_member) (bool retVal___, int guild_id, const struct guild_member *member); typedef bool (*HPMHOOK_pre_inter_guild_leave) (int *guild_id, int *account_id, int *char_id, int *flag, const char **mes); @@ -4190,14 +4190,14 @@ typedef bool (*HPMHOOK_pre_inter_homunculus_rename) (const char **name); typedef bool (*HPMHOOK_post_inter_homunculus_rename) (bool retVal___, const char *name); #endif // CHAR_INT_HOMUN_H #ifdef CHAR_INTER_H /* inter */ -typedef const char* (*HPMHOOK_pre_inter_msg_txt) (int *msg_number); -typedef const char* (*HPMHOOK_post_inter_msg_txt) (const char* retVal___, int msg_number); +typedef const char * (*HPMHOOK_pre_inter_msg_txt) (int *msg_number); +typedef const char * (*HPMHOOK_post_inter_msg_txt) (const char * retVal___, int msg_number); typedef bool (*HPMHOOK_pre_inter_msg_config_read) (const char **cfg_name, bool *allow_override); typedef bool (*HPMHOOK_post_inter_msg_config_read) (bool retVal___, const char *cfg_name, bool allow_override); typedef void (*HPMHOOK_pre_inter_do_final_msg) (void); typedef void (*HPMHOOK_post_inter_do_final_msg) (void); -typedef const char* (*HPMHOOK_pre_inter_job_name) (int *class); -typedef const char* (*HPMHOOK_post_inter_job_name) (const char* retVal___, int class); +typedef const char * (*HPMHOOK_pre_inter_job_name) (int *class); +typedef const char * (*HPMHOOK_post_inter_job_name) (const char * retVal___, int class); typedef void (*HPMHOOK_pre_inter_vmsg_to_fd) (int *fd, int *u_fd, int *aid, char **msg, va_list ap); typedef void (*HPMHOOK_post_inter_vmsg_to_fd) (int fd, int u_fd, int aid, char *msg, va_list ap); typedef void (*HPMHOOK_pre_inter_savereg) (int *account_id, int *char_id, const char **key, unsigned int *index, intptr_t *val, bool *is_string); @@ -4288,14 +4288,14 @@ typedef int (*HPMHOOK_pre_inter_party_tosql) (struct party **p, int *flag, int * typedef int (*HPMHOOK_post_inter_party_tosql) (int retVal___, struct party *p, int flag, int index); typedef int (*HPMHOOK_pre_inter_party_del_nonexistent_party) (int *party_id); typedef int (*HPMHOOK_post_inter_party_del_nonexistent_party) (int retVal___, int party_id); -typedef struct party_data* (*HPMHOOK_pre_inter_party_fromsql) (int *party_id); -typedef struct party_data* (*HPMHOOK_post_inter_party_fromsql) (struct party_data* retVal___, int party_id); +typedef struct party_data * (*HPMHOOK_pre_inter_party_fromsql) (int *party_id); +typedef struct party_data * (*HPMHOOK_post_inter_party_fromsql) (struct party_data * retVal___, int party_id); typedef int (*HPMHOOK_pre_inter_party_sql_init) (void); typedef int (*HPMHOOK_post_inter_party_sql_init) (int retVal___); typedef void (*HPMHOOK_pre_inter_party_sql_final) (void); typedef void (*HPMHOOK_post_inter_party_sql_final) (void); -typedef struct party_data* (*HPMHOOK_pre_inter_party_search_partyname) (const char **str); -typedef struct party_data* (*HPMHOOK_post_inter_party_search_partyname) (struct party_data* retVal___, const char *str); +typedef struct party_data * (*HPMHOOK_pre_inter_party_search_partyname) (const char **str); +typedef struct party_data * (*HPMHOOK_post_inter_party_search_partyname) (struct party_data * retVal___, const char *str); typedef int (*HPMHOOK_pre_inter_party_check_exp_share) (struct party_data **p); typedef int (*HPMHOOK_post_inter_party_check_exp_share) (int retVal___, struct party_data *p); typedef int (*HPMHOOK_pre_inter_party_check_empty) (struct party_data **p); @@ -4308,8 +4308,8 @@ typedef int (*HPMHOOK_pre_inter_party_CharOnline) (int *char_id, int *party_id); typedef int (*HPMHOOK_post_inter_party_CharOnline) (int retVal___, int char_id, int party_id); typedef int (*HPMHOOK_pre_inter_party_CharOffline) (int *char_id, int *party_id); typedef int (*HPMHOOK_post_inter_party_CharOffline) (int retVal___, int char_id, int party_id); -typedef struct party_data* (*HPMHOOK_pre_inter_party_create) (const char **name, int *item, int *item2, const struct party_member **leader); -typedef struct party_data* (*HPMHOOK_post_inter_party_create) (struct party_data* retVal___, const char *name, int item, int item2, const struct party_member *leader); +typedef struct party_data * (*HPMHOOK_pre_inter_party_create) (const char **name, int *item, int *item2, const struct party_member **leader); +typedef struct party_data * (*HPMHOOK_post_inter_party_create) (struct party_data * retVal___, const char *name, int item, int item2, const struct party_member *leader); typedef bool (*HPMHOOK_pre_inter_party_add_member) (int *party_id, const struct party_member **member); typedef bool (*HPMHOOK_post_inter_party_add_member) (bool retVal___, int party_id, const struct party_member *member); typedef bool (*HPMHOOK_pre_inter_party_change_option) (int *party_id, int *account_id, int *exp, int *item); @@ -4336,16 +4336,16 @@ typedef int (*HPMHOOK_pre_inter_pet_delete_) (int *pet_id); typedef int (*HPMHOOK_post_inter_pet_delete_) (int retVal___, int pet_id); typedef int (*HPMHOOK_pre_inter_pet_parse_frommap) (int *fd); typedef int (*HPMHOOK_post_inter_pet_parse_frommap) (int retVal___, int fd); -typedef struct s_pet* (*HPMHOOK_pre_inter_pet_create) (int *account_id, int *char_id, int *pet_class, int *pet_lv, int *pet_egg_id, int *pet_equip, short *intimate, short *hungry, char *rename_flag, char *incubate, const char **pet_name); -typedef struct s_pet* (*HPMHOOK_post_inter_pet_create) (struct s_pet* retVal___, int account_id, int char_id, int pet_class, int pet_lv, int pet_egg_id, int pet_equip, short intimate, short hungry, char rename_flag, char incubate, const char *pet_name); -typedef struct s_pet* (*HPMHOOK_pre_inter_pet_load) (int *account_id, int *char_id, int *pet_id); -typedef struct s_pet* (*HPMHOOK_post_inter_pet_load) (struct s_pet* retVal___, int account_id, int char_id, int pet_id); +typedef struct s_pet * (*HPMHOOK_pre_inter_pet_create) (int *account_id, int *char_id, int *pet_class, int *pet_lv, int *pet_egg_id, int *pet_equip, short *intimate, short *hungry, char *rename_flag, char *incubate, const char **pet_name); +typedef struct s_pet * (*HPMHOOK_post_inter_pet_create) (struct s_pet * retVal___, int account_id, int char_id, int pet_class, int pet_lv, int pet_egg_id, int pet_equip, short intimate, short hungry, char rename_flag, char incubate, const char *pet_name); +typedef struct s_pet * (*HPMHOOK_pre_inter_pet_load) (int *account_id, int *char_id, int *pet_id); +typedef struct s_pet * (*HPMHOOK_post_inter_pet_load) (struct s_pet * retVal___, int account_id, int char_id, int pet_id); #endif // CHAR_INT_PET_H #ifdef CHAR_INT_QUEST_H /* inter_quest */ typedef int (*HPMHOOK_pre_inter_quest_parse_frommap) (int *fd); typedef int (*HPMHOOK_post_inter_quest_parse_frommap) (int retVal___, int fd); -typedef struct quest* (*HPMHOOK_pre_inter_quest_fromsql) (int *char_id, int **count); -typedef struct quest* (*HPMHOOK_post_inter_quest_fromsql) (struct quest* retVal___, int char_id, int *count); +typedef struct quest * (*HPMHOOK_pre_inter_quest_fromsql) (int *char_id, int **count); +typedef struct quest * (*HPMHOOK_post_inter_quest_fromsql) (struct quest * retVal___, int char_id, int *count); typedef bool (*HPMHOOK_pre_inter_quest_delete) (int *char_id, int *quest_id); typedef bool (*HPMHOOK_post_inter_quest_delete) (bool retVal___, int char_id, int quest_id); typedef bool (*HPMHOOK_pre_inter_quest_add) (int *char_id, struct quest *qd); @@ -4378,10 +4378,10 @@ typedef int (*HPMHOOK_pre_inter_rodex_getitems) (int64 *mail_id, struct rodex_it typedef int (*HPMHOOK_post_inter_rodex_getitems) (int retVal___, int64 mail_id, struct rodex_item *items); #endif // CHAR_INT_RODEX_H #ifdef CHAR_INT_STORAGE_H /* inter_storage */ -typedef int (*HPMHOOK_pre_inter_storage_tosql) (int *account_id, const struct storage_data **p); -typedef int (*HPMHOOK_post_inter_storage_tosql) (int retVal___, int account_id, const struct storage_data *p); -typedef int (*HPMHOOK_pre_inter_storage_fromsql) (int *account_id, struct storage_data **p); -typedef int (*HPMHOOK_post_inter_storage_fromsql) (int retVal___, int account_id, struct storage_data *p); +typedef int (*HPMHOOK_pre_inter_storage_tosql) (int *account_id, int *storage_id, const struct storage_data **p); +typedef int (*HPMHOOK_post_inter_storage_tosql) (int retVal___, int account_id, int storage_id, const struct storage_data *p); +typedef int (*HPMHOOK_pre_inter_storage_fromsql) (int *account_id, int *storage_id, struct storage_data **p); +typedef int (*HPMHOOK_post_inter_storage_fromsql) (int retVal___, int account_id, int storage_id, struct storage_data *p); typedef bool (*HPMHOOK_pre_inter_storage_guild_storage_tosql) (int *guild_id, const struct guild_storage **gstor); typedef bool (*HPMHOOK_post_inter_storage_guild_storage_tosql) (bool retVal___, int guild_id, const struct guild_storage *gstor); typedef int (*HPMHOOK_pre_inter_storage_guild_storage_fromsql) (int *guild_id, struct guild_storage **gstor); @@ -4432,10 +4432,10 @@ typedef int (*HPMHOOK_pre_intif_saveregistry) (struct map_session_data **sd); typedef int (*HPMHOOK_post_intif_saveregistry) (int retVal___, struct map_session_data *sd); typedef int (*HPMHOOK_pre_intif_request_registry) (struct map_session_data **sd, int *flag); typedef int (*HPMHOOK_post_intif_request_registry) (int retVal___, struct map_session_data *sd, int flag); -typedef void (*HPMHOOK_pre_intif_request_account_storage) (const struct map_session_data **sd); -typedef void (*HPMHOOK_post_intif_request_account_storage) (const struct map_session_data *sd); -typedef void (*HPMHOOK_pre_intif_send_account_storage) (struct map_session_data **sd); -typedef void (*HPMHOOK_post_intif_send_account_storage) (struct map_session_data *sd); +typedef void (*HPMHOOK_pre_intif_request_account_storage) (const struct map_session_data **sd, int *storage_id); +typedef void (*HPMHOOK_post_intif_request_account_storage) (const struct map_session_data *sd, int storage_id); +typedef void (*HPMHOOK_pre_intif_send_account_storage) (struct map_session_data **sd, int *storage_id); +typedef void (*HPMHOOK_post_intif_send_account_storage) (struct map_session_data *sd, int storage_id); typedef int (*HPMHOOK_pre_intif_request_guild_storage) (int *account_id, int *guild_id); typedef int (*HPMHOOK_post_intif_request_guild_storage) (int retVal___, int account_id, int guild_id); typedef int (*HPMHOOK_pre_intif_send_guild_storage) (int *account_id, struct guild_storage **gstor); @@ -4740,8 +4740,8 @@ typedef void (*HPMHOOK_pre_ircbot_parse_sub) (int *fd, char **str); typedef void (*HPMHOOK_post_ircbot_parse_sub) (int fd, char *str); typedef void (*HPMHOOK_pre_ircbot_parse_source) (char **source, char **nick, char **ident, char **host); typedef void (*HPMHOOK_post_ircbot_parse_source) (char *source, char *nick, char *ident, char *host); -typedef struct irc_func* (*HPMHOOK_pre_ircbot_func_search) (char **function_name); -typedef struct irc_func* (*HPMHOOK_post_ircbot_func_search) (struct irc_func* retVal___, char *function_name); +typedef struct irc_func * (*HPMHOOK_pre_ircbot_func_search) (char **function_name); +typedef struct irc_func * (*HPMHOOK_post_ircbot_func_search) (struct irc_func * retVal___, char *function_name); typedef int (*HPMHOOK_pre_ircbot_connect_timer) (int *tid, int64 *tick, int *id, intptr_t *data); typedef int (*HPMHOOK_post_ircbot_connect_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); typedef int (*HPMHOOK_pre_ircbot_identify_timer) (int *tid, int64 *tick, int *id, intptr_t *data); @@ -4790,26 +4790,26 @@ typedef void (*HPMHOOK_pre_itemdb_write_cached_packages) (const char **config_fi typedef void (*HPMHOOK_post_itemdb_write_cached_packages) (const char *config_filename); typedef bool (*HPMHOOK_pre_itemdb_read_cached_packages) (const char **config_filename); typedef bool (*HPMHOOK_post_itemdb_read_cached_packages) (bool retVal___, const char *config_filename); -typedef struct item_data* (*HPMHOOK_pre_itemdb_name2id) (const char **str); -typedef struct item_data* (*HPMHOOK_post_itemdb_name2id) (struct item_data* retVal___, const char *str); -typedef struct item_data* (*HPMHOOK_pre_itemdb_search_name) (const char **name); -typedef struct item_data* (*HPMHOOK_post_itemdb_search_name) (struct item_data* retVal___, const char *name); +typedef struct item_data * (*HPMHOOK_pre_itemdb_name2id) (const char **str); +typedef struct item_data * (*HPMHOOK_post_itemdb_name2id) (struct item_data * retVal___, const char *str); +typedef struct item_data * (*HPMHOOK_pre_itemdb_search_name) (const char **name); +typedef struct item_data * (*HPMHOOK_post_itemdb_search_name) (struct item_data * retVal___, const char *name); typedef int (*HPMHOOK_pre_itemdb_search_name_array) (struct item_data ***data, const int *size, const char **str, enum item_name_search_flag *flag); typedef int (*HPMHOOK_post_itemdb_search_name_array) (int retVal___, struct item_data **data, const int size, const char *str, enum item_name_search_flag flag); -typedef struct item_data* (*HPMHOOK_pre_itemdb_load) (int *nameid); -typedef struct item_data* (*HPMHOOK_post_itemdb_load) (struct item_data* retVal___, int nameid); -typedef struct item_data* (*HPMHOOK_pre_itemdb_search) (int *nameid); -typedef struct item_data* (*HPMHOOK_post_itemdb_search) (struct item_data* retVal___, int nameid); -typedef struct item_data* (*HPMHOOK_pre_itemdb_exists) (int *nameid); -typedef struct item_data* (*HPMHOOK_post_itemdb_exists) (struct item_data* retVal___, int nameid); -typedef struct itemdb_option* (*HPMHOOK_pre_itemdb_option_exists) (int *idx); -typedef struct itemdb_option* (*HPMHOOK_post_itemdb_option_exists) (struct itemdb_option* retVal___, int idx); -typedef struct item_reform* (*HPMHOOK_pre_itemdb_reform_exists) (int *idx); -typedef struct item_reform* (*HPMHOOK_post_itemdb_reform_exists) (struct item_reform* retVal___, int idx); +typedef struct item_data * (*HPMHOOK_pre_itemdb_load) (int *nameid); +typedef struct item_data * (*HPMHOOK_post_itemdb_load) (struct item_data * retVal___, int nameid); +typedef struct item_data * (*HPMHOOK_pre_itemdb_search) (int *nameid); +typedef struct item_data * (*HPMHOOK_post_itemdb_search) (struct item_data * retVal___, int nameid); +typedef struct item_data * (*HPMHOOK_pre_itemdb_exists) (int *nameid); +typedef struct item_data * (*HPMHOOK_post_itemdb_exists) (struct item_data * retVal___, int nameid); +typedef struct itemdb_option * (*HPMHOOK_pre_itemdb_option_exists) (int *idx); +typedef struct itemdb_option * (*HPMHOOK_post_itemdb_option_exists) (struct itemdb_option * retVal___, int idx); +typedef struct item_reform * (*HPMHOOK_pre_itemdb_reform_exists) (int *idx); +typedef struct item_reform * (*HPMHOOK_post_itemdb_reform_exists) (struct item_reform * retVal___, int idx); typedef bool (*HPMHOOK_pre_itemdb_in_group) (struct item_group **group, int *nameid); typedef bool (*HPMHOOK_post_itemdb_in_group) (bool retVal___, struct item_group *group, int nameid); -typedef const struct item_group* (*HPMHOOK_pre_itemdb_search_group) (int *nameid); -typedef const struct item_group* (*HPMHOOK_post_itemdb_search_group) (const struct item_group* retVal___, int nameid); +typedef const struct item_group * (*HPMHOOK_pre_itemdb_search_group) (int *nameid); +typedef const struct item_group * (*HPMHOOK_post_itemdb_search_group) (const struct item_group * retVal___, int nameid); typedef int (*HPMHOOK_pre_itemdb_group_item) (struct item_group **group); typedef int (*HPMHOOK_post_itemdb_group_item) (int retVal___, struct item_group *group); typedef int (*HPMHOOK_pre_itemdb_chain_item) (unsigned short *chain_id, int **rate); @@ -4822,16 +4822,16 @@ typedef int (*HPMHOOK_pre_itemdb_searchname_array_sub) (union DBKey *key, struct typedef int (*HPMHOOK_post_itemdb_searchname_array_sub) (int retVal___, union DBKey key, struct DBData data, va_list ap); typedef int (*HPMHOOK_pre_itemdb_searchrandomid) (struct item_group **group); typedef int (*HPMHOOK_post_itemdb_searchrandomid) (int retVal___, struct item_group *group); -typedef const char* (*HPMHOOK_pre_itemdb_typename) (enum item_types *type); -typedef const char* (*HPMHOOK_post_itemdb_typename) (const char* retVal___, enum item_types type); +typedef const char * (*HPMHOOK_pre_itemdb_typename) (enum item_types *type); +typedef const char * (*HPMHOOK_post_itemdb_typename) (const char * retVal___, enum item_types type); typedef void (*HPMHOOK_pre_itemdb_jobmask2mapid) (uint64 **bclass, uint64 *jobmask); typedef void (*HPMHOOK_post_itemdb_jobmask2mapid) (uint64 *bclass, uint64 jobmask); typedef void (*HPMHOOK_pre_itemdb_jobid2mapid) (uint64 **bclass, int *job_class, bool *enable); typedef void (*HPMHOOK_post_itemdb_jobid2mapid) (uint64 *bclass, int job_class, bool enable); typedef void (*HPMHOOK_pre_itemdb_create_dummy_data) (void); typedef void (*HPMHOOK_post_itemdb_create_dummy_data) (void); -typedef struct item_data* (*HPMHOOK_pre_itemdb_create_item_data) (int *nameid); -typedef struct item_data* (*HPMHOOK_post_itemdb_create_item_data) (struct item_data* retVal___, int nameid); +typedef struct item_data * (*HPMHOOK_pre_itemdb_create_item_data) (int *nameid); +typedef struct item_data * (*HPMHOOK_post_itemdb_create_item_data) (struct item_data * retVal___, int nameid); typedef int (*HPMHOOK_pre_itemdb_isequip) (int *nameid); typedef int (*HPMHOOK_post_itemdb_isequip) (int retVal___, int nameid); typedef int (*HPMHOOK_pre_itemdb_isequip2) (struct item_data **data); @@ -4896,8 +4896,8 @@ typedef int (*HPMHOOK_pre_itemdb_reform_final_sub) (union DBKey *key, struct DBD typedef int (*HPMHOOK_post_itemdb_reform_final_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap); typedef void (*HPMHOOK_pre_itemdb_clear) (bool *total); typedef void (*HPMHOOK_post_itemdb_clear) (bool total); -typedef struct item_combo* (*HPMHOOK_pre_itemdb_id2combo) (int *id); -typedef struct item_combo* (*HPMHOOK_post_itemdb_id2combo) (struct item_combo* retVal___, int id); +typedef struct item_combo * (*HPMHOOK_pre_itemdb_id2combo) (int *id); +typedef struct item_combo * (*HPMHOOK_post_itemdb_id2combo) (struct item_combo * retVal___, int id); typedef bool (*HPMHOOK_pre_itemdb_is_item_usable) (struct item_data **item); typedef bool (*HPMHOOK_post_itemdb_is_item_usable) (bool retVal___, struct item_data *item); typedef int (*HPMHOOK_pre_itemdb_addname_sub) (union DBKey *key, struct DBData **data, va_list ap); @@ -4930,38 +4930,38 @@ typedef bool (*HPMHOOK_pre_itemdb_read_libconfig_item_reform_list_sub) (struct c typedef bool (*HPMHOOK_post_itemdb_read_libconfig_item_reform_list_sub) (bool retVal___, struct config_setting_t *it, const char *source); typedef void (*HPMHOOK_pre_itemdb_item_reform) (struct map_session_data **sd, const struct item_reform **ir, int *idx); typedef void (*HPMHOOK_post_itemdb_item_reform) (struct map_session_data *sd, const struct item_reform *ir, int idx); -typedef const struct item_reform* (*HPMHOOK_pre_itemdb_search_reform_baseitem) (const struct item_data **itd, int *nameid); -typedef const struct item_reform* (*HPMHOOK_post_itemdb_search_reform_baseitem) (const struct item_reform* retVal___, const struct item_data *itd, int nameid); +typedef const struct item_reform * (*HPMHOOK_pre_itemdb_search_reform_baseitem) (const struct item_data **itd, int *nameid); +typedef const struct item_reform * (*HPMHOOK_post_itemdb_search_reform_baseitem) (const struct item_reform * retVal___, const struct item_data *itd, int nameid); #endif // MAP_ITEMDB_H #ifdef API_JSONPARSER_H /* jsonparser */ typedef int (*HPMHOOK_pre_jsonparser_init) (bool *minimal); typedef int (*HPMHOOK_post_jsonparser_init) (int retVal___, bool minimal); typedef void (*HPMHOOK_pre_jsonparser_final) (void); typedef void (*HPMHOOK_post_jsonparser_final) (void); -typedef JsonP* (*HPMHOOK_pre_jsonparser_parse) (const char **text); -typedef JsonP* (*HPMHOOK_post_jsonparser_parse) (JsonP* retVal___, const char *text); +typedef JsonP * (*HPMHOOK_pre_jsonparser_parse) (const char **text); +typedef JsonP * (*HPMHOOK_post_jsonparser_parse) (JsonP * retVal___, const char *text); typedef void (*HPMHOOK_pre_jsonparser_print) (const JsonP **parent); typedef void (*HPMHOOK_post_jsonparser_print) (const JsonP *parent); -typedef char* (*HPMHOOK_pre_jsonparser_get_string) (const JsonP **parent); -typedef char* (*HPMHOOK_post_jsonparser_get_string) (char* retVal___, const JsonP *parent); -typedef char* (*HPMHOOK_pre_jsonparser_get_formatted_string) (const JsonP **parent); -typedef char* (*HPMHOOK_post_jsonparser_get_formatted_string) (char* retVal___, const JsonP *parent); +typedef char * (*HPMHOOK_pre_jsonparser_get_string) (const JsonP **parent); +typedef char * (*HPMHOOK_post_jsonparser_get_string) (char * retVal___, const JsonP *parent); +typedef char * (*HPMHOOK_pre_jsonparser_get_formatted_string) (const JsonP **parent); +typedef char * (*HPMHOOK_post_jsonparser_get_formatted_string) (char * retVal___, const JsonP *parent); typedef bool (*HPMHOOK_pre_jsonparser_is_null) (const JsonP **parent); typedef bool (*HPMHOOK_post_jsonparser_is_null) (bool retVal___, const JsonP *parent); typedef bool (*HPMHOOK_pre_jsonparser_is_null_or_missing) (const JsonP **parent); typedef bool (*HPMHOOK_post_jsonparser_is_null_or_missing) (bool retVal___, const JsonP *parent); -typedef JsonP* (*HPMHOOK_pre_jsonparser_get) (const JsonP **parent, const char **name); -typedef JsonP* (*HPMHOOK_post_jsonparser_get) (JsonP* retVal___, const JsonP *parent, const char *name); +typedef JsonP * (*HPMHOOK_pre_jsonparser_get) (const JsonP **parent, const char **name); +typedef JsonP * (*HPMHOOK_post_jsonparser_get) (JsonP * retVal___, const JsonP *parent, const char *name); typedef int (*HPMHOOK_pre_jsonparser_get_array_size) (const JsonP **parent); typedef int (*HPMHOOK_post_jsonparser_get_array_size) (int retVal___, const JsonP *parent); -typedef char* (*HPMHOOK_pre_jsonparser_get_string_value) (const JsonP **parent); -typedef char* (*HPMHOOK_post_jsonparser_get_string_value) (char* retVal___, const JsonP *parent); +typedef char * (*HPMHOOK_pre_jsonparser_get_string_value) (const JsonP **parent); +typedef char * (*HPMHOOK_post_jsonparser_get_string_value) (char * retVal___, const JsonP *parent); typedef double (*HPMHOOK_pre_jsonparser_get_number_value) (const JsonP **parent); typedef double (*HPMHOOK_post_jsonparser_get_number_value) (double retVal___, const JsonP *parent); typedef int (*HPMHOOK_pre_jsonparser_get_int_value) (const JsonP **parent); typedef int (*HPMHOOK_post_jsonparser_get_int_value) (int retVal___, const JsonP *parent); -typedef char* (*HPMHOOK_pre_jsonparser_get_child_string_value) (const JsonP **parent, const char **name); -typedef char* (*HPMHOOK_post_jsonparser_get_child_string_value) (char* retVal___, const JsonP *parent, const char *name); +typedef char * (*HPMHOOK_pre_jsonparser_get_child_string_value) (const JsonP **parent, const char **name); +typedef char * (*HPMHOOK_post_jsonparser_get_child_string_value) (char * retVal___, const JsonP *parent, const char *name); typedef double (*HPMHOOK_pre_jsonparser_get_child_number_value) (const JsonP **parent, const char **name); typedef double (*HPMHOOK_post_jsonparser_get_child_number_value) (double retVal___, const JsonP *parent, const char *name); typedef int (*HPMHOOK_pre_jsonparser_get_child_int_value) (const JsonP **parent, const char **name); @@ -4976,46 +4976,46 @@ typedef int (*HPMHOOK_pre_jsonwriter_init) (bool *minimal); typedef int (*HPMHOOK_post_jsonwriter_init) (int retVal___, bool minimal); typedef void (*HPMHOOK_pre_jsonwriter_final) (void); typedef void (*HPMHOOK_post_jsonwriter_final) (void); -typedef JsonW* (*HPMHOOK_pre_jsonwriter_create) (const char **text); -typedef JsonW* (*HPMHOOK_post_jsonwriter_create) (JsonW* retVal___, const char *text); -typedef JsonW* (*HPMHOOK_pre_jsonwriter_create_empty) (void); -typedef JsonW* (*HPMHOOK_post_jsonwriter_create_empty) (JsonW* retVal___); -typedef JsonW* (*HPMHOOK_pre_jsonwriter_new_array) (void); -typedef JsonW* (*HPMHOOK_post_jsonwriter_new_array) (JsonW* retVal___); -typedef JsonW* (*HPMHOOK_pre_jsonwriter_new_object) (void); -typedef JsonW* (*HPMHOOK_post_jsonwriter_new_object) (JsonW* retVal___); -typedef JsonW* (*HPMHOOK_pre_jsonwriter_new_string) (const char **str); -typedef JsonW* (*HPMHOOK_post_jsonwriter_new_string) (JsonW* retVal___, const char *str); -typedef JsonW* (*HPMHOOK_pre_jsonwriter_new_number) (int *number); -typedef JsonW* (*HPMHOOK_post_jsonwriter_new_number) (JsonW* retVal___, int number); -typedef JsonW* (*HPMHOOK_pre_jsonwriter_new_null) (void); -typedef JsonW* (*HPMHOOK_post_jsonwriter_new_null) (JsonW* retVal___); +typedef JsonW * (*HPMHOOK_pre_jsonwriter_create) (const char **text); +typedef JsonW * (*HPMHOOK_post_jsonwriter_create) (JsonW * retVal___, const char *text); +typedef JsonW * (*HPMHOOK_pre_jsonwriter_create_empty) (void); +typedef JsonW * (*HPMHOOK_post_jsonwriter_create_empty) (JsonW * retVal___); +typedef JsonW * (*HPMHOOK_pre_jsonwriter_new_array) (void); +typedef JsonW * (*HPMHOOK_post_jsonwriter_new_array) (JsonW * retVal___); +typedef JsonW * (*HPMHOOK_pre_jsonwriter_new_object) (void); +typedef JsonW * (*HPMHOOK_post_jsonwriter_new_object) (JsonW * retVal___); +typedef JsonW * (*HPMHOOK_pre_jsonwriter_new_string) (const char **str); +typedef JsonW * (*HPMHOOK_post_jsonwriter_new_string) (JsonW * retVal___, const char *str); +typedef JsonW * (*HPMHOOK_pre_jsonwriter_new_number) (int *number); +typedef JsonW * (*HPMHOOK_post_jsonwriter_new_number) (JsonW * retVal___, int number); +typedef JsonW * (*HPMHOOK_pre_jsonwriter_new_null) (void); +typedef JsonW * (*HPMHOOK_post_jsonwriter_new_null) (JsonW * retVal___); typedef JsonWBool (*HPMHOOK_pre_jsonwriter_add_node) (JsonW **parent, const char **name, JsonW **child); typedef JsonWBool (*HPMHOOK_post_jsonwriter_add_node) (JsonWBool retVal___, JsonW *parent, const char *name, JsonW *child); typedef JsonWBool (*HPMHOOK_pre_jsonwriter_add_node_to_array) (JsonW **parent, JsonW **child); typedef JsonWBool (*HPMHOOK_post_jsonwriter_add_node_to_array) (JsonWBool retVal___, JsonW *parent, JsonW *child); -typedef JsonW* (*HPMHOOK_pre_jsonwriter_add_new_array) (JsonW **parent, const char **name); -typedef JsonW* (*HPMHOOK_post_jsonwriter_add_new_array) (JsonW* retVal___, JsonW *parent, const char *name); -typedef JsonW* (*HPMHOOK_pre_jsonwriter_add_new_object) (JsonW **parent, const char **name); -typedef JsonW* (*HPMHOOK_post_jsonwriter_add_new_object) (JsonW* retVal___, JsonW *parent, const char *name); -typedef JsonW* (*HPMHOOK_pre_jsonwriter_add_new_null) (JsonW **parent, const char **name); -typedef JsonW* (*HPMHOOK_post_jsonwriter_add_new_null) (JsonW* retVal___, JsonW *parent, const char *name); -typedef JsonW* (*HPMHOOK_pre_jsonwriter_add_new_number) (JsonW **parent, const char **name, int *number); -typedef JsonW* (*HPMHOOK_post_jsonwriter_add_new_number) (JsonW* retVal___, JsonW *parent, const char *name, int number); -typedef JsonW* (*HPMHOOK_pre_jsonwriter_add_new_string) (JsonW **parent, const char **name, const char **str); -typedef JsonW* (*HPMHOOK_post_jsonwriter_add_new_string) (JsonW* retVal___, JsonW *parent, const char *name, const char *str); -typedef JsonW* (*HPMHOOK_pre_jsonwriter_add_new_string_to_array) (JsonW **parent, const char **str); -typedef JsonW* (*HPMHOOK_post_jsonwriter_add_new_string_to_array) (JsonW* retVal___, JsonW *parent, const char *str); -typedef JsonW* (*HPMHOOK_pre_jsonwriter_add_new_object_to_array) (JsonW **parent); -typedef JsonW* (*HPMHOOK_post_jsonwriter_add_new_object_to_array) (JsonW* retVal___, JsonW *parent); +typedef JsonW * (*HPMHOOK_pre_jsonwriter_add_new_array) (JsonW **parent, const char **name); +typedef JsonW * (*HPMHOOK_post_jsonwriter_add_new_array) (JsonW * retVal___, JsonW *parent, const char *name); +typedef JsonW * (*HPMHOOK_pre_jsonwriter_add_new_object) (JsonW **parent, const char **name); +typedef JsonW * (*HPMHOOK_post_jsonwriter_add_new_object) (JsonW * retVal___, JsonW *parent, const char *name); +typedef JsonW * (*HPMHOOK_pre_jsonwriter_add_new_null) (JsonW **parent, const char **name); +typedef JsonW * (*HPMHOOK_post_jsonwriter_add_new_null) (JsonW * retVal___, JsonW *parent, const char *name); +typedef JsonW * (*HPMHOOK_pre_jsonwriter_add_new_number) (JsonW **parent, const char **name, int *number); +typedef JsonW * (*HPMHOOK_post_jsonwriter_add_new_number) (JsonW * retVal___, JsonW *parent, const char *name, int number); +typedef JsonW * (*HPMHOOK_pre_jsonwriter_add_new_string) (JsonW **parent, const char **name, const char **str); +typedef JsonW * (*HPMHOOK_post_jsonwriter_add_new_string) (JsonW * retVal___, JsonW *parent, const char *name, const char *str); +typedef JsonW * (*HPMHOOK_pre_jsonwriter_add_new_string_to_array) (JsonW **parent, const char **str); +typedef JsonW * (*HPMHOOK_post_jsonwriter_add_new_string_to_array) (JsonW * retVal___, JsonW *parent, const char *str); +typedef JsonW * (*HPMHOOK_pre_jsonwriter_add_new_object_to_array) (JsonW **parent); +typedef JsonW * (*HPMHOOK_post_jsonwriter_add_new_object_to_array) (JsonW * retVal___, JsonW *parent); typedef void (*HPMHOOK_pre_jsonwriter_print) (const JsonW **parent); typedef void (*HPMHOOK_post_jsonwriter_print) (const JsonW *parent); -typedef JsonW* (*HPMHOOK_pre_jsonwriter_get) (const JsonW **parent, const char **name); -typedef JsonW* (*HPMHOOK_post_jsonwriter_get) (JsonW* retVal___, const JsonW *parent, const char *name); -typedef char* (*HPMHOOK_pre_jsonwriter_get_string) (const JsonW **parent); -typedef char* (*HPMHOOK_post_jsonwriter_get_string) (char* retVal___, const JsonW *parent); -typedef char* (*HPMHOOK_pre_jsonwriter_get_formatted_string) (const JsonW **parent); -typedef char* (*HPMHOOK_post_jsonwriter_get_formatted_string) (char* retVal___, const JsonW *parent); +typedef JsonW * (*HPMHOOK_pre_jsonwriter_get) (const JsonW **parent, const char **name); +typedef JsonW * (*HPMHOOK_post_jsonwriter_get) (JsonW * retVal___, const JsonW *parent, const char *name); +typedef char * (*HPMHOOK_pre_jsonwriter_get_string) (const JsonW **parent); +typedef char * (*HPMHOOK_post_jsonwriter_get_string) (char * retVal___, const JsonW *parent); +typedef char * (*HPMHOOK_pre_jsonwriter_get_formatted_string) (const JsonW **parent); +typedef char * (*HPMHOOK_post_jsonwriter_get_formatted_string) (char * retVal___, const JsonW *parent); typedef void (*HPMHOOK_pre_jsonwriter_free) (char **ptr); typedef void (*HPMHOOK_post_jsonwriter_free) (char *ptr); typedef void (*HPMHOOK_pre_jsonwriter_delete) (JsonW **ptr); @@ -5092,8 +5092,8 @@ typedef void (*HPMHOOK_pre_lclif_login_error) (int *fd, uint8 *error); typedef void (*HPMHOOK_post_lclif_login_error) (int fd, uint8 error); typedef void (*HPMHOOK_pre_lclif_coding_key) (int *fd, struct login_session_data **sd); typedef void (*HPMHOOK_post_lclif_coding_key) (int fd, struct login_session_data *sd); -typedef const struct login_packet_db* (*HPMHOOK_pre_lclif_packet) (int16 *packet_id); -typedef const struct login_packet_db* (*HPMHOOK_post_lclif_packet) (const struct login_packet_db* retVal___, int16 packet_id); +typedef const struct login_packet_db * (*HPMHOOK_pre_lclif_packet) (int16 *packet_id); +typedef const struct login_packet_db * (*HPMHOOK_post_lclif_packet) (const struct login_packet_db * retVal___, int16 packet_id); typedef enum parsefunc_rcode (*HPMHOOK_pre_lclif_parse_packet) (const struct login_packet_db **lpd, int *fd, struct login_session_data **sd); typedef enum parsefunc_rcode (*HPMHOOK_post_lclif_parse_packet) (enum parsefunc_rcode retVal___, const struct login_packet_db *lpd, int fd, struct login_session_data *sd); typedef int (*HPMHOOK_pre_lclif_parse) (int *fd); @@ -5170,10 +5170,10 @@ typedef double (*HPMHOOK_pre_libconfig_setting_get_float) (const struct config_s typedef double (*HPMHOOK_post_libconfig_setting_get_float) (double retVal___, const struct config_setting_t *setting); typedef int (*HPMHOOK_pre_libconfig_setting_get_bool) (const struct config_setting_t **setting); typedef int (*HPMHOOK_post_libconfig_setting_get_bool) (int retVal___, const struct config_setting_t *setting); -typedef const char* (*HPMHOOK_pre_libconfig_setting_get_string) (const struct config_setting_t **setting); -typedef const char* (*HPMHOOK_post_libconfig_setting_get_string) (const char* retVal___, const struct config_setting_t *setting); -typedef struct config_setting_t* (*HPMHOOK_pre_libconfig_setting_lookup) (struct config_setting_t **setting, const char **name); -typedef struct config_setting_t* (*HPMHOOK_post_libconfig_setting_lookup) (struct config_setting_t* retVal___, struct config_setting_t *setting, const char *name); +typedef const char * (*HPMHOOK_pre_libconfig_setting_get_string) (const struct config_setting_t **setting); +typedef const char * (*HPMHOOK_post_libconfig_setting_get_string) (const char * retVal___, const struct config_setting_t *setting); +typedef struct config_setting_t * (*HPMHOOK_pre_libconfig_setting_lookup) (struct config_setting_t **setting, const char **name); +typedef struct config_setting_t * (*HPMHOOK_post_libconfig_setting_lookup) (struct config_setting_t * retVal___, struct config_setting_t *setting, const char *name); typedef int (*HPMHOOK_pre_libconfig_setting_lookup_int) (const struct config_setting_t **setting, const char **name, int **value); typedef int (*HPMHOOK_post_libconfig_setting_lookup_int) (int retVal___, const struct config_setting_t *setting, const char *name, int *value); typedef int (*HPMHOOK_pre_libconfig_setting_lookup_int64) (const struct config_setting_t **setting, const char **name, int64 **value); @@ -5206,36 +5206,36 @@ typedef double (*HPMHOOK_pre_libconfig_setting_get_float_elem) (const struct con typedef double (*HPMHOOK_post_libconfig_setting_get_float_elem) (double retVal___, const struct config_setting_t *setting, int idx); typedef int (*HPMHOOK_pre_libconfig_setting_get_bool_elem) (const struct config_setting_t **setting, int *idx); typedef int (*HPMHOOK_post_libconfig_setting_get_bool_elem) (int retVal___, const struct config_setting_t *setting, int idx); -typedef const char* (*HPMHOOK_pre_libconfig_setting_get_string_elem) (const struct config_setting_t **setting, int *idx); -typedef const char* (*HPMHOOK_post_libconfig_setting_get_string_elem) (const char* retVal___, const struct config_setting_t *setting, int idx); -typedef struct config_setting_t* (*HPMHOOK_pre_libconfig_setting_set_int_elem) (struct config_setting_t **setting, int *idx, int *value); -typedef struct config_setting_t* (*HPMHOOK_post_libconfig_setting_set_int_elem) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int value); -typedef struct config_setting_t* (*HPMHOOK_pre_libconfig_setting_set_int64_elem) (struct config_setting_t **setting, int *idx, int64 *value); -typedef struct config_setting_t* (*HPMHOOK_post_libconfig_setting_set_int64_elem) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int64 value); -typedef struct config_setting_t* (*HPMHOOK_pre_libconfig_setting_set_float_elem) (struct config_setting_t **setting, int *idx, double *value); -typedef struct config_setting_t* (*HPMHOOK_post_libconfig_setting_set_float_elem) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, double value); -typedef struct config_setting_t* (*HPMHOOK_pre_libconfig_setting_set_bool_elem) (struct config_setting_t **setting, int *idx, int *value); -typedef struct config_setting_t* (*HPMHOOK_post_libconfig_setting_set_bool_elem) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int value); -typedef struct config_setting_t* (*HPMHOOK_pre_libconfig_setting_set_string_elem) (struct config_setting_t **setting, int *idx, const char **value); -typedef struct config_setting_t* (*HPMHOOK_post_libconfig_setting_set_string_elem) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, const char *value); +typedef const char * (*HPMHOOK_pre_libconfig_setting_get_string_elem) (const struct config_setting_t **setting, int *idx); +typedef const char * (*HPMHOOK_post_libconfig_setting_get_string_elem) (const char * retVal___, const struct config_setting_t *setting, int idx); +typedef struct config_setting_t * (*HPMHOOK_pre_libconfig_setting_set_int_elem) (struct config_setting_t **setting, int *idx, int *value); +typedef struct config_setting_t * (*HPMHOOK_post_libconfig_setting_set_int_elem) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, int value); +typedef struct config_setting_t * (*HPMHOOK_pre_libconfig_setting_set_int64_elem) (struct config_setting_t **setting, int *idx, int64 *value); +typedef struct config_setting_t * (*HPMHOOK_post_libconfig_setting_set_int64_elem) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, int64 value); +typedef struct config_setting_t * (*HPMHOOK_pre_libconfig_setting_set_float_elem) (struct config_setting_t **setting, int *idx, double *value); +typedef struct config_setting_t * (*HPMHOOK_post_libconfig_setting_set_float_elem) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, double value); +typedef struct config_setting_t * (*HPMHOOK_pre_libconfig_setting_set_bool_elem) (struct config_setting_t **setting, int *idx, int *value); +typedef struct config_setting_t * (*HPMHOOK_post_libconfig_setting_set_bool_elem) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, int value); +typedef struct config_setting_t * (*HPMHOOK_pre_libconfig_setting_set_string_elem) (struct config_setting_t **setting, int *idx, const char **value); +typedef struct config_setting_t * (*HPMHOOK_post_libconfig_setting_set_string_elem) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, const char *value); typedef int (*HPMHOOK_pre_libconfig_setting_index) (const struct config_setting_t **setting); typedef int (*HPMHOOK_post_libconfig_setting_index) (int retVal___, const struct config_setting_t *setting); typedef int (*HPMHOOK_pre_libconfig_setting_length) (const struct config_setting_t **setting); typedef int (*HPMHOOK_post_libconfig_setting_length) (int retVal___, const struct config_setting_t *setting); -typedef struct config_setting_t* (*HPMHOOK_pre_libconfig_setting_get_elem) (const struct config_setting_t **setting, unsigned int *idx); -typedef struct config_setting_t* (*HPMHOOK_post_libconfig_setting_get_elem) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int idx); -typedef struct config_setting_t* (*HPMHOOK_pre_libconfig_setting_get_member) (const struct config_setting_t **setting, const char **name); -typedef struct config_setting_t* (*HPMHOOK_post_libconfig_setting_get_member) (struct config_setting_t* retVal___, const struct config_setting_t *setting, const char *name); -typedef struct config_setting_t* (*HPMHOOK_pre_libconfig_setting_add) (struct config_setting_t **parent, const char **name, int *type); -typedef struct config_setting_t* (*HPMHOOK_post_libconfig_setting_add) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int type); +typedef struct config_setting_t * (*HPMHOOK_pre_libconfig_setting_get_elem) (const struct config_setting_t **setting, unsigned int *idx); +typedef struct config_setting_t * (*HPMHOOK_post_libconfig_setting_get_elem) (struct config_setting_t * retVal___, const struct config_setting_t *setting, unsigned int idx); +typedef struct config_setting_t * (*HPMHOOK_pre_libconfig_setting_get_member) (const struct config_setting_t **setting, const char **name); +typedef struct config_setting_t * (*HPMHOOK_post_libconfig_setting_get_member) (struct config_setting_t * retVal___, const struct config_setting_t *setting, const char *name); +typedef struct config_setting_t * (*HPMHOOK_pre_libconfig_setting_add) (struct config_setting_t **parent, const char **name, int *type); +typedef struct config_setting_t * (*HPMHOOK_post_libconfig_setting_add) (struct config_setting_t * retVal___, struct config_setting_t *parent, const char *name, int type); typedef int (*HPMHOOK_pre_libconfig_setting_remove) (struct config_setting_t **parent, const char **name); typedef int (*HPMHOOK_post_libconfig_setting_remove) (int retVal___, struct config_setting_t *parent, const char *name); typedef int (*HPMHOOK_pre_libconfig_setting_remove_elem) (struct config_setting_t **parent, unsigned int *idx); typedef int (*HPMHOOK_post_libconfig_setting_remove_elem) (int retVal___, struct config_setting_t *parent, unsigned int idx); typedef void (*HPMHOOK_pre_libconfig_setting_set_hook) (struct config_setting_t **setting, void **hook); typedef void (*HPMHOOK_post_libconfig_setting_set_hook) (struct config_setting_t *setting, void *hook); -typedef struct config_setting_t* (*HPMHOOK_pre_libconfig_lookup) (const struct config_t **config, const char **filepath); -typedef struct config_setting_t* (*HPMHOOK_post_libconfig_lookup) (struct config_setting_t* retVal___, const struct config_t *config, const char *filepath); +typedef struct config_setting_t * (*HPMHOOK_pre_libconfig_lookup) (const struct config_t **config, const char **filepath); +typedef struct config_setting_t * (*HPMHOOK_post_libconfig_lookup) (struct config_setting_t * retVal___, const struct config_t *config, const char *filepath); typedef int (*HPMHOOK_pre_libconfig_lookup_int) (const struct config_t **config, const char **filepath, int **value); typedef int (*HPMHOOK_post_libconfig_lookup_int) (int retVal___, const struct config_t *config, const char *filepath, int *value); typedef int (*HPMHOOK_pre_libconfig_lookup_int64) (const struct config_t **config, const char **filepath, int64 **value); @@ -5332,8 +5332,8 @@ typedef int (*HPMHOOK_pre_login_waiting_disconnect_timer) (int *tid, int64 *tick typedef int (*HPMHOOK_post_login_waiting_disconnect_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); typedef struct DBData (*HPMHOOK_pre_login_create_online_user) (union DBKey *key, va_list args); typedef struct DBData (*HPMHOOK_post_login_create_online_user) (struct DBData retVal___, union DBKey key, va_list args); -typedef struct online_login_data* (*HPMHOOK_pre_login_add_online_user) (int *char_server, int *account_id); -typedef struct online_login_data* (*HPMHOOK_post_login_add_online_user) (struct online_login_data* retVal___, int char_server, int account_id); +typedef struct online_login_data * (*HPMHOOK_pre_login_add_online_user) (int *char_server, int *account_id); +typedef struct online_login_data * (*HPMHOOK_post_login_add_online_user) (struct online_login_data * retVal___, int char_server, int account_id); typedef void (*HPMHOOK_pre_login_remove_online_user) (int *account_id); typedef void (*HPMHOOK_post_login_remove_online_user) (int account_id); typedef int (*HPMHOOK_pre_login_online_db_setoffline) (union DBKey *key, struct DBData **data, va_list ap); @@ -5602,8 +5602,8 @@ typedef int (*HPMHOOK_pre_map_moveblock) (struct block_list **bl, int *x1, int * typedef int (*HPMHOOK_post_map_moveblock) (int retVal___, struct block_list *bl, int x1, int y1, int64 tick); typedef int (*HPMHOOK_pre_map_count_oncell) (int16 *m, int16 *x, int16 *y, int *type, int *flag); typedef int (*HPMHOOK_post_map_count_oncell) (int retVal___, int16 m, int16 x, int16 y, int type, int flag); -typedef struct skill_unit* (*HPMHOOK_pre_map_find_skill_unit_oncell) (struct block_list **target, int16 *x, int16 *y, uint16 *skill_id, struct skill_unit **out_unit, int *flag); -typedef struct skill_unit* (*HPMHOOK_post_map_find_skill_unit_oncell) (struct skill_unit* retVal___, struct block_list *target, int16 x, int16 y, uint16 skill_id, struct skill_unit *out_unit, int flag); +typedef struct skill_unit * (*HPMHOOK_pre_map_find_skill_unit_oncell) (struct block_list **target, int16 *x, int16 *y, uint16 *skill_id, struct skill_unit **out_unit, int *flag); +typedef struct skill_unit * (*HPMHOOK_post_map_find_skill_unit_oncell) (struct skill_unit * retVal___, struct block_list *target, int16 x, int16 y, uint16 skill_id, struct skill_unit *out_unit, int flag); typedef int (*HPMHOOK_pre_map_get_new_object_id) (void); typedef int (*HPMHOOK_post_map_get_new_object_id) (int retVal___); typedef int (*HPMHOOK_pre_map_search_free_cell) (struct block_list **src, int16 *m, int16 **x, int16 **y, int16 *range_x, int16 *range_y, int *flag); @@ -5628,10 +5628,10 @@ typedef void (*HPMHOOK_pre_map_delnickdb) (int *charid, const char **nick); typedef void (*HPMHOOK_post_map_delnickdb) (int charid, const char *nick); typedef void (*HPMHOOK_pre_map_reqnickdb) (struct map_session_data **sd, int *charid); typedef void (*HPMHOOK_post_map_reqnickdb) (struct map_session_data *sd, int charid); -typedef const char* (*HPMHOOK_pre_map_charid2nick) (int *charid); -typedef const char* (*HPMHOOK_post_map_charid2nick) (const char* retVal___, int charid); -typedef struct map_session_data* (*HPMHOOK_pre_map_charid2sd) (int *charid); -typedef struct map_session_data* (*HPMHOOK_post_map_charid2sd) (struct map_session_data* retVal___, int charid); +typedef const char * (*HPMHOOK_pre_map_charid2nick) (int *charid); +typedef const char * (*HPMHOOK_post_map_charid2nick) (const char * retVal___, int charid); +typedef struct map_session_data * (*HPMHOOK_pre_map_charid2sd) (int *charid); +typedef struct map_session_data * (*HPMHOOK_post_map_charid2sd) (struct map_session_data * retVal___, int charid); typedef void (*HPMHOOK_pre_map_vforeachpc) (int ( **func ) (struct map_session_data *sd, va_list args), va_list args); typedef void (*HPMHOOK_post_map_vforeachpc) (int ( *func ) (struct map_session_data *sd, va_list args), va_list args); typedef void (*HPMHOOK_pre_map_vforeachmob) (int ( **func ) (struct mob_data *md, va_list args), va_list args); @@ -5662,28 +5662,28 @@ typedef int (*HPMHOOK_pre_map_vforeachinmap) (int ( **func ) (struct block_list typedef int (*HPMHOOK_post_map_vforeachinmap) (int retVal___, int ( *func ) (struct block_list *, va_list), int16 m, int type, va_list args); typedef int (*HPMHOOK_pre_map_vforeachininstance) (int ( **func ) (struct block_list *, va_list), int16 *instance_id, int *type, va_list ap); typedef int (*HPMHOOK_post_map_vforeachininstance) (int retVal___, int ( *func ) (struct block_list *, va_list), int16 instance_id, int type, va_list ap); -typedef struct map_session_data* (*HPMHOOK_pre_map_id2sd) (int *id); -typedef struct map_session_data* (*HPMHOOK_post_map_id2sd) (struct map_session_data* retVal___, int id); -typedef struct npc_data* (*HPMHOOK_pre_map_id2nd) (int *id); -typedef struct npc_data* (*HPMHOOK_post_map_id2nd) (struct npc_data* retVal___, int id); -typedef struct mob_data* (*HPMHOOK_pre_map_id2md) (int *id); -typedef struct mob_data* (*HPMHOOK_post_map_id2md) (struct mob_data* retVal___, int id); -typedef struct flooritem_data* (*HPMHOOK_pre_map_id2fi) (int *id); -typedef struct flooritem_data* (*HPMHOOK_post_map_id2fi) (struct flooritem_data* retVal___, int id); -typedef struct chat_data* (*HPMHOOK_pre_map_id2cd) (int *id); -typedef struct chat_data* (*HPMHOOK_post_map_id2cd) (struct chat_data* retVal___, int id); -typedef struct skill_unit* (*HPMHOOK_pre_map_id2su) (int *id); -typedef struct skill_unit* (*HPMHOOK_post_map_id2su) (struct skill_unit* retVal___, int id); -typedef struct pet_data* (*HPMHOOK_pre_map_id2pd) (int *id); -typedef struct pet_data* (*HPMHOOK_post_map_id2pd) (struct pet_data* retVal___, int id); -typedef struct homun_data* (*HPMHOOK_pre_map_id2hd) (int *id); -typedef struct homun_data* (*HPMHOOK_post_map_id2hd) (struct homun_data* retVal___, int id); -typedef struct mercenary_data* (*HPMHOOK_pre_map_id2mc) (int *id); -typedef struct mercenary_data* (*HPMHOOK_post_map_id2mc) (struct mercenary_data* retVal___, int id); -typedef struct elemental_data* (*HPMHOOK_pre_map_id2ed) (int *id); -typedef struct elemental_data* (*HPMHOOK_post_map_id2ed) (struct elemental_data* retVal___, int id); -typedef struct block_list* (*HPMHOOK_pre_map_id2bl) (int *id); -typedef struct block_list* (*HPMHOOK_post_map_id2bl) (struct block_list* retVal___, int id); +typedef struct map_session_data * (*HPMHOOK_pre_map_id2sd) (int *id); +typedef struct map_session_data * (*HPMHOOK_post_map_id2sd) (struct map_session_data * retVal___, int id); +typedef struct npc_data * (*HPMHOOK_pre_map_id2nd) (int *id); +typedef struct npc_data * (*HPMHOOK_post_map_id2nd) (struct npc_data * retVal___, int id); +typedef struct mob_data * (*HPMHOOK_pre_map_id2md) (int *id); +typedef struct mob_data * (*HPMHOOK_post_map_id2md) (struct mob_data * retVal___, int id); +typedef struct flooritem_data * (*HPMHOOK_pre_map_id2fi) (int *id); +typedef struct flooritem_data * (*HPMHOOK_post_map_id2fi) (struct flooritem_data * retVal___, int id); +typedef struct chat_data * (*HPMHOOK_pre_map_id2cd) (int *id); +typedef struct chat_data * (*HPMHOOK_post_map_id2cd) (struct chat_data * retVal___, int id); +typedef struct skill_unit * (*HPMHOOK_pre_map_id2su) (int *id); +typedef struct skill_unit * (*HPMHOOK_post_map_id2su) (struct skill_unit * retVal___, int id); +typedef struct pet_data * (*HPMHOOK_pre_map_id2pd) (int *id); +typedef struct pet_data * (*HPMHOOK_post_map_id2pd) (struct pet_data * retVal___, int id); +typedef struct homun_data * (*HPMHOOK_pre_map_id2hd) (int *id); +typedef struct homun_data * (*HPMHOOK_post_map_id2hd) (struct homun_data * retVal___, int id); +typedef struct mercenary_data * (*HPMHOOK_pre_map_id2mc) (int *id); +typedef struct mercenary_data * (*HPMHOOK_post_map_id2mc) (struct mercenary_data * retVal___, int id); +typedef struct elemental_data * (*HPMHOOK_pre_map_id2ed) (int *id); +typedef struct elemental_data * (*HPMHOOK_post_map_id2ed) (struct elemental_data * retVal___, int id); +typedef struct block_list * (*HPMHOOK_pre_map_id2bl) (int *id); +typedef struct block_list * (*HPMHOOK_post_map_id2bl) (struct block_list * retVal___, int id); typedef bool (*HPMHOOK_pre_map_blid_exists) (int *id); typedef bool (*HPMHOOK_post_map_blid_exists) (bool retVal___, int id); typedef int16 (*HPMHOOK_pre_map_mapindex2mapid) (unsigned short *map_index); @@ -5694,12 +5694,12 @@ typedef void (*HPMHOOK_pre_map_addiddb) (struct block_list **bl); typedef void (*HPMHOOK_post_map_addiddb) (struct block_list *bl); typedef void (*HPMHOOK_pre_map_deliddb) (struct block_list **bl); typedef void (*HPMHOOK_post_map_deliddb) (struct block_list *bl); -typedef struct map_session_data* (*HPMHOOK_pre_map_nick2sd) (const char **nick, bool *allow_partial); -typedef struct map_session_data* (*HPMHOOK_post_map_nick2sd) (struct map_session_data* retVal___, const char *nick, bool allow_partial); -typedef struct mob_data* (*HPMHOOK_pre_map_getmob_boss) (int16 *m); -typedef struct mob_data* (*HPMHOOK_post_map_getmob_boss) (struct mob_data* retVal___, int16 m); -typedef struct mob_data* (*HPMHOOK_pre_map_id2boss) (int *id); -typedef struct mob_data* (*HPMHOOK_post_map_id2boss) (struct mob_data* retVal___, int id); +typedef struct map_session_data * (*HPMHOOK_pre_map_nick2sd) (const char **nick, bool *allow_partial); +typedef struct map_session_data * (*HPMHOOK_post_map_nick2sd) (struct map_session_data * retVal___, const char *nick, bool allow_partial); +typedef struct mob_data * (*HPMHOOK_pre_map_getmob_boss) (int16 *m); +typedef struct mob_data * (*HPMHOOK_post_map_getmob_boss) (struct mob_data * retVal___, int16 m); +typedef struct mob_data * (*HPMHOOK_pre_map_id2boss) (int *id); +typedef struct mob_data * (*HPMHOOK_post_map_id2boss) (struct mob_data * retVal___, int id); typedef uint32 (*HPMHOOK_pre_map_race_id2mask) (int *race); typedef uint32 (*HPMHOOK_post_map_race_id2mask) (uint32 retVal___, int race); typedef void (*HPMHOOK_pre_map_reloadnpc) (bool *clear); @@ -5834,8 +5834,8 @@ typedef bool (*HPMHOOK_pre_map_add_questinfo) (int *m, struct npc_data **nd); typedef bool (*HPMHOOK_post_map_add_questinfo) (bool retVal___, int m, struct npc_data *nd); typedef bool (*HPMHOOK_pre_map_remove_questinfo) (int *m, struct npc_data **nd); typedef bool (*HPMHOOK_post_map_remove_questinfo) (bool retVal___, int m, struct npc_data *nd); -typedef struct map_zone_data* (*HPMHOOK_pre_map_merge_zone) (struct map_zone_data **main, struct map_zone_data **other); -typedef struct map_zone_data* (*HPMHOOK_post_map_merge_zone) (struct map_zone_data* retVal___, struct map_zone_data *main, struct map_zone_data *other); +typedef struct map_zone_data * (*HPMHOOK_pre_map_merge_zone) (struct map_zone_data **main, struct map_zone_data **other); +typedef struct map_zone_data * (*HPMHOOK_post_map_merge_zone) (struct map_zone_data * retVal___, struct map_zone_data *main, struct map_zone_data *other); typedef void (*HPMHOOK_pre_map_zone_clear_single) (struct map_zone_data **zone); typedef void (*HPMHOOK_post_map_zone_clear_single) (struct map_zone_data *zone); typedef void (*HPMHOOK_pre_map_lock_check) (const char **file, const char **func, int *line, int *lock_count); @@ -6126,14 +6126,14 @@ typedef int (*HPMHOOK_pre_mapif_parse_LoadGuildStorage) (int *fd); typedef int (*HPMHOOK_post_mapif_parse_LoadGuildStorage) (int retVal___, int fd); typedef int (*HPMHOOK_pre_mapif_parse_SaveGuildStorage) (int *fd); typedef int (*HPMHOOK_post_mapif_parse_SaveGuildStorage) (int retVal___, int fd); -typedef int (*HPMHOOK_pre_mapif_account_storage_load) (int *fd, int *account_id); -typedef int (*HPMHOOK_post_mapif_account_storage_load) (int retVal___, int fd, int account_id); +typedef int (*HPMHOOK_pre_mapif_account_storage_load) (int *fd, int *account_id, int *storage_id, int *storage_size); +typedef int (*HPMHOOK_post_mapif_account_storage_load) (int retVal___, int fd, int account_id, int storage_id, int storage_size); typedef int (*HPMHOOK_pre_mapif_pAccountStorageLoad) (int *fd); typedef int (*HPMHOOK_post_mapif_pAccountStorageLoad) (int retVal___, int fd); typedef int (*HPMHOOK_pre_mapif_pAccountStorageSave) (int *fd); typedef int (*HPMHOOK_post_mapif_pAccountStorageSave) (int retVal___, int fd); -typedef void (*HPMHOOK_pre_mapif_sAccountStorageSaveAck) (int *fd, int *account_id, bool *save); -typedef void (*HPMHOOK_post_mapif_sAccountStorageSaveAck) (int fd, int account_id, bool save); +typedef void (*HPMHOOK_pre_mapif_sAccountStorageSaveAck) (int *fd, int *account_id, int *storage_id, bool *save); +typedef void (*HPMHOOK_post_mapif_sAccountStorageSaveAck) (int fd, int account_id, int storage_id, bool save); typedef int (*HPMHOOK_pre_mapif_itembound_ack) (int *fd, int *aid, int *guild_id); typedef int (*HPMHOOK_post_mapif_itembound_ack) (int retVal___, int fd, int aid, int guild_id); typedef void (*HPMHOOK_pre_mapif_parse_ItemBoundRetrieve) (int *fd); @@ -6182,38 +6182,38 @@ typedef int (*HPMHOOK_pre_mapindex_addmap) (int *index, const char **name); typedef int (*HPMHOOK_post_mapindex_addmap) (int retVal___, int index, const char *name); typedef void (*HPMHOOK_pre_mapindex_removemap) (int *index); typedef void (*HPMHOOK_post_mapindex_removemap) (int index); -typedef const char* (*HPMHOOK_pre_mapindex_getmapname) (const char **string, char **output); -typedef const char* (*HPMHOOK_post_mapindex_getmapname) (const char* retVal___, const char *string, char *output); -typedef const char* (*HPMHOOK_pre_mapindex_getmapname_ext) (const char **string, char **output); -typedef const char* (*HPMHOOK_post_mapindex_getmapname_ext) (const char* retVal___, const char *string, char *output); +typedef const char * (*HPMHOOK_pre_mapindex_getmapname) (const char **string, char **output); +typedef const char * (*HPMHOOK_post_mapindex_getmapname) (const char * retVal___, const char *string, char *output); +typedef const char * (*HPMHOOK_pre_mapindex_getmapname_ext) (const char **string, char **output); +typedef const char * (*HPMHOOK_post_mapindex_getmapname_ext) (const char * retVal___, const char *string, char *output); typedef unsigned short (*HPMHOOK_pre_mapindex_name2id) (const char **p1); typedef unsigned short (*HPMHOOK_post_mapindex_name2id) (unsigned short retVal___, const char *p1); -typedef const char* (*HPMHOOK_pre_mapindex_id2name) (uint16 *id, const char **file, int *line, const char **func); -typedef const char* (*HPMHOOK_post_mapindex_id2name) (const char* retVal___, uint16 id, const char *file, int line, const char *func); +typedef const char * (*HPMHOOK_pre_mapindex_id2name) (uint16 *id, const char **file, int *line, const char **func); +typedef const char * (*HPMHOOK_post_mapindex_id2name) (const char * retVal___, uint16 id, const char *file, int line, const char *func); typedef bool (*HPMHOOK_pre_mapindex_check_default) (void); typedef bool (*HPMHOOK_post_mapindex_check_default) (bool retVal___); #endif // COMMON_MAPINDEX_H #ifdef MAP_MAP_H /* mapit */ -typedef struct s_mapiterator* (*HPMHOOK_pre_mapit_alloc) (enum e_mapitflags *flags, enum bl_type *types); -typedef struct s_mapiterator* (*HPMHOOK_post_mapit_alloc) (struct s_mapiterator* retVal___, enum e_mapitflags flags, enum bl_type types); +typedef struct s_mapiterator * (*HPMHOOK_pre_mapit_alloc) (enum e_mapitflags *flags, enum bl_type *types); +typedef struct s_mapiterator * (*HPMHOOK_post_mapit_alloc) (struct s_mapiterator * retVal___, enum e_mapitflags flags, enum bl_type types); typedef void (*HPMHOOK_pre_mapit_free) (struct s_mapiterator **iter); typedef void (*HPMHOOK_post_mapit_free) (struct s_mapiterator *iter); -typedef struct block_list* (*HPMHOOK_pre_mapit_first) (struct s_mapiterator **iter); -typedef struct block_list* (*HPMHOOK_post_mapit_first) (struct block_list* retVal___, struct s_mapiterator *iter); -typedef struct block_list* (*HPMHOOK_pre_mapit_last) (struct s_mapiterator **iter); -typedef struct block_list* (*HPMHOOK_post_mapit_last) (struct block_list* retVal___, struct s_mapiterator *iter); -typedef struct block_list* (*HPMHOOK_pre_mapit_next) (struct s_mapiterator **iter); -typedef struct block_list* (*HPMHOOK_post_mapit_next) (struct block_list* retVal___, struct s_mapiterator *iter); -typedef struct block_list* (*HPMHOOK_pre_mapit_prev) (struct s_mapiterator **iter); -typedef struct block_list* (*HPMHOOK_post_mapit_prev) (struct block_list* retVal___, struct s_mapiterator *iter); +typedef struct block_list * (*HPMHOOK_pre_mapit_first) (struct s_mapiterator **iter); +typedef struct block_list * (*HPMHOOK_post_mapit_first) (struct block_list * retVal___, struct s_mapiterator *iter); +typedef struct block_list * (*HPMHOOK_pre_mapit_last) (struct s_mapiterator **iter); +typedef struct block_list * (*HPMHOOK_post_mapit_last) (struct block_list * retVal___, struct s_mapiterator *iter); +typedef struct block_list * (*HPMHOOK_pre_mapit_next) (struct s_mapiterator **iter); +typedef struct block_list * (*HPMHOOK_post_mapit_next) (struct block_list * retVal___, struct s_mapiterator *iter); +typedef struct block_list * (*HPMHOOK_pre_mapit_prev) (struct s_mapiterator **iter); +typedef struct block_list * (*HPMHOOK_post_mapit_prev) (struct block_list * retVal___, struct s_mapiterator *iter); typedef bool (*HPMHOOK_pre_mapit_exists) (struct s_mapiterator **iter); typedef bool (*HPMHOOK_post_mapit_exists) (bool retVal___, struct s_mapiterator *iter); #endif // MAP_MAP_H #ifdef MAP_MAPREG_H /* mapreg */ typedef int (*HPMHOOK_pre_mapreg_readreg) (int64 *uid); typedef int (*HPMHOOK_post_mapreg_readreg) (int retVal___, int64 uid); -typedef char* (*HPMHOOK_pre_mapreg_readregstr) (int64 *uid); -typedef char* (*HPMHOOK_post_mapreg_readregstr) (char* retVal___, int64 uid); +typedef char * (*HPMHOOK_pre_mapreg_readregstr) (int64 *uid); +typedef char * (*HPMHOOK_post_mapreg_readregstr) (char * retVal___, int64 uid); typedef bool (*HPMHOOK_pre_mapreg_set_num_db) (int64 *uid, const char **name, unsigned int *index, int *value); typedef bool (*HPMHOOK_post_mapreg_set_num_db) (bool retVal___, int64 uid, const char *name, unsigned int index, int value); typedef bool (*HPMHOOK_pre_mapreg_delete_num_db) (int64 *uid, const char **name, unsigned int *index); @@ -6264,8 +6264,8 @@ typedef void (*HPMHOOK_pre_mercenary_init) (bool *minimal); typedef void (*HPMHOOK_post_mercenary_init) (bool minimal); typedef bool (*HPMHOOK_pre_mercenary_class) (int *class_); typedef bool (*HPMHOOK_post_mercenary_class) (bool retVal___, int class_); -typedef struct view_data* (*HPMHOOK_pre_mercenary_get_viewdata) (int *class_); -typedef struct view_data* (*HPMHOOK_post_mercenary_get_viewdata) (struct view_data* retVal___, int class_); +typedef struct view_data * (*HPMHOOK_pre_mercenary_get_viewdata) (int *class_); +typedef struct view_data * (*HPMHOOK_post_mercenary_get_viewdata) (struct view_data * retVal___, int class_); typedef int (*HPMHOOK_pre_mercenary_create) (struct map_session_data **sd, int *class_, unsigned int *lifetime); typedef int (*HPMHOOK_post_mercenary_create) (int retVal___, struct map_session_data *sd, int class_, unsigned int lifetime); typedef int (*HPMHOOK_pre_mercenary_data_received) (const struct s_mercenary **merc, bool *flag); @@ -6320,10 +6320,10 @@ typedef void (*HPMHOOK_pre_mob_reload) (void); typedef void (*HPMHOOK_post_mob_reload) (void); typedef int (*HPMHOOK_pre_mob_reload_sub_mob) (struct mob_data **md, va_list args); typedef int (*HPMHOOK_post_mob_reload_sub_mob) (int retVal___, struct mob_data *md, va_list args); -typedef struct mob_db* (*HPMHOOK_pre_mob_db) (int *index); -typedef struct mob_db* (*HPMHOOK_post_mob_db) (struct mob_db* retVal___, int index); -typedef struct mob_chat* (*HPMHOOK_pre_mob_chat) (short *id); -typedef struct mob_chat* (*HPMHOOK_post_mob_chat) (struct mob_chat* retVal___, short id); +typedef struct mob_db * (*HPMHOOK_pre_mob_db) (int *index); +typedef struct mob_db * (*HPMHOOK_post_mob_db) (struct mob_db * retVal___, int index); +typedef struct mob_chat * (*HPMHOOK_pre_mob_chat) (short *id); +typedef struct mob_chat * (*HPMHOOK_post_mob_chat) (struct mob_chat * retVal___, short id); typedef int (*HPMHOOK_pre_mob_makedummymobdb) (int *p1); typedef int (*HPMHOOK_post_mob_makedummymobdb) (int retVal___, int p1); typedef int (*HPMHOOK_pre_mob_spawn_guardian_sub) (int *tid, int64 *tick, int *id, intptr_t *data); @@ -6346,22 +6346,22 @@ typedef int (*HPMHOOK_pre_mob_db_searchname_array) (struct mob_db ***data, int * typedef int (*HPMHOOK_post_mob_db_searchname_array) (int retVal___, struct mob_db **data, int size, const char *str, int flag); typedef int (*HPMHOOK_pre_mob_db_checkid) (const int *id); typedef int (*HPMHOOK_post_mob_db_checkid) (int retVal___, const int id); -typedef struct view_data* (*HPMHOOK_pre_mob_get_viewdata) (int *class_); -typedef struct view_data* (*HPMHOOK_post_mob_get_viewdata) (struct view_data* retVal___, int class_); +typedef struct view_data * (*HPMHOOK_pre_mob_get_viewdata) (int *class_); +typedef struct view_data * (*HPMHOOK_post_mob_get_viewdata) (struct view_data * retVal___, int class_); typedef void (*HPMHOOK_pre_mob_set_dynamic_viewdata) (struct mob_data **md); typedef void (*HPMHOOK_post_mob_set_dynamic_viewdata) (struct mob_data *md); typedef void (*HPMHOOK_pre_mob_free_dynamic_viewdata) (struct mob_data **md); typedef void (*HPMHOOK_post_mob_free_dynamic_viewdata) (struct mob_data *md); typedef int (*HPMHOOK_pre_mob_parse_dataset) (struct spawn_data **data); typedef int (*HPMHOOK_post_mob_parse_dataset) (int retVal___, struct spawn_data *data); -typedef struct mob_data* (*HPMHOOK_pre_mob_spawn_dataset) (struct spawn_data **data, int *npc_id); -typedef struct mob_data* (*HPMHOOK_post_mob_spawn_dataset) (struct mob_data* retVal___, struct spawn_data *data, int npc_id); +typedef struct mob_data * (*HPMHOOK_pre_mob_spawn_dataset) (struct spawn_data **data, int *npc_id); +typedef struct mob_data * (*HPMHOOK_post_mob_spawn_dataset) (struct mob_data * retVal___, struct spawn_data *data, int npc_id); typedef int (*HPMHOOK_pre_mob_get_random_id) (enum mob_groups *type, int *flag, int *lv); typedef int (*HPMHOOK_post_mob_get_random_id) (int retVal___, enum mob_groups type, int flag, int lv); typedef bool (*HPMHOOK_pre_mob_ksprotected) (struct block_list **src, struct block_list **target); typedef bool (*HPMHOOK_post_mob_ksprotected) (bool retVal___, struct block_list *src, struct block_list *target); -typedef struct mob_data* (*HPMHOOK_pre_mob_once_spawn_sub) (struct block_list **bl, int16 *m, int16 *x, int16 *y, const char **mobname, int *class_, const char **event, unsigned int *size, unsigned int *ai, int *npc_id); -typedef struct mob_data* (*HPMHOOK_post_mob_once_spawn_sub) (struct mob_data* retVal___, struct block_list *bl, int16 m, int16 x, int16 y, const char *mobname, int class_, const char *event, unsigned int size, unsigned int ai, int npc_id); +typedef struct mob_data * (*HPMHOOK_pre_mob_once_spawn_sub) (struct block_list **bl, int16 *m, int16 *x, int16 *y, const char **mobname, int *class_, const char **event, unsigned int *size, unsigned int *ai, int *npc_id); +typedef struct mob_data * (*HPMHOOK_post_mob_once_spawn_sub) (struct mob_data * retVal___, struct block_list *bl, int16 m, int16 x, int16 y, const char *mobname, int class_, const char *event, unsigned int size, unsigned int ai, int npc_id); typedef int (*HPMHOOK_pre_mob_once_spawn) (struct map_session_data **sd, int16 *m, int16 *x, int16 *y, const char **mobname, int *class_, int *amount, const char **event, unsigned int *size, unsigned int *ai); typedef int (*HPMHOOK_post_mob_once_spawn) (int retVal___, struct map_session_data *sd, int16 m, int16 x, int16 y, const char *mobname, int class_, int amount, const char *event, unsigned int size, unsigned int ai); typedef int (*HPMHOOK_pre_mob_once_spawn_area) (struct map_session_data **sd, int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, const char **mobname, int *class_, int *amount, const char **event, unsigned int *size, unsigned int *ai); @@ -6420,10 +6420,10 @@ typedef int (*HPMHOOK_pre_mob_ai_hard) (int *tid, int64 *tick, int *id, intptr_t typedef int (*HPMHOOK_post_mob_ai_hard) (int retVal___, int tid, int64 tick, int id, intptr_t data); typedef void (*HPMHOOK_pre_mob_setdropitem_options) (struct item **item, struct optdrop_group **options); typedef void (*HPMHOOK_post_mob_setdropitem_options) (struct item *item, struct optdrop_group *options); -typedef struct item_drop* (*HPMHOOK_pre_mob_setdropitem) (int *nameid, struct optdrop_group **options, int *qty, struct item_data **data); -typedef struct item_drop* (*HPMHOOK_post_mob_setdropitem) (struct item_drop* retVal___, int nameid, struct optdrop_group *options, int qty, struct item_data *data); -typedef struct item_drop* (*HPMHOOK_pre_mob_setlootitem) (struct item **item); -typedef struct item_drop* (*HPMHOOK_post_mob_setlootitem) (struct item_drop* retVal___, struct item *item); +typedef struct item_drop * (*HPMHOOK_pre_mob_setdropitem) (int *nameid, struct optdrop_group **options, int *qty, struct item_data **data); +typedef struct item_drop * (*HPMHOOK_post_mob_setdropitem) (struct item_drop * retVal___, int nameid, struct optdrop_group *options, int qty, struct item_data *data); +typedef struct item_drop * (*HPMHOOK_pre_mob_setlootitem) (struct item **item); +typedef struct item_drop * (*HPMHOOK_post_mob_setlootitem) (struct item_drop * retVal___, struct item *item); typedef int (*HPMHOOK_pre_mob_delay_item_drop) (int *tid, int64 *tick, int *id, intptr_t *data); typedef int (*HPMHOOK_post_mob_delay_item_drop) (int retVal___, int tid, int64 tick, int id, intptr_t data); typedef void (*HPMHOOK_pre_mob_item_drop) (struct mob_data **md, struct item_drop_list **dlist, struct item_drop **ditem, int *loot, int *drop_rate, unsigned short *flag); @@ -6464,14 +6464,14 @@ typedef int (*HPMHOOK_pre_mob_summonslave) (struct mob_data **md2, int **value, typedef int (*HPMHOOK_post_mob_summonslave) (int retVal___, struct mob_data *md2, int *value, int amount, uint16 skill_id); typedef int (*HPMHOOK_pre_mob_getfriendhprate_sub) (struct block_list **bl, va_list ap); typedef int (*HPMHOOK_post_mob_getfriendhprate_sub) (int retVal___, struct block_list *bl, va_list ap); -typedef struct block_list* (*HPMHOOK_pre_mob_getfriendhprate) (struct mob_data **md, int *min_rate, int *max_rate); -typedef struct block_list* (*HPMHOOK_post_mob_getfriendhprate) (struct block_list* retVal___, struct mob_data *md, int min_rate, int max_rate); -typedef struct block_list* (*HPMHOOK_pre_mob_getmasterhpltmaxrate) (struct mob_data **md, int *rate); -typedef struct block_list* (*HPMHOOK_post_mob_getmasterhpltmaxrate) (struct block_list* retVal___, struct mob_data *md, int rate); +typedef struct block_list * (*HPMHOOK_pre_mob_getfriendhprate) (struct mob_data **md, int *min_rate, int *max_rate); +typedef struct block_list * (*HPMHOOK_post_mob_getfriendhprate) (struct block_list * retVal___, struct mob_data *md, int min_rate, int max_rate); +typedef struct block_list * (*HPMHOOK_pre_mob_getmasterhpltmaxrate) (struct mob_data **md, int *rate); +typedef struct block_list * (*HPMHOOK_post_mob_getmasterhpltmaxrate) (struct block_list * retVal___, struct mob_data *md, int rate); typedef int (*HPMHOOK_pre_mob_getfriendstatus_sub) (struct block_list **bl, va_list ap); typedef int (*HPMHOOK_post_mob_getfriendstatus_sub) (int retVal___, struct block_list *bl, va_list ap); -typedef struct block_list* (*HPMHOOK_pre_mob_getfriendstatus) (struct mob_data **md, int *cond1, int *cond2); -typedef struct block_list* (*HPMHOOK_post_mob_getfriendstatus) (struct block_list* retVal___, struct mob_data *md, int cond1, int cond2); +typedef struct block_list * (*HPMHOOK_pre_mob_getfriendstatus) (struct mob_data **md, int *cond1, int *cond2); +typedef struct block_list * (*HPMHOOK_post_mob_getfriendstatus) (struct block_list * retVal___, struct mob_data *md, int cond1, int cond2); typedef int (*HPMHOOK_pre_mob_use_skill) (struct mob_data **md, int64 *tick, int *event); typedef int (*HPMHOOK_post_mob_use_skill) (int retVal___, struct mob_data *md, int64 tick, int event); typedef int (*HPMHOOK_pre_mob_use_skill_event) (struct mob_data **md, struct block_list **src, int64 *tick, int *flag); @@ -6512,8 +6512,8 @@ typedef void (*HPMHOOK_pre_mob_read_db_mvpdrops_sub) (struct mob_db **entry, str typedef void (*HPMHOOK_post_mob_read_db_mvpdrops_sub) (struct mob_db *entry, struct config_setting_t *t); typedef uint32 (*HPMHOOK_pre_mob_read_db_mode_sub) (struct mob_db **entry, struct config_setting_t **t); typedef uint32 (*HPMHOOK_post_mob_read_db_mode_sub) (uint32 retVal___, struct mob_db *entry, struct config_setting_t *t); -typedef struct optdrop_group* (*HPMHOOK_pre_mob_read_db_drops_option) (struct mob_db **entry, const char **item_name, struct config_setting_t **drop, int **drop_rate); -typedef struct optdrop_group* (*HPMHOOK_post_mob_read_db_drops_option) (struct optdrop_group* retVal___, struct mob_db *entry, const char *item_name, struct config_setting_t *drop, int *drop_rate); +typedef struct optdrop_group * (*HPMHOOK_pre_mob_read_db_drops_option) (struct mob_db **entry, const char **item_name, struct config_setting_t **drop, int **drop_rate); +typedef struct optdrop_group * (*HPMHOOK_post_mob_read_db_drops_option) (struct optdrop_group * retVal___, struct mob_db *entry, const char *item_name, struct config_setting_t *drop, int *drop_rate); typedef void (*HPMHOOK_pre_mob_read_db_stats_sub) (struct mob_db **entry, struct config_setting_t **t); typedef void (*HPMHOOK_post_mob_read_db_stats_sub) (struct mob_db *entry, struct config_setting_t *t); typedef void (*HPMHOOK_pre_mob_read_db_viewdata_sub) (struct mob_db **entry, struct config_setting_t **t); @@ -6536,8 +6536,8 @@ typedef void (*HPMHOOK_pre_mob_load) (bool *minimal); typedef void (*HPMHOOK_post_mob_load) (bool minimal); typedef void (*HPMHOOK_pre_mob_clear_spawninfo) (void); typedef void (*HPMHOOK_post_mob_clear_spawninfo) (void); -typedef struct item_drop_ratio* (*HPMHOOK_pre_mob_get_item_drop_ratio) (int *nameid); -typedef struct item_drop_ratio* (*HPMHOOK_post_mob_get_item_drop_ratio) (struct item_drop_ratio* retVal___, int nameid); +typedef struct item_drop_ratio * (*HPMHOOK_pre_mob_get_item_drop_ratio) (int *nameid); +typedef struct item_drop_ratio * (*HPMHOOK_post_mob_get_item_drop_ratio) (struct item_drop_ratio * retVal___, int nameid); typedef void (*HPMHOOK_pre_mob_set_item_drop_ratio) (int *nameid, struct item_drop_ratio **ratio); typedef void (*HPMHOOK_post_mob_set_item_drop_ratio) (int nameid, struct item_drop_ratio *ratio); typedef int (*HPMHOOK_pre_mob_final_ratio_sub) (union DBKey *key, struct DBData **data, va_list ap); @@ -6562,8 +6562,8 @@ typedef bool (*HPMHOOK_pre_mob_read_group_db_libconfig_sub_group) (struct config typedef bool (*HPMHOOK_post_mob_read_group_db_libconfig_sub_group) (bool retVal___, struct config_setting_t *it, enum mob_groups group_id, const char *source); #endif // MAP_MOB_H #ifdef COMMON_MUTEX_H /* mutex */ -typedef struct mutex_data* (*HPMHOOK_pre_mutex_create) (void); -typedef struct mutex_data* (*HPMHOOK_post_mutex_create) (struct mutex_data* retVal___); +typedef struct mutex_data * (*HPMHOOK_pre_mutex_create) (void); +typedef struct mutex_data * (*HPMHOOK_post_mutex_create) (struct mutex_data * retVal___); typedef void (*HPMHOOK_pre_mutex_destroy) (struct mutex_data **m); typedef void (*HPMHOOK_post_mutex_destroy) (struct mutex_data *m); typedef void (*HPMHOOK_pre_mutex_lock) (struct mutex_data **m); @@ -6572,8 +6572,8 @@ typedef bool (*HPMHOOK_pre_mutex_trylock) (struct mutex_data **m); typedef bool (*HPMHOOK_post_mutex_trylock) (bool retVal___, struct mutex_data *m); typedef void (*HPMHOOK_pre_mutex_unlock) (struct mutex_data **m); typedef void (*HPMHOOK_post_mutex_unlock) (struct mutex_data *m); -typedef struct cond_data* (*HPMHOOK_pre_mutex_cond_create) (void); -typedef struct cond_data* (*HPMHOOK_post_mutex_cond_create) (struct cond_data* retVal___); +typedef struct cond_data * (*HPMHOOK_pre_mutex_cond_create) (void); +typedef struct cond_data * (*HPMHOOK_post_mutex_cond_create) (struct cond_data * retVal___); typedef void (*HPMHOOK_pre_mutex_cond_destroy) (struct cond_data **c); typedef void (*HPMHOOK_post_mutex_cond_destroy) (struct cond_data *c); typedef void (*HPMHOOK_pre_mutex_cond_wait) (struct cond_data **c, struct mutex_data **m, sysint *timeout_ticks); @@ -6590,16 +6590,16 @@ typedef void (*HPMHOOK_pre_npc_chat_finalize) (struct npc_data **nd); typedef void (*HPMHOOK_post_npc_chat_finalize) (struct npc_data *nd); typedef void (*HPMHOOK_pre_npc_chat_def_pattern) (struct npc_data **nd, int *setid, const char **pattern, const char **label); typedef void (*HPMHOOK_post_npc_chat_def_pattern) (struct npc_data *nd, int setid, const char *pattern, const char *label); -typedef struct pcrematch_entry* (*HPMHOOK_pre_npc_chat_create_pcrematch_entry) (struct pcrematch_set **set); -typedef struct pcrematch_entry* (*HPMHOOK_post_npc_chat_create_pcrematch_entry) (struct pcrematch_entry* retVal___, struct pcrematch_set *set); +typedef struct pcrematch_entry * (*HPMHOOK_pre_npc_chat_create_pcrematch_entry) (struct pcrematch_set **set); +typedef struct pcrematch_entry * (*HPMHOOK_post_npc_chat_create_pcrematch_entry) (struct pcrematch_entry * retVal___, struct pcrematch_set *set); typedef void (*HPMHOOK_pre_npc_chat_delete_pcreset) (struct npc_data **nd, int *setid); typedef void (*HPMHOOK_post_npc_chat_delete_pcreset) (struct npc_data *nd, int setid); typedef void (*HPMHOOK_pre_npc_chat_deactivate_pcreset) (struct npc_data **nd, int *setid); typedef void (*HPMHOOK_post_npc_chat_deactivate_pcreset) (struct npc_data *nd, int setid); typedef void (*HPMHOOK_pre_npc_chat_activate_pcreset) (struct npc_data **nd, int *setid); typedef void (*HPMHOOK_post_npc_chat_activate_pcreset) (struct npc_data *nd, int setid); -typedef struct pcrematch_set* (*HPMHOOK_pre_npc_chat_lookup_pcreset) (struct npc_data **nd, int *setid); -typedef struct pcrematch_set* (*HPMHOOK_post_npc_chat_lookup_pcreset) (struct pcrematch_set* retVal___, struct npc_data *nd, int setid); +typedef struct pcrematch_set * (*HPMHOOK_pre_npc_chat_lookup_pcreset) (struct npc_data **nd, int *setid); +typedef struct pcrematch_set * (*HPMHOOK_post_npc_chat_lookup_pcreset) (struct pcrematch_set * retVal___, struct npc_data *nd, int setid); typedef void (*HPMHOOK_pre_npc_chat_finalize_pcrematch_entry) (struct pcrematch_entry **e); typedef void (*HPMHOOK_post_npc_chat_finalize_pcrematch_entry) (struct pcrematch_entry *e); #endif // MAP_NPC_H @@ -6610,8 +6610,8 @@ typedef int (*HPMHOOK_pre_npc_final) (void); typedef int (*HPMHOOK_post_npc_final) (int retVal___); typedef int (*HPMHOOK_pre_npc_get_new_npc_id) (void); typedef int (*HPMHOOK_post_npc_get_new_npc_id) (int retVal___); -typedef struct view_data* (*HPMHOOK_pre_npc_get_viewdata) (int *class_); -typedef struct view_data* (*HPMHOOK_post_npc_get_viewdata) (struct view_data* retVal___, int class_); +typedef struct view_data * (*HPMHOOK_pre_npc_get_viewdata) (int *class_); +typedef struct view_data * (*HPMHOOK_post_npc_get_viewdata) (struct view_data * retVal___, int class_); typedef int (*HPMHOOK_pre_npc_isnear_sub) (struct block_list **bl, va_list args); typedef int (*HPMHOOK_post_npc_isnear_sub) (int retVal___, struct block_list *bl, va_list args); typedef bool (*HPMHOOK_pre_npc_isnear) (struct block_list **bl); @@ -6626,8 +6626,8 @@ typedef int (*HPMHOOK_pre_npc_enable_sub) (struct block_list **bl, va_list ap); typedef int (*HPMHOOK_post_npc_enable_sub) (int retVal___, struct block_list *bl, va_list ap); typedef int (*HPMHOOK_pre_npc_enable) (const char **name, int *flag); typedef int (*HPMHOOK_post_npc_enable) (int retVal___, const char *name, int flag); -typedef struct npc_data* (*HPMHOOK_pre_npc_name2id) (const char **name); -typedef struct npc_data* (*HPMHOOK_post_npc_name2id) (struct npc_data* retVal___, const char *name); +typedef struct npc_data * (*HPMHOOK_pre_npc_name2id) (const char **name); +typedef struct npc_data * (*HPMHOOK_post_npc_name2id) (struct npc_data * retVal___, const char *name); typedef int (*HPMHOOK_pre_npc_event_dequeue) (struct map_session_data **sd); typedef int (*HPMHOOK_post_npc_event_dequeue) (int retVal___, struct map_session_data *sd); typedef struct DBData (*HPMHOOK_pre_npc_event_export_create) (union DBKey *key, va_list args); @@ -6678,8 +6678,8 @@ typedef int (*HPMHOOK_pre_npc_touch_areanpc2) (struct mob_data **md); typedef int (*HPMHOOK_post_npc_touch_areanpc2) (int retVal___, struct mob_data *md); typedef int (*HPMHOOK_pre_npc_check_areanpc) (int *flag, int16 *m, int16 *x, int16 *y, int16 *range); typedef int (*HPMHOOK_post_npc_check_areanpc) (int retVal___, int flag, int16 m, int16 x, int16 y, int16 range); -typedef struct npc_data* (*HPMHOOK_pre_npc_checknear) (struct map_session_data **sd, struct block_list **bl); -typedef struct npc_data* (*HPMHOOK_post_npc_checknear) (struct npc_data* retVal___, struct map_session_data *sd, struct block_list *bl); +typedef struct npc_data * (*HPMHOOK_pre_npc_checknear) (struct map_session_data **sd, struct block_list **bl); +typedef struct npc_data * (*HPMHOOK_post_npc_checknear) (struct npc_data * retVal___, struct map_session_data *sd, struct block_list *bl); typedef int (*HPMHOOK_pre_npc_globalmessage) (const char **name, const char **mes); typedef int (*HPMHOOK_post_npc_globalmessage) (int retVal___, const char *name, const char *mes); typedef void (*HPMHOOK_pre_npc_run_tomb) (struct map_session_data **sd, struct npc_data **nd); @@ -6722,8 +6722,8 @@ typedef void (*HPMHOOK_pre_npc_addsrcfile) (const char **name); typedef void (*HPMHOOK_post_npc_addsrcfile) (const char *name); typedef void (*HPMHOOK_pre_npc_delsrcfile) (const char **name); typedef void (*HPMHOOK_post_npc_delsrcfile) (const char *name); -typedef const char* (*HPMHOOK_pre_npc_retainpathreference) (const char **filepath); -typedef const char* (*HPMHOOK_post_npc_retainpathreference) (const char* retVal___, const char *filepath); +typedef const char * (*HPMHOOK_pre_npc_retainpathreference) (const char **filepath); +typedef const char * (*HPMHOOK_post_npc_retainpathreference) (const char * retVal___, const char *filepath); typedef void (*HPMHOOK_pre_npc_releasepathreference) (const char **filepath); typedef void (*HPMHOOK_post_npc_releasepathreference) (const char *filepath); typedef void (*HPMHOOK_pre_npc_parsename) (struct npc_data **nd, const char **name, const char **start, const char **buffer, const char **filepath); @@ -6732,22 +6732,22 @@ typedef int (*HPMHOOK_pre_npc_parseview) (const char **w4, const char **start, c typedef int (*HPMHOOK_post_npc_parseview) (int retVal___, const char *w4, const char *start, const char *buffer, const char *filepath); typedef bool (*HPMHOOK_pre_npc_viewisid) (const char **viewid); typedef bool (*HPMHOOK_post_npc_viewisid) (bool retVal___, const char *viewid); -typedef struct npc_data* (*HPMHOOK_pre_npc_create_npc) (enum npc_subtype *subtype, int *m, int *x, int *y, enum unit_dir *dir, int *class_); -typedef struct npc_data* (*HPMHOOK_post_npc_create_npc) (struct npc_data* retVal___, enum npc_subtype subtype, int m, int x, int y, enum unit_dir dir, int class_); -typedef struct npc_data* (*HPMHOOK_pre_npc_add_warp) (char **name, short *from_mapid, short *from_x, short *from_y, short *xs, short *ys, unsigned short *to_mapindex, short *to_x, short *to_y); -typedef struct npc_data* (*HPMHOOK_post_npc_add_warp) (struct npc_data* retVal___, char *name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y); -typedef const char* (*HPMHOOK_pre_npc_parse_warp) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); -typedef const char* (*HPMHOOK_post_npc_parse_warp) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); -typedef const char* (*HPMHOOK_pre_npc_parse_shop) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); -typedef const char* (*HPMHOOK_post_npc_parse_shop) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); -typedef const char* (*HPMHOOK_pre_npc_parse_unknown_object) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); -typedef const char* (*HPMHOOK_post_npc_parse_unknown_object) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); +typedef struct npc_data * (*HPMHOOK_pre_npc_create_npc) (enum npc_subtype *subtype, int *m, int *x, int *y, enum unit_dir *dir, int *class_); +typedef struct npc_data * (*HPMHOOK_post_npc_create_npc) (struct npc_data * retVal___, enum npc_subtype subtype, int m, int x, int y, enum unit_dir dir, int class_); +typedef struct npc_data * (*HPMHOOK_pre_npc_add_warp) (char **name, short *from_mapid, short *from_x, short *from_y, short *xs, short *ys, unsigned short *to_mapindex, short *to_x, short *to_y); +typedef struct npc_data * (*HPMHOOK_post_npc_add_warp) (struct npc_data * retVal___, char *name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y); +typedef const char * (*HPMHOOK_pre_npc_parse_warp) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); +typedef const char * (*HPMHOOK_post_npc_parse_warp) (const char * retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); +typedef const char * (*HPMHOOK_pre_npc_parse_shop) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); +typedef const char * (*HPMHOOK_post_npc_parse_shop) (const char * retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); +typedef const char * (*HPMHOOK_pre_npc_parse_unknown_object) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); +typedef const char * (*HPMHOOK_post_npc_parse_unknown_object) (const char * retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); typedef void (*HPMHOOK_pre_npc_convertlabel_db) (struct npc_label_list **label_list, const char **filepath); typedef void (*HPMHOOK_post_npc_convertlabel_db) (struct npc_label_list *label_list, const char *filepath); -typedef const char* (*HPMHOOK_pre_npc_skip_script) (const char **start, const char **buffer, const char **filepath, int **retval); -typedef const char* (*HPMHOOK_post_npc_skip_script) (const char* retVal___, const char *start, const char *buffer, const char *filepath, int *retval); -typedef const char* (*HPMHOOK_pre_npc_parse_script) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int *options, int **retval); -typedef const char* (*HPMHOOK_post_npc_parse_script) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int options, int *retval); +typedef const char * (*HPMHOOK_pre_npc_skip_script) (const char **start, const char **buffer, const char **filepath, int **retval); +typedef const char * (*HPMHOOK_post_npc_skip_script) (const char * retVal___, const char *start, const char *buffer, const char *filepath, int *retval); +typedef const char * (*HPMHOOK_pre_npc_parse_script) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int *options, int **retval); +typedef const char * (*HPMHOOK_post_npc_parse_script) (const char * retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int options, int *retval); typedef void (*HPMHOOK_pre_npc_add_to_location) (struct npc_data **nd); typedef void (*HPMHOOK_post_npc_add_to_location) (struct npc_data *nd); typedef bool (*HPMHOOK_pre_npc_duplicate_script_sub) (struct npc_data **nd, const struct npc_data **snd, int *xs, int *ys, int *options); @@ -6758,8 +6758,8 @@ typedef bool (*HPMHOOK_pre_npc_duplicate_warp_sub) (struct npc_data **nd, const typedef bool (*HPMHOOK_post_npc_duplicate_warp_sub) (bool retVal___, struct npc_data *nd, const struct npc_data *snd, int xs, int ys, int options); typedef bool (*HPMHOOK_pre_npc_duplicate_sub) (struct npc_data **nd, const struct npc_data **snd, int *xs, int *ys, int *options); typedef bool (*HPMHOOK_post_npc_duplicate_sub) (bool retVal___, struct npc_data *nd, const struct npc_data *snd, int xs, int ys, int options); -typedef const char* (*HPMHOOK_pre_npc_parse_duplicate) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int *options, int **retval); -typedef const char* (*HPMHOOK_post_npc_parse_duplicate) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int options, int *retval); +typedef const char * (*HPMHOOK_pre_npc_parse_duplicate) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int *options, int **retval); +typedef const char * (*HPMHOOK_post_npc_parse_duplicate) (const char * retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int options, int *retval); typedef int (*HPMHOOK_pre_npc_duplicate4instance) (struct npc_data **snd, int16 *m); typedef int (*HPMHOOK_post_npc_duplicate4instance) (int retVal___, struct npc_data *snd, int16 m); typedef void (*HPMHOOK_pre_npc_setcells) (struct npc_data **nd); @@ -6776,14 +6776,14 @@ typedef void (*HPMHOOK_pre_npc_setclass) (struct npc_data **nd, int *class_); typedef void (*HPMHOOK_post_npc_setclass) (struct npc_data *nd, int class_); typedef int (*HPMHOOK_pre_npc_do_atcmd_event) (struct map_session_data **sd, const char **command, const char **message, const char **eventname); typedef int (*HPMHOOK_post_npc_do_atcmd_event) (int retVal___, struct map_session_data *sd, const char *command, const char *message, const char *eventname); -typedef const char* (*HPMHOOK_pre_npc_parse_function) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); -typedef const char* (*HPMHOOK_post_npc_parse_function) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); +typedef const char * (*HPMHOOK_pre_npc_parse_function) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); +typedef const char * (*HPMHOOK_post_npc_parse_function) (const char * retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); typedef void (*HPMHOOK_pre_npc_parse_mob2) (struct spawn_data **mobspawn); typedef void (*HPMHOOK_post_npc_parse_mob2) (struct spawn_data *mobspawn); -typedef const char* (*HPMHOOK_pre_npc_parse_mob) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); -typedef const char* (*HPMHOOK_post_npc_parse_mob) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); -typedef const char* (*HPMHOOK_pre_npc_parse_mapflag) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); -typedef const char* (*HPMHOOK_post_npc_parse_mapflag) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); +typedef const char * (*HPMHOOK_pre_npc_parse_mob) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); +typedef const char * (*HPMHOOK_post_npc_parse_mob) (const char * retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); +typedef const char * (*HPMHOOK_pre_npc_parse_mapflag) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); +typedef const char * (*HPMHOOK_post_npc_parse_mapflag) (const char * retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); typedef void (*HPMHOOK_pre_npc_parse_unknown_mapflag) (const char **name, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); typedef void (*HPMHOOK_post_npc_parse_unknown_mapflag) (const char *name, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); typedef int (*HPMHOOK_pre_npc_parsesrcfile) (const char **filepath, bool *runOnInit); @@ -6888,14 +6888,14 @@ typedef void (*HPMHOOK_pre_party_init) (bool *minimal); typedef void (*HPMHOOK_post_party_init) (bool minimal); typedef void (*HPMHOOK_pre_party_final) (void); typedef void (*HPMHOOK_post_party_final) (void); -typedef struct party_data* (*HPMHOOK_pre_party_search) (int *party_id); -typedef struct party_data* (*HPMHOOK_post_party_search) (struct party_data* retVal___, int party_id); -typedef struct party_data* (*HPMHOOK_pre_party_searchname) (const char **str); -typedef struct party_data* (*HPMHOOK_post_party_searchname) (struct party_data* retVal___, const char *str); +typedef struct party_data * (*HPMHOOK_pre_party_search) (int *party_id); +typedef struct party_data * (*HPMHOOK_post_party_search) (struct party_data * retVal___, int party_id); +typedef struct party_data * (*HPMHOOK_pre_party_searchname) (const char **str); +typedef struct party_data * (*HPMHOOK_post_party_searchname) (struct party_data * retVal___, const char *str); typedef int (*HPMHOOK_pre_party_getmemberid) (struct party_data **p, struct map_session_data **sd); typedef int (*HPMHOOK_post_party_getmemberid) (int retVal___, struct party_data *p, struct map_session_data *sd); -typedef struct map_session_data* (*HPMHOOK_pre_party_getavailablesd) (struct party_data **p); -typedef struct map_session_data* (*HPMHOOK_post_party_getavailablesd) (struct map_session_data* retVal___, struct party_data *p); +typedef struct map_session_data * (*HPMHOOK_pre_party_getavailablesd) (struct party_data **p); +typedef struct map_session_data * (*HPMHOOK_post_party_getavailablesd) (struct map_session_data * retVal___, struct party_data *p); typedef int (*HPMHOOK_pre_party_create) (struct map_session_data **sd, const char **name, int *item, int *item2); typedef int (*HPMHOOK_post_party_create) (int retVal___, struct map_session_data *sd, const char *name, int item, int item2); typedef void (*HPMHOOK_pre_party_created) (int *account_id, int *char_id, int *fail, int *party_id, const char **name); @@ -6972,12 +6972,12 @@ typedef int (*HPMHOOK_pre_party_send_xy_timer) (int *tid, int64 *tick, int *id, typedef int (*HPMHOOK_post_party_send_xy_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); typedef void (*HPMHOOK_pre_party_fill_member) (struct party_member **member, struct map_session_data **sd, unsigned int *leader); typedef void (*HPMHOOK_post_party_fill_member) (struct party_member *member, struct map_session_data *sd, unsigned int leader); -typedef struct map_session_data* (*HPMHOOK_pre_party_sd_check) (int *party_id, int *account_id, int *char_id); -typedef struct map_session_data* (*HPMHOOK_post_party_sd_check) (struct map_session_data* retVal___, int party_id, int account_id, int char_id); +typedef struct map_session_data * (*HPMHOOK_pre_party_sd_check) (int *party_id, int *account_id, int *char_id); +typedef struct map_session_data * (*HPMHOOK_post_party_sd_check) (struct map_session_data * retVal___, int party_id, int account_id, int char_id); typedef void (*HPMHOOK_pre_party_check_state) (struct party_data **p); typedef void (*HPMHOOK_post_party_check_state) (struct party_data *p); -typedef struct party_booking_ad_info* (*HPMHOOK_pre_party_create_booking_data) (void); -typedef struct party_booking_ad_info* (*HPMHOOK_post_party_create_booking_data) (struct party_booking_ad_info* retVal___); +typedef struct party_booking_ad_info * (*HPMHOOK_pre_party_create_booking_data) (void); +typedef struct party_booking_ad_info * (*HPMHOOK_post_party_create_booking_data) (struct party_booking_ad_info * retVal___); typedef int (*HPMHOOK_pre_party_db_final) (union DBKey *key, struct DBData **data, va_list ap); typedef int (*HPMHOOK_post_party_db_final) (int retVal___, union DBKey key, struct DBData *data, va_list ap); typedef bool (*HPMHOOK_pre_party_is_leader) (struct map_session_data **sd, const struct party_data **p); @@ -7008,18 +7008,18 @@ typedef void (*HPMHOOK_pre_pcg_final) (void); typedef void (*HPMHOOK_post_pcg_final) (void); typedef void (*HPMHOOK_pre_pcg_reload) (void); typedef void (*HPMHOOK_post_pcg_reload) (void); -typedef GroupSettings* (*HPMHOOK_pre_pcg_get_dummy_group) (void); -typedef GroupSettings* (*HPMHOOK_post_pcg_get_dummy_group) (GroupSettings* retVal___); +typedef GroupSettings * (*HPMHOOK_pre_pcg_get_dummy_group) (void); +typedef GroupSettings * (*HPMHOOK_post_pcg_get_dummy_group) (GroupSettings * retVal___); typedef bool (*HPMHOOK_pre_pcg_exists) (int *group_id); typedef bool (*HPMHOOK_post_pcg_exists) (bool retVal___, int group_id); -typedef GroupSettings* (*HPMHOOK_pre_pcg_id2group) (int *group_id); -typedef GroupSettings* (*HPMHOOK_post_pcg_id2group) (GroupSettings* retVal___, int group_id); +typedef GroupSettings * (*HPMHOOK_pre_pcg_id2group) (int *group_id); +typedef GroupSettings * (*HPMHOOK_post_pcg_id2group) (GroupSettings * retVal___, int group_id); typedef bool (*HPMHOOK_pre_pcg_has_permission) (GroupSettings **group, unsigned int *permission); typedef bool (*HPMHOOK_post_pcg_has_permission) (bool retVal___, GroupSettings *group, unsigned int permission); typedef bool (*HPMHOOK_pre_pcg_should_log_commands) (GroupSettings **group); typedef bool (*HPMHOOK_post_pcg_should_log_commands) (bool retVal___, GroupSettings *group); -typedef const char* (*HPMHOOK_pre_pcg_get_name) (GroupSettings **group); -typedef const char* (*HPMHOOK_post_pcg_get_name) (const char* retVal___, GroupSettings *group); +typedef const char * (*HPMHOOK_pre_pcg_get_name) (GroupSettings **group); +typedef const char * (*HPMHOOK_post_pcg_get_name) (const char * retVal___, GroupSettings *group); typedef int (*HPMHOOK_pre_pcg_get_level) (GroupSettings **group); typedef int (*HPMHOOK_post_pcg_get_level) (int retVal___, GroupSettings *group); typedef int (*HPMHOOK_pre_pcg_get_idx) (GroupSettings **group); @@ -7030,8 +7030,8 @@ typedef void (*HPMHOOK_pre_pc_init) (bool *minimal); typedef void (*HPMHOOK_post_pc_init) (bool minimal); typedef void (*HPMHOOK_pre_pc_final) (void); typedef void (*HPMHOOK_post_pc_final) (void); -typedef struct map_session_data* (*HPMHOOK_pre_pc_get_dummy_sd) (void); -typedef struct map_session_data* (*HPMHOOK_post_pc_get_dummy_sd) (struct map_session_data* retVal___); +typedef struct map_session_data * (*HPMHOOK_pre_pc_get_dummy_sd) (void); +typedef struct map_session_data * (*HPMHOOK_post_pc_get_dummy_sd) (struct map_session_data * retVal___); typedef int (*HPMHOOK_pre_pc_class2idx) (int *class); typedef int (*HPMHOOK_post_pc_class2idx) (int retVal___, int class); typedef bool (*HPMHOOK_pre_pc_can_talk) (struct map_session_data **sd); @@ -7294,16 +7294,16 @@ typedef int (*HPMHOOK_pre_pc_readreg) (struct map_session_data **sd, int64 *reg) typedef int (*HPMHOOK_post_pc_readreg) (int retVal___, struct map_session_data *sd, int64 reg); typedef void (*HPMHOOK_pre_pc_setreg) (struct map_session_data **sd, int64 *reg, int *val); typedef void (*HPMHOOK_post_pc_setreg) (struct map_session_data *sd, int64 reg, int val); -typedef char* (*HPMHOOK_pre_pc_readregstr) (struct map_session_data **sd, int64 *reg); -typedef char* (*HPMHOOK_post_pc_readregstr) (char* retVal___, struct map_session_data *sd, int64 reg); +typedef char * (*HPMHOOK_pre_pc_readregstr) (struct map_session_data **sd, int64 *reg); +typedef char * (*HPMHOOK_post_pc_readregstr) (char * retVal___, struct map_session_data *sd, int64 reg); typedef void (*HPMHOOK_pre_pc_setregstr) (struct map_session_data **sd, int64 *reg, const char **str); typedef void (*HPMHOOK_post_pc_setregstr) (struct map_session_data *sd, int64 reg, const char *str); typedef int (*HPMHOOK_pre_pc_readregistry) (struct map_session_data **sd, int64 *reg); typedef int (*HPMHOOK_post_pc_readregistry) (int retVal___, struct map_session_data *sd, int64 reg); typedef int (*HPMHOOK_pre_pc_setregistry) (struct map_session_data **sd, int64 *reg, int *val); typedef int (*HPMHOOK_post_pc_setregistry) (int retVal___, struct map_session_data *sd, int64 reg, int val); -typedef char* (*HPMHOOK_pre_pc_readregistry_str) (struct map_session_data **sd, int64 *reg); -typedef char* (*HPMHOOK_post_pc_readregistry_str) (char* retVal___, struct map_session_data *sd, int64 reg); +typedef char * (*HPMHOOK_pre_pc_readregistry_str) (struct map_session_data **sd, int64 *reg); +typedef char * (*HPMHOOK_post_pc_readregistry_str) (char * retVal___, struct map_session_data *sd, int64 reg); typedef int (*HPMHOOK_pre_pc_setregistry_str) (struct map_session_data **sd, int64 *reg, const char **val); typedef int (*HPMHOOK_post_pc_setregistry_str) (int retVal___, struct map_session_data *sd, int64 reg, const char *val); typedef int (*HPMHOOK_pre_pc_addeventtimer) (struct map_session_data **sd, int *tick, const char **name); @@ -7326,14 +7326,14 @@ typedef int (*HPMHOOK_pre_pc_marriage) (struct map_session_data **sd, struct map typedef int (*HPMHOOK_post_pc_marriage) (int retVal___, struct map_session_data *sd, struct map_session_data *dstsd); typedef int (*HPMHOOK_pre_pc_divorce) (struct map_session_data **sd); typedef int (*HPMHOOK_post_pc_divorce) (int retVal___, struct map_session_data *sd); -typedef struct map_session_data* (*HPMHOOK_pre_pc_get_partner) (struct map_session_data **sd); -typedef struct map_session_data* (*HPMHOOK_post_pc_get_partner) (struct map_session_data* retVal___, struct map_session_data *sd); -typedef struct map_session_data* (*HPMHOOK_pre_pc_get_father) (struct map_session_data **sd); -typedef struct map_session_data* (*HPMHOOK_post_pc_get_father) (struct map_session_data* retVal___, struct map_session_data *sd); -typedef struct map_session_data* (*HPMHOOK_pre_pc_get_mother) (struct map_session_data **sd); -typedef struct map_session_data* (*HPMHOOK_post_pc_get_mother) (struct map_session_data* retVal___, struct map_session_data *sd); -typedef struct map_session_data* (*HPMHOOK_pre_pc_get_child) (struct map_session_data **sd); -typedef struct map_session_data* (*HPMHOOK_post_pc_get_child) (struct map_session_data* retVal___, struct map_session_data *sd); +typedef struct map_session_data * (*HPMHOOK_pre_pc_get_partner) (struct map_session_data **sd); +typedef struct map_session_data * (*HPMHOOK_post_pc_get_partner) (struct map_session_data * retVal___, struct map_session_data *sd); +typedef struct map_session_data * (*HPMHOOK_pre_pc_get_father) (struct map_session_data **sd); +typedef struct map_session_data * (*HPMHOOK_post_pc_get_father) (struct map_session_data * retVal___, struct map_session_data *sd); +typedef struct map_session_data * (*HPMHOOK_pre_pc_get_mother) (struct map_session_data **sd); +typedef struct map_session_data * (*HPMHOOK_post_pc_get_mother) (struct map_session_data * retVal___, struct map_session_data *sd); +typedef struct map_session_data * (*HPMHOOK_pre_pc_get_child) (struct map_session_data **sd); +typedef struct map_session_data * (*HPMHOOK_post_pc_get_child) (struct map_session_data * retVal___, struct map_session_data *sd); typedef void (*HPMHOOK_pre_pc_bleeding) (struct map_session_data **sd, unsigned int *diff_tick); typedef void (*HPMHOOK_post_pc_bleeding) (struct map_session_data *sd, unsigned int diff_tick); typedef void (*HPMHOOK_pre_pc_regen) (struct map_session_data **sd, unsigned int *diff_tick); @@ -7346,8 +7346,8 @@ typedef int (*HPMHOOK_pre_pc_jobid2mapid) (int *class); typedef int (*HPMHOOK_post_pc_jobid2mapid) (int retVal___, int class); typedef int (*HPMHOOK_pre_pc_mapid2jobid) (unsigned int *class_, int *sex); typedef int (*HPMHOOK_post_pc_mapid2jobid) (int retVal___, unsigned int class_, int sex); -typedef const char* (*HPMHOOK_pre_pc_job_name) (int *class); -typedef const char* (*HPMHOOK_post_pc_job_name) (const char* retVal___, int class); +typedef const char * (*HPMHOOK_pre_pc_job_name) (int *class); +typedef const char * (*HPMHOOK_post_pc_job_name) (const char * retVal___, int class); typedef void (*HPMHOOK_pre_pc_setinvincibletimer) (struct map_session_data **sd, int *val); typedef void (*HPMHOOK_post_pc_setinvincibletimer) (struct map_session_data *sd, int val); typedef void (*HPMHOOK_pre_pc_delinvincibletimer) (struct map_session_data **sd); @@ -7554,10 +7554,10 @@ typedef void (*HPMHOOK_pre_pc_clear_existing_reproduceskill) (struct map_session typedef void (*HPMHOOK_post_pc_clear_existing_reproduceskill) (struct map_session_data *sd, bool clear_vars); #endif // MAP_PC_H #ifdef MAP_NPC_H /* libpcre */ -typedef pcre* (*HPMHOOK_pre_libpcre_compile) (const char **pattern, int *options, const char ***errptr, int **erroffset, const unsigned char **tableptr); -typedef pcre* (*HPMHOOK_post_libpcre_compile) (pcre* retVal___, const char *pattern, int options, const char **errptr, int *erroffset, const unsigned char *tableptr); -typedef pcre_extra* (*HPMHOOK_pre_libpcre_study) (const pcre **code, int *options, const char ***errptr); -typedef pcre_extra* (*HPMHOOK_post_libpcre_study) (pcre_extra* retVal___, const pcre *code, int options, const char **errptr); +typedef pcre * (*HPMHOOK_pre_libpcre_compile) (const char **pattern, int *options, const char ***errptr, int **erroffset, const unsigned char **tableptr); +typedef pcre * (*HPMHOOK_post_libpcre_compile) (pcre * retVal___, const char *pattern, int options, const char **errptr, int *erroffset, const unsigned char *tableptr); +typedef pcre_extra * (*HPMHOOK_pre_libpcre_study) (const pcre **code, int *options, const char ***errptr); +typedef pcre_extra * (*HPMHOOK_post_libpcre_study) (pcre_extra * retVal___, const pcre *code, int options, const char **errptr); typedef int (*HPMHOOK_pre_libpcre_exec) (const pcre **code, const pcre_extra **extra, PCRE_SPTR *subject, int *length, int *startoffset, int *options, int **ovector, int *ovecsize); typedef int (*HPMHOOK_post_libpcre_exec) (int retVal___, const pcre *code, const pcre_extra *extra, PCRE_SPTR subject, int length, int startoffset, int options, int *ovector, int ovecsize); typedef void (*HPMHOOK_pre_libpcre_free) (void **ptr); @@ -7706,8 +7706,8 @@ typedef void (*HPMHOOK_pre_quest_final) (void); typedef void (*HPMHOOK_post_quest_final) (void); typedef void (*HPMHOOK_pre_quest_reload) (void); typedef void (*HPMHOOK_post_quest_reload) (void); -typedef struct quest_db* (*HPMHOOK_pre_quest_db) (int *quest_id); -typedef struct quest_db* (*HPMHOOK_post_quest_db) (struct quest_db* retVal___, int quest_id); +typedef struct quest_db * (*HPMHOOK_pre_quest_db) (int *quest_id); +typedef struct quest_db * (*HPMHOOK_post_quest_db) (struct quest_db * retVal___, int quest_id); typedef int (*HPMHOOK_pre_quest_pc_login) (struct map_session_data **sd); typedef int (*HPMHOOK_post_quest_pc_login) (int retVal___, struct map_session_data *sd); typedef int (*HPMHOOK_pre_quest_add) (struct map_session_data **sd, int *quest_id, unsigned int *time_limit); @@ -7728,8 +7728,8 @@ typedef void (*HPMHOOK_pre_quest_clear) (void); typedef void (*HPMHOOK_post_quest_clear) (void); typedef int (*HPMHOOK_pre_quest_read_db) (void); typedef int (*HPMHOOK_post_quest_read_db) (int retVal___); -typedef struct quest_db* (*HPMHOOK_pre_quest_read_db_sub) (struct config_setting_t **cs, int *n, const char **source); -typedef struct quest_db* (*HPMHOOK_post_quest_read_db_sub) (struct quest_db* retVal___, struct config_setting_t *cs, int n, const char *source); +typedef struct quest_db * (*HPMHOOK_pre_quest_read_db_sub) (struct config_setting_t **cs, int *n, const char **source); +typedef struct quest_db * (*HPMHOOK_post_quest_read_db_sub) (struct quest_db * retVal___, struct config_setting_t *cs, int n, const char *source); typedef int (*HPMHOOK_pre_quest_setting_lookup_const) (struct config_setting_t **tt, const char **name, int **value, int *quest_id, int *idx, const char **kind, const char **source); typedef int (*HPMHOOK_post_quest_setting_lookup_const) (int retVal___, struct config_setting_t *tt, const char *name, int *value, int quest_id, int idx, const char *kind, const char *source); typedef int (*HPMHOOK_pre_quest_questinfo_validate_icon) (int *icon); @@ -7838,8 +7838,8 @@ typedef int (*HPMHOOK_pre_rodex_send_mail) (struct map_session_data **sd, const typedef int (*HPMHOOK_post_rodex_send_mail) (int retVal___, struct map_session_data *sd, const char *receiver_name, const char *body, const char *title, int64 zeny); typedef void (*HPMHOOK_pre_rodex_send_mail_result) (struct map_session_data **ssd, struct map_session_data **rsd, bool *result); typedef void (*HPMHOOK_post_rodex_send_mail_result) (struct map_session_data *ssd, struct map_session_data *rsd, bool result); -typedef struct rodex_message* (*HPMHOOK_pre_rodex_get_mail) (struct map_session_data **sd, int64 *mail_id); -typedef struct rodex_message* (*HPMHOOK_post_rodex_get_mail) (struct rodex_message* retVal___, struct map_session_data *sd, int64 mail_id); +typedef struct rodex_message * (*HPMHOOK_pre_rodex_get_mail) (struct map_session_data **sd, int64 *mail_id); +typedef struct rodex_message * (*HPMHOOK_post_rodex_get_mail) (struct rodex_message * retVal___, struct map_session_data *sd, int64 mail_id); typedef void (*HPMHOOK_pre_rodex_read_mail) (struct map_session_data **sd, int64 *mail_id); typedef void (*HPMHOOK_post_rodex_read_mail) (struct map_session_data *sd, int64 mail_id); typedef void (*HPMHOOK_pre_rodex_get_zeny) (struct map_session_data **sd, int8 *opentype, int64 *mail_id); @@ -7862,52 +7862,52 @@ typedef void (*HPMHOOK_pre_script_final) (void); typedef void (*HPMHOOK_post_script_final) (void); typedef int (*HPMHOOK_pre_script_reload) (void); typedef int (*HPMHOOK_post_script_reload) (int retVal___); -typedef struct script_code* (*HPMHOOK_pre_script_parse) (const char **src, const char **file, int *line, int *options, int **retval); -typedef struct script_code* (*HPMHOOK_post_script_parse) (struct script_code* retVal___, const char *src, const char *file, int line, int options, int *retval); +typedef struct script_code * (*HPMHOOK_pre_script_parse) (const char **src, const char **file, int *line, int *options, int **retval); +typedef struct script_code * (*HPMHOOK_post_script_parse) (struct script_code * retVal___, const char *src, const char *file, int line, int options, int *retval); typedef bool (*HPMHOOK_pre_script_add_builtin) (const struct script_function **buildin, bool *override); typedef bool (*HPMHOOK_post_script_add_builtin) (bool retVal___, const struct script_function *buildin, bool override); typedef void (*HPMHOOK_pre_script_parse_builtin) (void); typedef void (*HPMHOOK_post_script_parse_builtin) (void); -typedef const char* (*HPMHOOK_pre_script_parse_subexpr) (const char **p, int *limit); -typedef const char* (*HPMHOOK_post_script_parse_subexpr) (const char* retVal___, const char *p, int limit); -typedef const char* (*HPMHOOK_pre_script_skip_space) (const char **p); -typedef const char* (*HPMHOOK_post_script_skip_space) (const char* retVal___, const char *p); +typedef const char * (*HPMHOOK_pre_script_parse_subexpr) (const char **p, int *limit); +typedef const char * (*HPMHOOK_post_script_parse_subexpr) (const char * retVal___, const char *p, int limit); +typedef const char * (*HPMHOOK_pre_script_skip_space) (const char **p); +typedef const char * (*HPMHOOK_post_script_skip_space) (const char * retVal___, const char *p); typedef void (*HPMHOOK_pre_script_error) (const char **src, const char **file, int *start_line, const char **error_msg, const char **error_pos); typedef void (*HPMHOOK_post_script_error) (const char *src, const char *file, int start_line, const char *error_msg, const char *error_pos); typedef void (*HPMHOOK_pre_script_warning) (const char **src, const char **file, int *start_line, const char **error_msg, const char **error_pos); typedef void (*HPMHOOK_post_script_warning) (const char *src, const char *file, int start_line, const char *error_msg, const char *error_pos); -typedef struct script_code* (*HPMHOOK_pre_script_clone_script) (struct script_code **original); -typedef struct script_code* (*HPMHOOK_post_script_clone_script) (struct script_code* retVal___, struct script_code *original); +typedef struct script_code * (*HPMHOOK_pre_script_clone_script) (struct script_code **original); +typedef struct script_code * (*HPMHOOK_post_script_clone_script) (struct script_code * retVal___, struct script_code *original); typedef bool (*HPMHOOK_pre_script_addScript) (char **name, char **args, bool ( **func ) (struct script_state *st), bool *isDeprecated); typedef bool (*HPMHOOK_post_script_addScript) (bool retVal___, char *name, char *args, bool ( *func ) (struct script_state *st), bool isDeprecated); typedef int (*HPMHOOK_pre_script_conv_num) (struct script_state **st, struct script_data **data); typedef int (*HPMHOOK_post_script_conv_num) (int retVal___, struct script_state *st, struct script_data *data); -typedef const char* (*HPMHOOK_pre_script_conv_str) (struct script_state **st, struct script_data **data); -typedef const char* (*HPMHOOK_post_script_conv_str) (const char* retVal___, struct script_state *st, struct script_data *data); -typedef struct map_session_data* (*HPMHOOK_pre_script_rid2sd) (struct script_state **st); -typedef struct map_session_data* (*HPMHOOK_post_script_rid2sd) (struct map_session_data* retVal___, struct script_state *st); -typedef struct map_session_data* (*HPMHOOK_pre_script_id2sd) (struct script_state **st, int *account_id); -typedef struct map_session_data* (*HPMHOOK_post_script_id2sd) (struct map_session_data* retVal___, struct script_state *st, int account_id); -typedef struct map_session_data* (*HPMHOOK_pre_script_charid2sd) (struct script_state **st, int *char_id); -typedef struct map_session_data* (*HPMHOOK_post_script_charid2sd) (struct map_session_data* retVal___, struct script_state *st, int char_id); -typedef struct map_session_data* (*HPMHOOK_pre_script_nick2sd) (struct script_state **st, const char **name); -typedef struct map_session_data* (*HPMHOOK_post_script_nick2sd) (struct map_session_data* retVal___, struct script_state *st, const char *name); +typedef const char * (*HPMHOOK_pre_script_conv_str) (struct script_state **st, struct script_data **data); +typedef const char * (*HPMHOOK_post_script_conv_str) (const char * retVal___, struct script_state *st, struct script_data *data); +typedef struct map_session_data * (*HPMHOOK_pre_script_rid2sd) (struct script_state **st); +typedef struct map_session_data * (*HPMHOOK_post_script_rid2sd) (struct map_session_data * retVal___, struct script_state *st); +typedef struct map_session_data * (*HPMHOOK_pre_script_id2sd) (struct script_state **st, int *account_id); +typedef struct map_session_data * (*HPMHOOK_post_script_id2sd) (struct map_session_data * retVal___, struct script_state *st, int account_id); +typedef struct map_session_data * (*HPMHOOK_pre_script_charid2sd) (struct script_state **st, int *char_id); +typedef struct map_session_data * (*HPMHOOK_post_script_charid2sd) (struct map_session_data * retVal___, struct script_state *st, int char_id); +typedef struct map_session_data * (*HPMHOOK_pre_script_nick2sd) (struct script_state **st, const char **name); +typedef struct map_session_data * (*HPMHOOK_post_script_nick2sd) (struct map_session_data * retVal___, struct script_state *st, const char *name); typedef void (*HPMHOOK_pre_script_detach_rid) (struct script_state **st); typedef void (*HPMHOOK_post_script_detach_rid) (struct script_state *st); -typedef struct script_data* (*HPMHOOK_pre_script_push_val) (struct script_stack **stack, enum c_op *type, int64 *val, struct reg_db **ref); -typedef struct script_data* (*HPMHOOK_post_script_push_val) (struct script_data* retVal___, struct script_stack *stack, enum c_op type, int64 val, struct reg_db *ref); -typedef struct script_data* (*HPMHOOK_pre_script_get_val) (struct script_state **st, struct script_data **data); -typedef struct script_data* (*HPMHOOK_post_script_get_val) (struct script_data* retVal___, struct script_state *st, struct script_data *data); -typedef char* (*HPMHOOK_pre_script_get_val_ref_str) (struct script_state **st, struct reg_db **n, struct script_data **data); -typedef char* (*HPMHOOK_post_script_get_val_ref_str) (char* retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); -typedef char* (*HPMHOOK_pre_script_get_val_pc_ref_str) (struct script_state **st, struct reg_db **n, struct script_data **data); -typedef char* (*HPMHOOK_post_script_get_val_pc_ref_str) (char* retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); -typedef char* (*HPMHOOK_pre_script_get_val_scope_str) (struct script_state **st, struct reg_db **n, struct script_data **data); -typedef char* (*HPMHOOK_post_script_get_val_scope_str) (char* retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); -typedef char* (*HPMHOOK_pre_script_get_val_npc_str) (struct script_state **st, struct reg_db **n, struct script_data **data); -typedef char* (*HPMHOOK_post_script_get_val_npc_str) (char* retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); -typedef char* (*HPMHOOK_pre_script_get_val_instance_str) (struct script_state **st, const char **name, struct script_data **data); -typedef char* (*HPMHOOK_post_script_get_val_instance_str) (char* retVal___, struct script_state *st, const char *name, struct script_data *data); +typedef struct script_data * (*HPMHOOK_pre_script_push_val) (struct script_stack **stack, enum c_op *type, int64 *val, struct reg_db **ref); +typedef struct script_data * (*HPMHOOK_post_script_push_val) (struct script_data * retVal___, struct script_stack *stack, enum c_op type, int64 val, struct reg_db *ref); +typedef struct script_data * (*HPMHOOK_pre_script_get_val) (struct script_state **st, struct script_data **data); +typedef struct script_data * (*HPMHOOK_post_script_get_val) (struct script_data * retVal___, struct script_state *st, struct script_data *data); +typedef char * (*HPMHOOK_pre_script_get_val_ref_str) (struct script_state **st, struct reg_db **n, struct script_data **data); +typedef char * (*HPMHOOK_post_script_get_val_ref_str) (char * retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); +typedef char * (*HPMHOOK_pre_script_get_val_pc_ref_str) (struct script_state **st, struct reg_db **n, struct script_data **data); +typedef char * (*HPMHOOK_post_script_get_val_pc_ref_str) (char * retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); +typedef char * (*HPMHOOK_pre_script_get_val_scope_str) (struct script_state **st, struct reg_db **n, struct script_data **data); +typedef char * (*HPMHOOK_post_script_get_val_scope_str) (char * retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); +typedef char * (*HPMHOOK_pre_script_get_val_npc_str) (struct script_state **st, struct reg_db **n, struct script_data **data); +typedef char * (*HPMHOOK_post_script_get_val_npc_str) (char * retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); +typedef char * (*HPMHOOK_pre_script_get_val_instance_str) (struct script_state **st, const char **name, struct script_data **data); +typedef char * (*HPMHOOK_post_script_get_val_instance_str) (char * retVal___, struct script_state *st, const char *name, struct script_data *data); typedef int (*HPMHOOK_pre_script_get_val_ref_num) (struct script_state **st, struct reg_db **n, struct script_data **data); typedef int (*HPMHOOK_post_script_get_val_ref_num) (int retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); typedef int (*HPMHOOK_pre_script_get_val_pc_ref_num) (struct script_state **st, struct reg_db **n, struct script_data **data); @@ -7918,14 +7918,14 @@ typedef int (*HPMHOOK_pre_script_get_val_npc_num) (struct script_state **st, str typedef int (*HPMHOOK_post_script_get_val_npc_num) (int retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); typedef int (*HPMHOOK_pre_script_get_val_instance_num) (struct script_state **st, const char **name, struct script_data **data); typedef int (*HPMHOOK_post_script_get_val_instance_num) (int retVal___, struct script_state *st, const char *name, struct script_data *data); -typedef const void* (*HPMHOOK_pre_script_get_val2) (struct script_state **st, int64 *uid, struct reg_db **ref); -typedef const void* (*HPMHOOK_post_script_get_val2) (const void* retVal___, struct script_state *st, int64 uid, struct reg_db *ref); -typedef struct script_data* (*HPMHOOK_pre_script_push_str) (struct script_stack **stack, char **str); -typedef struct script_data* (*HPMHOOK_post_script_push_str) (struct script_data* retVal___, struct script_stack *stack, char *str); -typedef struct script_data* (*HPMHOOK_pre_script_push_conststr) (struct script_stack **stack, const char **str); -typedef struct script_data* (*HPMHOOK_post_script_push_conststr) (struct script_data* retVal___, struct script_stack *stack, const char *str); -typedef struct script_data* (*HPMHOOK_pre_script_push_copy) (struct script_stack **stack, int *pos); -typedef struct script_data* (*HPMHOOK_post_script_push_copy) (struct script_data* retVal___, struct script_stack *stack, int pos); +typedef const void * (*HPMHOOK_pre_script_get_val2) (struct script_state **st, int64 *uid, struct reg_db **ref); +typedef const void * (*HPMHOOK_post_script_get_val2) (const void * retVal___, struct script_state *st, int64 uid, struct reg_db *ref); +typedef struct script_data * (*HPMHOOK_pre_script_push_str) (struct script_stack **stack, char **str); +typedef struct script_data * (*HPMHOOK_post_script_push_str) (struct script_data * retVal___, struct script_stack *stack, char *str); +typedef struct script_data * (*HPMHOOK_pre_script_push_conststr) (struct script_stack **stack, const char **str); +typedef struct script_data * (*HPMHOOK_post_script_push_conststr) (struct script_data * retVal___, struct script_stack *stack, const char *str); +typedef struct script_data * (*HPMHOOK_pre_script_push_copy) (struct script_stack **stack, int *pos); +typedef struct script_data * (*HPMHOOK_post_script_push_copy) (struct script_data * retVal___, struct script_stack *stack, int pos); typedef void (*HPMHOOK_pre_script_pop_stack) (struct script_state **st, int *start, int *end); typedef void (*HPMHOOK_post_script_pop_stack) (struct script_state *st, int start, int end); typedef void (*HPMHOOK_pre_script_set_constant) (const char **name, int *value, bool *is_parameter, bool *is_deprecated); @@ -7954,8 +7954,8 @@ typedef void (*HPMHOOK_pre_script_free_code) (struct script_code **code); typedef void (*HPMHOOK_post_script_free_code) (struct script_code *code); typedef void (*HPMHOOK_pre_script_free_vars) (struct DBMap **var_storage); typedef void (*HPMHOOK_post_script_free_vars) (struct DBMap *var_storage); -typedef struct script_state* (*HPMHOOK_pre_script_alloc_state) (struct script_code **rootscript, int *pos, int *rid, int *oid); -typedef struct script_state* (*HPMHOOK_post_script_alloc_state) (struct script_state* retVal___, struct script_code *rootscript, int pos, int rid, int oid); +typedef struct script_state * (*HPMHOOK_pre_script_alloc_state) (struct script_code **rootscript, int *pos, int *rid, int *oid); +typedef struct script_state * (*HPMHOOK_post_script_alloc_state) (struct script_state * retVal___, struct script_code *rootscript, int pos, int rid, int oid); typedef void (*HPMHOOK_pre_script_free_state) (struct script_state **st); typedef void (*HPMHOOK_post_script_free_state) (struct script_state *st); typedef void (*HPMHOOK_pre_script_add_pending_ref) (struct script_state **st, struct reg_db **ref); @@ -7972,16 +7972,16 @@ typedef int (*HPMHOOK_pre_script_add_str) (const char **p); typedef int (*HPMHOOK_post_script_add_str) (int retVal___, const char *p); typedef int (*HPMHOOK_pre_script_add_variable) (const char **varname); typedef int (*HPMHOOK_post_script_add_variable) (int retVal___, const char *varname); -typedef const char* (*HPMHOOK_pre_script_get_str) (int *id); -typedef const char* (*HPMHOOK_post_script_get_str) (const char* retVal___, int id); +typedef const char * (*HPMHOOK_pre_script_get_str) (int *id); +typedef const char * (*HPMHOOK_post_script_get_str) (const char * retVal___, int id); typedef int (*HPMHOOK_pre_script_search_str) (const char **p); typedef int (*HPMHOOK_post_script_search_str) (int retVal___, const char *p); typedef void (*HPMHOOK_pre_script_setd_sub) (struct script_state **st, struct map_session_data **sd, const char **varname, int *elem, const void **value, struct reg_db **ref); typedef void (*HPMHOOK_post_script_setd_sub) (struct script_state *st, struct map_session_data *sd, const char *varname, int elem, const void *value, struct reg_db *ref); typedef void (*HPMHOOK_pre_script_attach_state) (struct script_state **st); typedef void (*HPMHOOK_post_script_attach_state) (struct script_state *st); -typedef struct script_queue* (*HPMHOOK_pre_script_queue) (int *idx); -typedef struct script_queue* (*HPMHOOK_post_script_queue) (struct script_queue* retVal___, int idx); +typedef struct script_queue * (*HPMHOOK_pre_script_queue) (int *idx); +typedef struct script_queue * (*HPMHOOK_post_script_queue) (struct script_queue * retVal___, int idx); typedef bool (*HPMHOOK_pre_script_queue_add) (int *idx, int *var); typedef bool (*HPMHOOK_post_script_queue_add) (bool retVal___, int idx, int var); typedef bool (*HPMHOOK_pre_script_queue_del) (int *idx); @@ -7992,22 +7992,22 @@ typedef int (*HPMHOOK_pre_script_queue_create) (void); typedef int (*HPMHOOK_post_script_queue_create) (int retVal___); typedef bool (*HPMHOOK_pre_script_queue_clear) (int *idx); typedef bool (*HPMHOOK_post_script_queue_clear) (bool retVal___, int idx); -typedef const char* (*HPMHOOK_pre_script_parse_curly_close) (const char **p); -typedef const char* (*HPMHOOK_post_script_parse_curly_close) (const char* retVal___, const char *p); -typedef const char* (*HPMHOOK_pre_script_parse_syntax_close) (const char **p); -typedef const char* (*HPMHOOK_post_script_parse_syntax_close) (const char* retVal___, const char *p); -typedef const char* (*HPMHOOK_pre_script_parse_syntax_close_sub) (const char **p, int **flag); -typedef const char* (*HPMHOOK_post_script_parse_syntax_close_sub) (const char* retVal___, const char *p, int *flag); -typedef const char* (*HPMHOOK_pre_script_parse_syntax) (const char **p); -typedef const char* (*HPMHOOK_post_script_parse_syntax) (const char* retVal___, const char *p); -typedef const char* (*HPMHOOK_pre_script_parse_syntax_function) (const char **p, bool *is_public); -typedef const char* (*HPMHOOK_post_script_parse_syntax_function) (const char* retVal___, const char *p, bool is_public); +typedef const char * (*HPMHOOK_pre_script_parse_curly_close) (const char **p); +typedef const char * (*HPMHOOK_post_script_parse_curly_close) (const char * retVal___, const char *p); +typedef const char * (*HPMHOOK_pre_script_parse_syntax_close) (const char **p); +typedef const char * (*HPMHOOK_post_script_parse_syntax_close) (const char * retVal___, const char *p); +typedef const char * (*HPMHOOK_pre_script_parse_syntax_close_sub) (const char **p, int **flag); +typedef const char * (*HPMHOOK_post_script_parse_syntax_close_sub) (const char * retVal___, const char *p, int *flag); +typedef const char * (*HPMHOOK_pre_script_parse_syntax) (const char **p); +typedef const char * (*HPMHOOK_post_script_parse_syntax) (const char * retVal___, const char *p); +typedef const char * (*HPMHOOK_pre_script_parse_syntax_function) (const char **p, bool *is_public); +typedef const char * (*HPMHOOK_post_script_parse_syntax_function) (const char * retVal___, const char *p, bool is_public); typedef c_op (*HPMHOOK_pre_script_get_com) (const struct script_buf **scriptbuf, int **pos); typedef c_op (*HPMHOOK_post_script_get_com) (c_op retVal___, const struct script_buf *scriptbuf, int *pos); typedef int (*HPMHOOK_pre_script_get_num) (const struct script_buf **scriptbuf, int **pos); typedef int (*HPMHOOK_post_script_get_num) (int retVal___, const struct script_buf *scriptbuf, int *pos); -typedef const char* (*HPMHOOK_pre_script_op2name) (int *op); -typedef const char* (*HPMHOOK_post_script_op2name) (const char* retVal___, int op); +typedef const char * (*HPMHOOK_pre_script_op2name) (int *op); +typedef const char * (*HPMHOOK_post_script_op2name) (const char * retVal___, int op); typedef void (*HPMHOOK_pre_script_reportsrc) (struct script_state **st); typedef void (*HPMHOOK_post_script_reportsrc) (struct script_state *st); typedef void (*HPMHOOK_pre_script_reportdata) (struct script_data **data); @@ -8030,40 +8030,40 @@ typedef void (*HPMHOOK_pre_script_addl) (int *l); typedef void (*HPMHOOK_post_script_addl) (int l); typedef void (*HPMHOOK_pre_script_set_label) (int *l, int *pos, const char **script_pos); typedef void (*HPMHOOK_post_script_set_label) (int l, int pos, const char *script_pos); -typedef const char* (*HPMHOOK_pre_script_skip_word) (const char **p); -typedef const char* (*HPMHOOK_post_script_skip_word) (const char* retVal___, const char *p); +typedef const char * (*HPMHOOK_pre_script_skip_word) (const char **p); +typedef const char * (*HPMHOOK_post_script_skip_word) (const char * retVal___, const char *p); typedef int (*HPMHOOK_pre_script_add_word) (const char **p); typedef int (*HPMHOOK_post_script_add_word) (int retVal___, const char *p); -typedef const char* (*HPMHOOK_pre_script_parse_callfunc) (const char **p, int *require_paren, int *is_custom); -typedef const char* (*HPMHOOK_post_script_parse_callfunc) (const char* retVal___, const char *p, int require_paren, int is_custom); +typedef const char * (*HPMHOOK_pre_script_parse_callfunc) (const char **p, int *require_paren, int *is_custom); +typedef const char * (*HPMHOOK_post_script_parse_callfunc) (const char * retVal___, const char *p, int require_paren, int is_custom); typedef void (*HPMHOOK_pre_script_parse_nextline) (bool *first, const char **p); typedef void (*HPMHOOK_post_script_parse_nextline) (bool first, const char *p); -typedef const char* (*HPMHOOK_pre_script_parse_variable) (const char **p); -typedef const char* (*HPMHOOK_post_script_parse_variable) (const char* retVal___, const char *p); -typedef const char* (*HPMHOOK_pre_script_parse_simpleexpr) (const char **p); -typedef const char* (*HPMHOOK_post_script_parse_simpleexpr) (const char* retVal___, const char *p); -typedef const char* (*HPMHOOK_pre_script_parse_simpleexpr_paren) (const char **p); -typedef const char* (*HPMHOOK_post_script_parse_simpleexpr_paren) (const char* retVal___, const char *p); -typedef const char* (*HPMHOOK_pre_script_parse_simpleexpr_number) (const char **p); -typedef const char* (*HPMHOOK_post_script_parse_simpleexpr_number) (const char* retVal___, const char *p); -typedef const char* (*HPMHOOK_pre_script_parse_simpleexpr_string) (const char **p); -typedef const char* (*HPMHOOK_post_script_parse_simpleexpr_string) (const char* retVal___, const char *p); -typedef const char* (*HPMHOOK_pre_script_parse_simpleexpr_name) (const char **p); -typedef const char* (*HPMHOOK_post_script_parse_simpleexpr_name) (const char* retVal___, const char *p); +typedef const char * (*HPMHOOK_pre_script_parse_variable) (const char **p); +typedef const char * (*HPMHOOK_post_script_parse_variable) (const char * retVal___, const char *p); +typedef const char * (*HPMHOOK_pre_script_parse_simpleexpr) (const char **p); +typedef const char * (*HPMHOOK_post_script_parse_simpleexpr) (const char * retVal___, const char *p); +typedef const char * (*HPMHOOK_pre_script_parse_simpleexpr_paren) (const char **p); +typedef const char * (*HPMHOOK_post_script_parse_simpleexpr_paren) (const char * retVal___, const char *p); +typedef const char * (*HPMHOOK_pre_script_parse_simpleexpr_number) (const char **p); +typedef const char * (*HPMHOOK_post_script_parse_simpleexpr_number) (const char * retVal___, const char *p); +typedef const char * (*HPMHOOK_pre_script_parse_simpleexpr_string) (const char **p); +typedef const char * (*HPMHOOK_post_script_parse_simpleexpr_string) (const char * retVal___, const char *p); +typedef const char * (*HPMHOOK_pre_script_parse_simpleexpr_name) (const char **p); +typedef const char * (*HPMHOOK_post_script_parse_simpleexpr_name) (const char * retVal___, const char *p); typedef void (*HPMHOOK_pre_script_add_translatable_string) (const struct script_string_buf **string, const char **start_point); typedef void (*HPMHOOK_post_script_add_translatable_string) (const struct script_string_buf *string, const char *start_point); -typedef const char* (*HPMHOOK_pre_script_parse_expr) (const char **p); -typedef const char* (*HPMHOOK_post_script_parse_expr) (const char* retVal___, const char *p); -typedef const char* (*HPMHOOK_pre_script_parse_line) (const char **p); -typedef const char* (*HPMHOOK_post_script_parse_line) (const char* retVal___, const char *p); +typedef const char * (*HPMHOOK_pre_script_parse_expr) (const char **p); +typedef const char * (*HPMHOOK_post_script_parse_expr) (const char * retVal___, const char *p); +typedef const char * (*HPMHOOK_pre_script_parse_line) (const char **p); +typedef const char * (*HPMHOOK_post_script_parse_line) (const char * retVal___, const char *p); typedef void (*HPMHOOK_pre_script_read_constdb) (bool *reload); typedef void (*HPMHOOK_post_script_read_constdb) (bool reload); typedef void (*HPMHOOK_pre_script_constdb_comment) (const char **comment); typedef void (*HPMHOOK_post_script_constdb_comment) (const char *comment); typedef void (*HPMHOOK_pre_script_load_parameters) (void); typedef void (*HPMHOOK_post_script_load_parameters) (void); -typedef const char* (*HPMHOOK_pre_script_print_line) (StringBuf **buf, const char **p, const char **mark, int *line); -typedef const char* (*HPMHOOK_post_script_print_line) (const char* retVal___, StringBuf *buf, const char *p, const char *mark, int line); +typedef const char * (*HPMHOOK_pre_script_print_line) (StringBuf **buf, const char **p, const char **mark, int *line); +typedef const char * (*HPMHOOK_post_script_print_line) (const char * retVal___, StringBuf *buf, const char *p, const char *mark, int line); typedef void (*HPMHOOK_pre_script_errorwarning_sub) (StringBuf **buf, const char **src, const char **file, int *start_line, const char **error_msg, const char **error_pos); typedef void (*HPMHOOK_post_script_errorwarning_sub) (StringBuf *buf, const char *src, const char *file, int start_line, const char *error_msg, const char *error_pos); typedef bool (*HPMHOOK_pre_script_is_permanent_variable) (const char **name); @@ -8092,8 +8092,8 @@ typedef void (*HPMHOOK_pre_script_set_reg_instance_num) (struct script_state **s typedef void (*HPMHOOK_post_script_set_reg_instance_num) (struct script_state *st, int64 num, const char *name, int val); typedef void (*HPMHOOK_pre_script_stack_expand) (struct script_stack **stack); typedef void (*HPMHOOK_post_script_stack_expand) (struct script_stack *stack); -typedef struct script_data* (*HPMHOOK_pre_script_push_retinfo) (struct script_stack **stack, struct script_retinfo **ri, struct reg_db **ref); -typedef struct script_data* (*HPMHOOK_post_script_push_retinfo) (struct script_data* retVal___, struct script_stack *stack, struct script_retinfo *ri, struct reg_db *ref); +typedef struct script_data * (*HPMHOOK_pre_script_push_retinfo) (struct script_stack **stack, struct script_retinfo **ri, struct reg_db **ref); +typedef struct script_data * (*HPMHOOK_post_script_push_retinfo) (struct script_data * retVal___, struct script_stack *stack, struct script_retinfo *ri, struct reg_db *ref); typedef void (*HPMHOOK_pre_script_op_3) (struct script_state **st, int *op); typedef void (*HPMHOOK_post_script_op_3) (struct script_state *st, int op); typedef void (*HPMHOOK_pre_script_op_2str) (struct script_state **st, int *op, const char **s1, const char **s2); @@ -8174,12 +8174,12 @@ typedef int (*HPMHOOK_pre_script_run_func) (struct script_state **st); typedef int (*HPMHOOK_post_script_run_func) (int retVal___, struct script_state *st); typedef bool (*HPMHOOK_pre_script_sprintf_helper) (struct script_state **st, int *start, struct StringBuf **out); typedef bool (*HPMHOOK_post_script_sprintf_helper) (bool retVal___, struct script_state *st, int start, struct StringBuf *out); -typedef const char* (*HPMHOOK_pre_script_getfuncname) (struct script_state **st); -typedef const char* (*HPMHOOK_post_script_getfuncname) (const char* retVal___, struct script_state *st); +typedef const char * (*HPMHOOK_pre_script_getfuncname) (struct script_state **st); +typedef const char * (*HPMHOOK_post_script_getfuncname) (const char * retVal___, struct script_state *st); typedef unsigned int (*HPMHOOK_pre_script_calc_hash_ci) (const char **p); typedef unsigned int (*HPMHOOK_post_script_calc_hash_ci) (unsigned int retVal___, const char *p); -typedef struct reg_db* (*HPMHOOK_pre_script_array_src) (struct script_state **st, struct map_session_data **sd, const char **name, struct reg_db **ref); -typedef struct reg_db* (*HPMHOOK_post_script_array_src) (struct reg_db* retVal___, struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref); +typedef struct reg_db * (*HPMHOOK_pre_script_array_src) (struct script_state **st, struct map_session_data **sd, const char **name, struct reg_db **ref); +typedef struct reg_db * (*HPMHOOK_post_script_array_src) (struct reg_db * retVal___, struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref); typedef void (*HPMHOOK_pre_script_array_update) (struct reg_db **src, int64 *num, bool *empty); typedef void (*HPMHOOK_post_script_array_update) (struct reg_db *src, int64 num, bool empty); typedef void (*HPMHOOK_pre_script_array_delete) (struct reg_db **src, struct script_array **sa); @@ -8204,8 +8204,8 @@ typedef int (*HPMHOOK_pre_script_reg_destroy) (union DBKey *key, struct DBData * typedef int (*HPMHOOK_post_script_reg_destroy) (int retVal___, union DBKey key, struct DBData *data, va_list ap); typedef void (*HPMHOOK_pre_script_generic_ui_array_expand) (unsigned int *plus); typedef void (*HPMHOOK_post_script_generic_ui_array_expand) (unsigned int plus); -typedef unsigned int* (*HPMHOOK_pre_script_array_cpy_list) (struct script_array **sa); -typedef unsigned int* (*HPMHOOK_post_script_array_cpy_list) (unsigned int* retVal___, struct script_array *sa); +typedef unsigned int * (*HPMHOOK_pre_script_array_cpy_list) (struct script_array **sa); +typedef unsigned int * (*HPMHOOK_post_script_array_cpy_list) (unsigned int * retVal___, struct script_array *sa); typedef void (*HPMHOOK_pre_script_hardcoded_constants) (void); typedef void (*HPMHOOK_post_script_hardcoded_constants) (void); typedef unsigned short (*HPMHOOK_pre_script_mapindexname2id) (struct script_state **st, const char **name); @@ -8228,8 +8228,8 @@ typedef int (*HPMHOOK_pre_script_parse_cleanup_timer) (int *tid, int64 *tick, in typedef int (*HPMHOOK_post_script_parse_cleanup_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data); typedef uint8 (*HPMHOOK_pre_script_add_language) (const char **name); typedef uint8 (*HPMHOOK_post_script_add_language) (uint8 retVal___, const char *name); -typedef const char* (*HPMHOOK_pre_script_get_translation_dir_name) (const char **directory); -typedef const char* (*HPMHOOK_post_script_get_translation_dir_name) (const char* retVal___, const char *directory); +typedef const char * (*HPMHOOK_pre_script_get_translation_dir_name) (const char **directory); +typedef const char * (*HPMHOOK_post_script_get_translation_dir_name) (const char * retVal___, const char *directory); typedef void (*HPMHOOK_pre_script_parser_clean_leftovers) (void); typedef void (*HPMHOOK_post_script_parser_clean_leftovers) (void); typedef void (*HPMHOOK_pre_script_run_use_script) (struct map_session_data **sd, struct item_data **data, int *oid); @@ -8282,8 +8282,8 @@ typedef void (*HPMHOOK_pre_showmsg_clearScreen) (void); typedef void (*HPMHOOK_post_showmsg_clearScreen) (void); typedef int (*HPMHOOK_pre_showmsg_showMessageV) (const char **string, va_list ap); typedef int (*HPMHOOK_post_showmsg_showMessageV) (int retVal___, const char *string, va_list ap); -typedef const char* (*HPMHOOK_pre_showmsg_getLogFileName) (void); -typedef const char* (*HPMHOOK_post_showmsg_getLogFileName) (const char* retVal___); +typedef const char * (*HPMHOOK_pre_showmsg_getLogFileName) (void); +typedef const char * (*HPMHOOK_post_showmsg_getLogFileName) (const char * retVal___); #endif // COMMON_SHOWMSG_H #ifdef MAP_SKILL_H /* skill */ typedef int (*HPMHOOK_pre_skill_init) (bool *minimal); @@ -8398,10 +8398,10 @@ typedef int (*HPMHOOK_pre_skill_get_cooldown) (int *skill_id, int *skill_lv); typedef int (*HPMHOOK_post_skill_get_cooldown) (int retVal___, int skill_id, int skill_lv); typedef int (*HPMHOOK_pre_skill_tree_get_max) (int *skill_id, int *class); typedef int (*HPMHOOK_post_skill_tree_get_max) (int retVal___, int skill_id, int class); -typedef const char* (*HPMHOOK_pre_skill_get_name) (int *skill_id); -typedef const char* (*HPMHOOK_post_skill_get_name) (const char* retVal___, int skill_id); -typedef const char* (*HPMHOOK_pre_skill_get_desc) (int *skill_id); -typedef const char* (*HPMHOOK_post_skill_get_desc) (const char* retVal___, int skill_id); +typedef const char * (*HPMHOOK_pre_skill_get_name) (int *skill_id); +typedef const char * (*HPMHOOK_post_skill_get_name) (const char * retVal___, int skill_id); +typedef const char * (*HPMHOOK_pre_skill_get_desc) (int *skill_id); +typedef const char * (*HPMHOOK_post_skill_get_desc) (const char * retVal___, int skill_id); typedef int (*HPMHOOK_pre_skill_get_casttype) (int *skill_id); typedef int (*HPMHOOK_post_skill_get_casttype) (int retVal___, int skill_id); typedef int (*HPMHOOK_pre_skill_get_casttype2) (int *index); @@ -8434,16 +8434,16 @@ typedef int (*HPMHOOK_pre_skill_break_equip) (struct block_list **bl, unsigned s typedef int (*HPMHOOK_post_skill_break_equip) (int retVal___, struct block_list *bl, unsigned short where, int rate, int flag); typedef int (*HPMHOOK_pre_skill_strip_equip) (struct block_list **bl, unsigned short *where, int *rate, int *lv, int *time); typedef int (*HPMHOOK_post_skill_strip_equip) (int retVal___, struct block_list *bl, unsigned short where, int rate, int lv, int time); -typedef struct skill_unit_group* (*HPMHOOK_pre_skill_id2group) (int *group_id); -typedef struct skill_unit_group* (*HPMHOOK_post_skill_id2group) (struct skill_unit_group* retVal___, int group_id); -typedef struct skill_unit_group* (*HPMHOOK_pre_skill_unitsetting) (struct block_list **src, uint16 *skill_id, uint16 *skill_lv, short *x, short *y, int *flag); -typedef struct skill_unit_group* (*HPMHOOK_post_skill_unitsetting) (struct skill_unit_group* retVal___, struct block_list *src, uint16 skill_id, uint16 skill_lv, short x, short y, int flag); -typedef struct skill_unit* (*HPMHOOK_pre_skill_initunit) (struct skill_unit_group **group, int *idx, int *x, int *y, int *val1, int *val2); -typedef struct skill_unit* (*HPMHOOK_post_skill_initunit) (struct skill_unit* retVal___, struct skill_unit_group *group, int idx, int x, int y, int val1, int val2); +typedef struct skill_unit_group * (*HPMHOOK_pre_skill_id2group) (int *group_id); +typedef struct skill_unit_group * (*HPMHOOK_post_skill_id2group) (struct skill_unit_group * retVal___, int group_id); +typedef struct skill_unit_group * (*HPMHOOK_pre_skill_unitsetting) (struct block_list **src, uint16 *skill_id, uint16 *skill_lv, short *x, short *y, int *flag); +typedef struct skill_unit_group * (*HPMHOOK_post_skill_unitsetting) (struct skill_unit_group * retVal___, struct block_list *src, uint16 skill_id, uint16 skill_lv, short x, short y, int flag); +typedef struct skill_unit * (*HPMHOOK_pre_skill_initunit) (struct skill_unit_group **group, int *idx, int *x, int *y, int *val1, int *val2); +typedef struct skill_unit * (*HPMHOOK_post_skill_initunit) (struct skill_unit * retVal___, struct skill_unit_group *group, int idx, int x, int y, int val1, int val2); typedef int (*HPMHOOK_pre_skill_delunit) (struct skill_unit **su); typedef int (*HPMHOOK_post_skill_delunit) (int retVal___, struct skill_unit *su); -typedef struct skill_unit_group* (*HPMHOOK_pre_skill_init_unitgroup) (struct block_list **src, int *count, uint16 *skill_id, uint16 *skill_lv, int *unit_id, int *limit, int *interval); -typedef struct skill_unit_group* (*HPMHOOK_post_skill_init_unitgroup) (struct skill_unit_group* retVal___, struct block_list *src, int count, uint16 skill_id, uint16 skill_lv, int unit_id, int limit, int interval); +typedef struct skill_unit_group * (*HPMHOOK_pre_skill_init_unitgroup) (struct block_list **src, int *count, uint16 *skill_id, uint16 *skill_lv, int *unit_id, int *limit, int *interval); +typedef struct skill_unit_group * (*HPMHOOK_post_skill_init_unitgroup) (struct skill_unit_group * retVal___, struct block_list *src, int count, uint16 skill_id, uint16 skill_lv, int unit_id, int limit, int interval); typedef int (*HPMHOOK_pre_skill_del_unitgroup) (struct skill_unit_group **group); typedef int (*HPMHOOK_post_skill_del_unitgroup) (int retVal___, struct skill_unit_group *group); typedef int (*HPMHOOK_pre_skill_clear_unitgroup) (struct block_list **src); @@ -8582,8 +8582,8 @@ typedef int (*HPMHOOK_pre_skill_trap_splash) (struct block_list **bl, va_list ap typedef int (*HPMHOOK_post_skill_trap_splash) (int retVal___, struct block_list *bl, va_list ap); typedef int (*HPMHOOK_pre_skill_check_condition_mercenary) (struct block_list **bl, int *skill_id, int *lv, int *type); typedef int (*HPMHOOK_post_skill_check_condition_mercenary) (int retVal___, struct block_list *bl, int skill_id, int lv, int type); -typedef struct skill_unit_group* (*HPMHOOK_pre_skill_locate_element_field) (struct block_list **bl); -typedef struct skill_unit_group* (*HPMHOOK_post_skill_locate_element_field) (struct skill_unit_group* retVal___, struct block_list *bl); +typedef struct skill_unit_group * (*HPMHOOK_pre_skill_locate_element_field) (struct block_list **bl); +typedef struct skill_unit_group * (*HPMHOOK_post_skill_locate_element_field) (struct skill_unit_group * retVal___, struct block_list *bl); typedef int (*HPMHOOK_pre_skill_graffitiremover) (struct block_list **bl, va_list ap); typedef int (*HPMHOOK_post_skill_graffitiremover) (int retVal___, struct block_list *bl, va_list ap); typedef int (*HPMHOOK_pre_skill_activate_reverberation) (struct block_list **bl, va_list ap); @@ -8592,16 +8592,16 @@ typedef int (*HPMHOOK_pre_skill_dance_overlap_sub) (struct block_list **bl, va_l typedef int (*HPMHOOK_post_skill_dance_overlap_sub) (int retVal___, struct block_list *bl, va_list ap); typedef int (*HPMHOOK_pre_skill_dance_overlap) (struct skill_unit **su, int *flag); typedef int (*HPMHOOK_post_skill_dance_overlap) (int retVal___, struct skill_unit *su, int flag); -typedef struct s_skill_unit_layout* (*HPMHOOK_pre_skill_get_unit_layout) (uint16 *skill_id, uint16 *skill_lv, struct block_list **src, int *x, int *y); -typedef struct s_skill_unit_layout* (*HPMHOOK_post_skill_get_unit_layout) (struct s_skill_unit_layout* retVal___, uint16 skill_id, uint16 skill_lv, struct block_list *src, int x, int y); +typedef struct s_skill_unit_layout * (*HPMHOOK_pre_skill_get_unit_layout) (uint16 *skill_id, uint16 *skill_lv, struct block_list **src, int *x, int *y); +typedef struct s_skill_unit_layout * (*HPMHOOK_post_skill_get_unit_layout) (struct s_skill_unit_layout * retVal___, uint16 skill_id, uint16 skill_lv, struct block_list *src, int x, int y); typedef int (*HPMHOOK_pre_skill_frostjoke_scream) (struct block_list **bl, va_list ap); typedef int (*HPMHOOK_post_skill_frostjoke_scream) (int retVal___, struct block_list *bl, va_list ap); typedef int (*HPMHOOK_pre_skill_greed) (struct block_list **bl, va_list ap); typedef int (*HPMHOOK_post_skill_greed) (int retVal___, struct block_list *bl, va_list ap); typedef int (*HPMHOOK_pre_skill_destroy_trap) (struct block_list **bl, va_list ap); typedef int (*HPMHOOK_post_skill_destroy_trap) (int retVal___, struct block_list *bl, va_list ap); -typedef struct skill_unit_group_tickset* (*HPMHOOK_pre_skill_unitgrouptickset_search) (struct block_list **bl, struct skill_unit_group **group, int64 *tick); -typedef struct skill_unit_group_tickset* (*HPMHOOK_post_skill_unitgrouptickset_search) (struct skill_unit_group_tickset* retVal___, struct block_list *bl, struct skill_unit_group *group, int64 tick); +typedef struct skill_unit_group_tickset * (*HPMHOOK_pre_skill_unitgrouptickset_search) (struct block_list **bl, struct skill_unit_group **group, int64 *tick); +typedef struct skill_unit_group_tickset * (*HPMHOOK_post_skill_unitgrouptickset_search) (struct skill_unit_group_tickset * retVal___, struct block_list *bl, struct skill_unit_group *group, int64 tick); typedef bool (*HPMHOOK_pre_skill_dance_switch) (struct skill_unit **su, int *flag); typedef bool (*HPMHOOK_post_skill_dance_switch) (bool retVal___, struct skill_unit *su, int flag); typedef int (*HPMHOOK_pre_skill_check_condition_char_sub) (struct block_list **bl, va_list ap); @@ -8960,8 +8960,8 @@ typedef void (*HPMHOOK_pre_sockt_set_default_delete) (DeleteFunc *defaultdelete) typedef void (*HPMHOOK_post_sockt_set_default_delete) (DeleteFunc defaultdelete); typedef uint32 (*HPMHOOK_pre_sockt_host2ip) (const char **hostname); typedef uint32 (*HPMHOOK_post_sockt_host2ip) (uint32 retVal___, const char *hostname); -typedef const char* (*HPMHOOK_pre_sockt_ip2str) (uint32 *ip, char **ip_str); -typedef const char* (*HPMHOOK_post_sockt_ip2str) (const char* retVal___, uint32 ip, char *ip_str); +typedef const char * (*HPMHOOK_pre_sockt_ip2str) (uint32 *ip, char **ip_str); +typedef const char * (*HPMHOOK_post_sockt_ip2str) (const char * retVal___, uint32 ip, char *ip_str); typedef uint32 (*HPMHOOK_pre_sockt_str2ip) (const char **ip_str); typedef uint32 (*HPMHOOK_post_sockt_str2ip) (uint32 retVal___, const char *ip_str); typedef uint16 (*HPMHOOK_pre_sockt_ntows) (uint16 *netshort); @@ -9018,10 +9018,10 @@ typedef void (*HPMHOOK_pre_SQL_ShowDebug_) (struct Sql **self, const char **debu typedef void (*HPMHOOK_post_SQL_ShowDebug_) (struct Sql *self, const char *debug_file, const unsigned long debug_line); typedef void (*HPMHOOK_pre_SQL_Free) (struct Sql **self); typedef void (*HPMHOOK_post_SQL_Free) (struct Sql *self); -typedef struct Sql* (*HPMHOOK_pre_SQL_Malloc) (void); -typedef struct Sql* (*HPMHOOK_post_SQL_Malloc) (struct Sql* retVal___); -typedef struct SqlStmt* (*HPMHOOK_pre_SQL_StmtMalloc) (struct Sql **sql); -typedef struct SqlStmt* (*HPMHOOK_post_SQL_StmtMalloc) (struct SqlStmt* retVal___, struct Sql *sql); +typedef struct Sql * (*HPMHOOK_pre_SQL_Malloc) (void); +typedef struct Sql * (*HPMHOOK_post_SQL_Malloc) (struct Sql * retVal___); +typedef struct SqlStmt * (*HPMHOOK_pre_SQL_StmtMalloc) (struct Sql **sql); +typedef struct SqlStmt * (*HPMHOOK_post_SQL_StmtMalloc) (struct SqlStmt * retVal___, struct Sql *sql); typedef int (*HPMHOOK_pre_SQL_StmtPrepareV) (struct SqlStmt **self, const char **query, va_list args); typedef int (*HPMHOOK_post_SQL_StmtPrepareV) (int retVal___, struct SqlStmt *self, const char *query, va_list args); typedef int (*HPMHOOK_pre_SQL_StmtPrepareStr) (struct SqlStmt **self, const char **query); @@ -9080,14 +9080,14 @@ typedef int (*HPMHOOK_pre_status_revive) (struct block_list **bl, unsigned char typedef int (*HPMHOOK_post_status_revive) (int retVal___, struct block_list *bl, unsigned char per_hp, unsigned char per_sp); typedef int (*HPMHOOK_pre_status_fixed_revive) (struct block_list **bl, unsigned int *per_hp, unsigned int *per_sp); typedef int (*HPMHOOK_post_status_fixed_revive) (int retVal___, struct block_list *bl, unsigned int per_hp, unsigned int per_sp); -typedef struct regen_data* (*HPMHOOK_pre_status_get_regen_data) (struct block_list **bl); -typedef struct regen_data* (*HPMHOOK_post_status_get_regen_data) (struct regen_data* retVal___, struct block_list *bl); -typedef struct status_data* (*HPMHOOK_pre_status_get_status_data) (struct block_list **bl); -typedef struct status_data* (*HPMHOOK_post_status_get_status_data) (struct status_data* retVal___, struct block_list *bl); -typedef struct status_data* (*HPMHOOK_pre_status_get_base_status) (struct block_list **bl); -typedef struct status_data* (*HPMHOOK_post_status_get_base_status) (struct status_data* retVal___, struct block_list *bl); -typedef const char* (*HPMHOOK_pre_status_get_name) (const struct block_list **bl); -typedef const char* (*HPMHOOK_post_status_get_name) (const char* retVal___, const struct block_list *bl); +typedef struct regen_data * (*HPMHOOK_pre_status_get_regen_data) (struct block_list **bl); +typedef struct regen_data * (*HPMHOOK_post_status_get_regen_data) (struct regen_data * retVal___, struct block_list *bl); +typedef struct status_data * (*HPMHOOK_pre_status_get_status_data) (struct block_list **bl); +typedef struct status_data * (*HPMHOOK_post_status_get_status_data) (struct status_data * retVal___, struct block_list *bl); +typedef struct status_data * (*HPMHOOK_pre_status_get_base_status) (struct block_list **bl); +typedef struct status_data * (*HPMHOOK_post_status_get_base_status) (struct status_data * retVal___, struct block_list *bl); +typedef const char * (*HPMHOOK_pre_status_get_name) (const struct block_list **bl); +typedef const char * (*HPMHOOK_post_status_get_name) (const char * retVal___, const struct block_list *bl); typedef int (*HPMHOOK_pre_status_get_class) (const struct block_list **bl); typedef int (*HPMHOOK_post_status_get_class) (int retVal___, const struct block_list *bl); typedef int (*HPMHOOK_pre_status_get_lv) (const struct block_list **bl); @@ -9110,14 +9110,14 @@ typedef int (*HPMHOOK_pre_status_get_mexp) (const struct block_list **bl); typedef int (*HPMHOOK_post_status_get_mexp) (int retVal___, const struct block_list *bl); typedef int (*HPMHOOK_pre_status_get_race2) (const struct block_list **bl); typedef int (*HPMHOOK_post_status_get_race2) (int retVal___, const struct block_list *bl); -typedef struct view_data* (*HPMHOOK_pre_status_get_viewdata) (struct block_list **bl); -typedef struct view_data* (*HPMHOOK_post_status_get_viewdata) (struct view_data* retVal___, struct block_list *bl); +typedef struct view_data * (*HPMHOOK_pre_status_get_viewdata) (struct block_list **bl); +typedef struct view_data * (*HPMHOOK_post_status_get_viewdata) (struct view_data * retVal___, struct block_list *bl); typedef void (*HPMHOOK_pre_status_set_viewdata) (struct block_list **bl, int *class_); typedef void (*HPMHOOK_post_status_set_viewdata) (struct block_list *bl, int class_); typedef void (*HPMHOOK_pre_status_change_init) (struct block_list **bl); typedef void (*HPMHOOK_post_status_change_init) (struct block_list *bl); -typedef struct status_change* (*HPMHOOK_pre_status_get_sc) (struct block_list **bl); -typedef struct status_change* (*HPMHOOK_post_status_get_sc) (struct status_change* retVal___, struct block_list *bl); +typedef struct status_change * (*HPMHOOK_pre_status_get_sc) (struct block_list **bl); +typedef struct status_change * (*HPMHOOK_post_status_get_sc) (struct status_change * retVal___, struct block_list *bl); typedef int (*HPMHOOK_pre_status_isdead) (struct block_list **bl); typedef int (*HPMHOOK_post_status_isdead) (int retVal___, struct block_list *bl); typedef int (*HPMHOOK_pre_status_isimmune) (struct block_list **bl); @@ -9236,8 +9236,8 @@ typedef int (*HPMHOOK_pre_status_base_atk) (const struct block_list **bl, const typedef int (*HPMHOOK_post_status_base_atk) (int retVal___, const struct block_list *bl, const struct status_data *st); typedef unsigned int (*HPMHOOK_pre_status_get_base_maxhp) (const struct map_session_data **sd, const struct status_data **st); typedef unsigned int (*HPMHOOK_post_status_get_base_maxhp) (unsigned int retVal___, const struct map_session_data *sd, const struct status_data *st); -typedef struct s_maxhp_entry* (*HPMHOOK_pre_status_get_maxhp_cap_entry) (int *classidx, int *level); -typedef struct s_maxhp_entry* (*HPMHOOK_post_status_get_maxhp_cap_entry) (struct s_maxhp_entry* retVal___, int classidx, int level); +typedef struct s_maxhp_entry * (*HPMHOOK_pre_status_get_maxhp_cap_entry) (int *classidx, int *level); +typedef struct s_maxhp_entry * (*HPMHOOK_post_status_get_maxhp_cap_entry) (struct s_maxhp_entry * retVal___, int classidx, int level); typedef unsigned int (*HPMHOOK_pre_status_get_base_maxsp) (const struct map_session_data **sd, const struct status_data **st); typedef unsigned int (*HPMHOOK_post_status_get_base_maxsp) (unsigned int retVal___, const struct map_session_data *sd, const struct status_data *st); typedef unsigned int (*HPMHOOK_pre_status_get_restart_hp) (const struct map_session_data **sd, const struct status_data **st); @@ -9358,22 +9358,36 @@ typedef void (*HPMHOOK_pre_status_check_job_bonus) (int *idx, const char **name, typedef void (*HPMHOOK_post_status_check_job_bonus) (int idx, const char *name, int class); #endif // MAP_STATUS_H #ifdef MAP_STORAGE_H /* storage */ +typedef void (*HPMHOOK_pre_storage_init) (bool *minimal); +typedef void (*HPMHOOK_post_storage_init) (bool minimal); +typedef void (*HPMHOOK_pre_storage_final) (void); +typedef void (*HPMHOOK_post_storage_final) (void); typedef void (*HPMHOOK_pre_storage_reconnect) (void); typedef void (*HPMHOOK_post_storage_reconnect) (void); -typedef int (*HPMHOOK_pre_storage_delitem) (struct map_session_data **sd, int *n, int *amount); -typedef int (*HPMHOOK_post_storage_delitem) (int retVal___, struct map_session_data *sd, int n, int amount); -typedef int (*HPMHOOK_pre_storage_open) (struct map_session_data **sd); -typedef int (*HPMHOOK_post_storage_open) (int retVal___, struct map_session_data *sd); -typedef int (*HPMHOOK_pre_storage_add) (struct map_session_data **sd, int *index, int *amount); -typedef int (*HPMHOOK_post_storage_add) (int retVal___, struct map_session_data *sd, int index, int amount); -typedef int (*HPMHOOK_pre_storage_get) (struct map_session_data **sd, int *index, int *amount); -typedef int (*HPMHOOK_post_storage_get) (int retVal___, struct map_session_data *sd, int index, int amount); -typedef int (*HPMHOOK_pre_storage_additem) (struct map_session_data **sd, struct item **item_data, int *amount); -typedef int (*HPMHOOK_post_storage_additem) (int retVal___, struct map_session_data *sd, struct item *item_data, int amount); -typedef int (*HPMHOOK_pre_storage_addfromcart) (struct map_session_data **sd, int *index, int *amount); -typedef int (*HPMHOOK_post_storage_addfromcart) (int retVal___, struct map_session_data *sd, int index, int amount); -typedef int (*HPMHOOK_pre_storage_gettocart) (struct map_session_data **sd, int *index, int *amount); -typedef int (*HPMHOOK_post_storage_gettocart) (int retVal___, struct map_session_data *sd, int index, int amount); +typedef bool (*HPMHOOK_pre_storage_config_read) (const char **filename, bool *imported); +typedef bool (*HPMHOOK_post_storage_config_read) (bool retVal___, const char *filename, bool imported); +typedef void (*HPMHOOK_pre_storage_config_read_additional_fields) (struct config_setting_t **t, struct storage_settings **s_conf, const char **filename); +typedef void (*HPMHOOK_post_storage_config_read_additional_fields) (struct config_setting_t *t, struct storage_settings *s_conf, const char *filename); +typedef int (*HPMHOOK_pre_storage_get_id_by_name) (const char **storage_name); +typedef int (*HPMHOOK_post_storage_get_id_by_name) (int retVal___, const char *storage_name); +typedef struct storage_data * (*HPMHOOK_pre_storage_ensure) (struct map_session_data **sd, int *storage_id); +typedef struct storage_data * (*HPMHOOK_post_storage_ensure) (struct storage_data * retVal___, struct map_session_data *sd, int storage_id); +typedef const struct storage_settings * (*HPMHOOK_pre_storage_get_settings) (int *storage_id); +typedef const struct storage_settings * (*HPMHOOK_post_storage_get_settings) (const struct storage_settings * retVal___, int storage_id); +typedef int (*HPMHOOK_pre_storage_delitem) (struct map_session_data **sd, struct storage_data **stor, int *n, int *amount); +typedef int (*HPMHOOK_post_storage_delitem) (int retVal___, struct map_session_data *sd, struct storage_data *stor, int n, int amount); +typedef int (*HPMHOOK_pre_storage_open) (struct map_session_data **sd, struct storage_data **stor, enum storage_access_modes *mode); +typedef int (*HPMHOOK_post_storage_open) (int retVal___, struct map_session_data *sd, struct storage_data *stor, enum storage_access_modes mode); +typedef int (*HPMHOOK_pre_storage_add) (struct map_session_data **sd, struct storage_data **stor, int *index, int *amount); +typedef int (*HPMHOOK_post_storage_add) (int retVal___, struct map_session_data *sd, struct storage_data *stor, int index, int amount); +typedef int (*HPMHOOK_pre_storage_get) (struct map_session_data **sd, struct storage_data **stor, int *index, int *amount); +typedef int (*HPMHOOK_post_storage_get) (int retVal___, struct map_session_data *sd, struct storage_data *stor, int index, int amount); +typedef int (*HPMHOOK_pre_storage_additem) (struct map_session_data **sd, struct storage_data **stor, struct item **item_data, int *amount); +typedef int (*HPMHOOK_post_storage_additem) (int retVal___, struct map_session_data *sd, struct storage_data *stor, struct item *item_data, int amount); +typedef int (*HPMHOOK_pre_storage_addfromcart) (struct map_session_data **sd, struct storage_data **stor, int *index, int *amount); +typedef int (*HPMHOOK_post_storage_addfromcart) (int retVal___, struct map_session_data *sd, struct storage_data *stor, int index, int amount); +typedef int (*HPMHOOK_pre_storage_gettocart) (struct map_session_data **sd, struct storage_data **stor, int *index, int *amount); +typedef int (*HPMHOOK_post_storage_gettocart) (int retVal___, struct map_session_data *sd, struct storage_data *stor, int index, int amount); typedef void (*HPMHOOK_pre_storage_close) (struct map_session_data **sd); typedef void (*HPMHOOK_post_storage_close) (struct map_session_data *sd); typedef void (*HPMHOOK_pre_storage_pc_quit) (struct map_session_data **sd, int *flag); @@ -9386,8 +9400,8 @@ typedef int (*HPMHOOK_pre_storage_reconnect_sub) (union DBKey *key, struct DBDat typedef int (*HPMHOOK_post_storage_reconnect_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap); #endif // MAP_STORAGE_H #ifdef COMMON_STRLIB_H /* StrBuf */ -typedef StringBuf* (*HPMHOOK_pre_StrBuf_Malloc) (void); -typedef StringBuf* (*HPMHOOK_post_StrBuf_Malloc) (StringBuf* retVal___); +typedef StringBuf * (*HPMHOOK_pre_StrBuf_Malloc) (void); +typedef StringBuf * (*HPMHOOK_post_StrBuf_Malloc) (StringBuf * retVal___); typedef void (*HPMHOOK_pre_StrBuf_Init) (StringBuf **self); typedef void (*HPMHOOK_post_StrBuf_Init) (StringBuf *self); typedef int (*HPMHOOK_pre_StrBuf_Vprintf) (StringBuf **self, const char **fmt, va_list args); @@ -9398,8 +9412,8 @@ typedef int (*HPMHOOK_pre_StrBuf_AppendStr) (StringBuf **self, const char **str) typedef int (*HPMHOOK_post_StrBuf_AppendStr) (int retVal___, StringBuf *self, const char *str); typedef int (*HPMHOOK_pre_StrBuf_Length) (StringBuf **self); typedef int (*HPMHOOK_post_StrBuf_Length) (int retVal___, StringBuf *self); -typedef char* (*HPMHOOK_pre_StrBuf_Value) (StringBuf **self); -typedef char* (*HPMHOOK_post_StrBuf_Value) (char* retVal___, StringBuf *self); +typedef char * (*HPMHOOK_pre_StrBuf_Value) (StringBuf **self); +typedef char * (*HPMHOOK_post_StrBuf_Value) (char * retVal___, StringBuf *self); typedef void (*HPMHOOK_pre_StrBuf_Clear) (StringBuf **self); typedef void (*HPMHOOK_post_StrBuf_Clear) (StringBuf *self); typedef void (*HPMHOOK_pre_StrBuf_Destroy) (StringBuf **self); @@ -9408,30 +9422,30 @@ typedef void (*HPMHOOK_pre_StrBuf_Free) (StringBuf **self); typedef void (*HPMHOOK_post_StrBuf_Free) (StringBuf *self); #endif // COMMON_STRLIB_H #ifdef COMMON_STRLIB_H /* strlib */ -typedef char* (*HPMHOOK_pre_strlib_jstrescape) (char **pt); -typedef char* (*HPMHOOK_post_strlib_jstrescape) (char* retVal___, char *pt); -typedef char* (*HPMHOOK_pre_strlib_jstrescapecpy) (char **pt, const char **spt); -typedef char* (*HPMHOOK_post_strlib_jstrescapecpy) (char* retVal___, char *pt, const char *spt); +typedef char * (*HPMHOOK_pre_strlib_jstrescape) (char **pt); +typedef char * (*HPMHOOK_post_strlib_jstrescape) (char * retVal___, char *pt); +typedef char * (*HPMHOOK_pre_strlib_jstrescapecpy) (char **pt, const char **spt); +typedef char * (*HPMHOOK_post_strlib_jstrescapecpy) (char * retVal___, char *pt, const char *spt); typedef int (*HPMHOOK_pre_strlib_jmemescapecpy) (char **pt, const char **spt, int *size); typedef int (*HPMHOOK_post_strlib_jmemescapecpy) (int retVal___, char *pt, const char *spt, int size); typedef int (*HPMHOOK_pre_strlib_remove_control_chars_) (char **str); typedef int (*HPMHOOK_post_strlib_remove_control_chars_) (int retVal___, char *str); -typedef char* (*HPMHOOK_pre_strlib_trim_) (char **str); -typedef char* (*HPMHOOK_post_strlib_trim_) (char* retVal___, char *str); -typedef char* (*HPMHOOK_pre_strlib_normalize_name_) (char **str, const char **delims); -typedef char* (*HPMHOOK_post_strlib_normalize_name_) (char* retVal___, char *str, const char *delims); -typedef const char* (*HPMHOOK_pre_strlib_stristr_) (const char **haystack, const char **needle); -typedef const char* (*HPMHOOK_post_strlib_stristr_) (const char* retVal___, const char *haystack, const char *needle); +typedef char * (*HPMHOOK_pre_strlib_trim_) (char **str); +typedef char * (*HPMHOOK_post_strlib_trim_) (char * retVal___, char *str); +typedef char * (*HPMHOOK_pre_strlib_normalize_name_) (char **str, const char **delims); +typedef char * (*HPMHOOK_post_strlib_normalize_name_) (char * retVal___, char *str, const char *delims); +typedef const char * (*HPMHOOK_pre_strlib_stristr_) (const char **haystack, const char **needle); +typedef const char * (*HPMHOOK_post_strlib_stristr_) (const char * retVal___, const char *haystack, const char *needle); typedef size_t (*HPMHOOK_pre_strlib_strnlen_) (const char **string, size_t *maxlen); typedef size_t (*HPMHOOK_post_strlib_strnlen_) (size_t retVal___, const char *string, size_t maxlen); -typedef char* (*HPMHOOK_pre_strlib_strtok_r_) (char **s1, const char **s2, char ***lasts); -typedef char* (*HPMHOOK_post_strlib_strtok_r_) (char* retVal___, char *s1, const char *s2, char **lasts); +typedef char * (*HPMHOOK_pre_strlib_strtok_r_) (char **s1, const char **s2, char ***lasts); +typedef char * (*HPMHOOK_post_strlib_strtok_r_) (char * retVal___, char *s1, const char *s2, char **lasts); typedef int (*HPMHOOK_pre_strlib_e_mail_check_) (char **email); typedef int (*HPMHOOK_post_strlib_e_mail_check_) (int retVal___, char *email); typedef int (*HPMHOOK_pre_strlib_config_switch_) (const char **str); typedef int (*HPMHOOK_post_strlib_config_switch_) (int retVal___, const char *str); -typedef char* (*HPMHOOK_pre_strlib_safestrncpy_) (char **dst, const char **src, size_t *n); -typedef char* (*HPMHOOK_post_strlib_safestrncpy_) (char* retVal___, char *dst, const char *src, size_t n); +typedef char * (*HPMHOOK_pre_strlib_safestrncpy_) (char **dst, const char **src, size_t *n); +typedef char * (*HPMHOOK_post_strlib_safestrncpy_) (char * retVal___, char *dst, const char *src, size_t n); typedef size_t (*HPMHOOK_pre_strlib_safestrnlen_) (const char **string, size_t *maxlen); typedef size_t (*HPMHOOK_post_strlib_safestrnlen_) (size_t retVal___, const char *string, size_t maxlen); typedef int (*HPMHOOK_pre_strlib_strline_) (const char **str, size_t *pos); @@ -9470,40 +9484,40 @@ typedef size_t (*HPMHOOK_pre_sv_escape_c) (char **out_dest, const char **src, si typedef size_t (*HPMHOOK_post_sv_escape_c) (size_t retVal___, char *out_dest, const char *src, size_t len, const char *escapes); typedef size_t (*HPMHOOK_pre_sv_unescape_c) (char **out_dest, const char **src, size_t *len); typedef size_t (*HPMHOOK_post_sv_unescape_c) (size_t retVal___, char *out_dest, const char *src, size_t len); -typedef const char* (*HPMHOOK_pre_sv_skip_escaped_c) (const char **p); -typedef const char* (*HPMHOOK_post_sv_skip_escaped_c) (const char* retVal___, const char *p); +typedef const char * (*HPMHOOK_pre_sv_skip_escaped_c) (const char **p); +typedef const char * (*HPMHOOK_post_sv_skip_escaped_c) (const char * retVal___, const char *p); typedef bool (*HPMHOOK_pre_sv_readdb) (const char **directory, const char **filename, char *delim, int *mincols, int *maxcols, int *maxrows, bool ( **parseproc ) (char *fields[], int columns, int current)); typedef bool (*HPMHOOK_post_sv_readdb) (bool retVal___, const char *directory, const char *filename, char delim, int mincols, int maxcols, int maxrows, bool ( *parseproc ) (char *fields[], int columns, int current)); #endif // COMMON_STRLIB_H #ifdef COMMON_SYSINFO_H /* sysinfo */ typedef long (*HPMHOOK_pre_sysinfo_getpagesize) (void); typedef long (*HPMHOOK_post_sysinfo_getpagesize) (long retVal___); -typedef const char* (*HPMHOOK_pre_sysinfo_platform) (void); -typedef const char* (*HPMHOOK_post_sysinfo_platform) (const char* retVal___); -typedef const char* (*HPMHOOK_pre_sysinfo_osversion) (void); -typedef const char* (*HPMHOOK_post_sysinfo_osversion) (const char* retVal___); -typedef const char* (*HPMHOOK_pre_sysinfo_cpu) (void); -typedef const char* (*HPMHOOK_post_sysinfo_cpu) (const char* retVal___); +typedef const char * (*HPMHOOK_pre_sysinfo_platform) (void); +typedef const char * (*HPMHOOK_post_sysinfo_platform) (const char * retVal___); +typedef const char * (*HPMHOOK_pre_sysinfo_osversion) (void); +typedef const char * (*HPMHOOK_post_sysinfo_osversion) (const char * retVal___); +typedef const char * (*HPMHOOK_pre_sysinfo_cpu) (void); +typedef const char * (*HPMHOOK_post_sysinfo_cpu) (const char * retVal___); typedef int (*HPMHOOK_pre_sysinfo_cpucores) (void); typedef int (*HPMHOOK_post_sysinfo_cpucores) (int retVal___); -typedef const char* (*HPMHOOK_pre_sysinfo_arch) (void); -typedef const char* (*HPMHOOK_post_sysinfo_arch) (const char* retVal___); +typedef const char * (*HPMHOOK_pre_sysinfo_arch) (void); +typedef const char * (*HPMHOOK_post_sysinfo_arch) (const char * retVal___); typedef bool (*HPMHOOK_pre_sysinfo_is64bit) (void); typedef bool (*HPMHOOK_post_sysinfo_is64bit) (bool retVal___); -typedef const char* (*HPMHOOK_pre_sysinfo_compiler) (void); -typedef const char* (*HPMHOOK_post_sysinfo_compiler) (const char* retVal___); -typedef const char* (*HPMHOOK_pre_sysinfo_cflags) (void); -typedef const char* (*HPMHOOK_post_sysinfo_cflags) (const char* retVal___); -typedef const char* (*HPMHOOK_pre_sysinfo_time) (void); -typedef const char* (*HPMHOOK_post_sysinfo_time) (const char* retVal___); -typedef const char* (*HPMHOOK_pre_sysinfo_vcstype) (void); -typedef const char* (*HPMHOOK_post_sysinfo_vcstype) (const char* retVal___); +typedef const char * (*HPMHOOK_pre_sysinfo_compiler) (void); +typedef const char * (*HPMHOOK_post_sysinfo_compiler) (const char * retVal___); +typedef const char * (*HPMHOOK_pre_sysinfo_cflags) (void); +typedef const char * (*HPMHOOK_post_sysinfo_cflags) (const char * retVal___); +typedef const char * (*HPMHOOK_pre_sysinfo_time) (void); +typedef const char * (*HPMHOOK_post_sysinfo_time) (const char * retVal___); +typedef const char * (*HPMHOOK_pre_sysinfo_vcstype) (void); +typedef const char * (*HPMHOOK_post_sysinfo_vcstype) (const char * retVal___); typedef int (*HPMHOOK_pre_sysinfo_vcstypeid) (void); typedef int (*HPMHOOK_post_sysinfo_vcstypeid) (int retVal___); -typedef const char* (*HPMHOOK_pre_sysinfo_vcsrevision_src) (void); -typedef const char* (*HPMHOOK_post_sysinfo_vcsrevision_src) (const char* retVal___); -typedef const char* (*HPMHOOK_pre_sysinfo_vcsrevision_scripts) (void); -typedef const char* (*HPMHOOK_post_sysinfo_vcsrevision_scripts) (const char* retVal___); +typedef const char * (*HPMHOOK_pre_sysinfo_vcsrevision_src) (void); +typedef const char * (*HPMHOOK_post_sysinfo_vcsrevision_src) (const char * retVal___); +typedef const char * (*HPMHOOK_pre_sysinfo_vcsrevision_scripts) (void); +typedef const char * (*HPMHOOK_post_sysinfo_vcsrevision_scripts) (const char * retVal___); typedef int (*HPMHOOK_pre_sysinfo_build_revision) (void); typedef int (*HPMHOOK_post_sysinfo_build_revision) (int retVal___); typedef uint32 (*HPMHOOK_pre_sysinfo_fflags) (void); @@ -9512,8 +9526,8 @@ typedef void (*HPMHOOK_pre_sysinfo_vcsrevision_reload) (void); typedef void (*HPMHOOK_post_sysinfo_vcsrevision_reload) (void); typedef bool (*HPMHOOK_pre_sysinfo_is_superuser) (void); typedef bool (*HPMHOOK_post_sysinfo_is_superuser) (bool retVal___); -typedef const char* (*HPMHOOK_pre_sysinfo_zlib) (void); -typedef const char* (*HPMHOOK_post_sysinfo_zlib) (const char* retVal___); +typedef const char * (*HPMHOOK_pre_sysinfo_zlib) (void); +typedef const char * (*HPMHOOK_post_sysinfo_zlib) (const char * retVal___); typedef void (*HPMHOOK_pre_sysinfo_init) (void); typedef void (*HPMHOOK_post_sysinfo_init) (void); typedef void (*HPMHOOK_pre_sysinfo_final) (void); @@ -9524,14 +9538,14 @@ typedef void (*HPMHOOK_pre_thread_init) (void); typedef void (*HPMHOOK_post_thread_init) (void); typedef void (*HPMHOOK_pre_thread_final) (void); typedef void (*HPMHOOK_post_thread_final) (void); -typedef struct thread_handle* (*HPMHOOK_pre_thread_create) (threadFunc *entry_point, void **param); -typedef struct thread_handle* (*HPMHOOK_post_thread_create) (struct thread_handle* retVal___, threadFunc entry_point, void *param); -typedef struct thread_handle* (*HPMHOOK_pre_thread_create_opt) (threadFunc *entry_point, void **param, size_t *stack_size, enum thread_priority *prio); -typedef struct thread_handle* (*HPMHOOK_post_thread_create_opt) (struct thread_handle* retVal___, threadFunc entry_point, void *param, size_t stack_size, enum thread_priority prio); +typedef struct thread_handle * (*HPMHOOK_pre_thread_create) (threadFunc *entry_point, void **param); +typedef struct thread_handle * (*HPMHOOK_post_thread_create) (struct thread_handle * retVal___, threadFunc entry_point, void *param); +typedef struct thread_handle * (*HPMHOOK_pre_thread_create_opt) (threadFunc *entry_point, void **param, size_t *stack_size, enum thread_priority *prio); +typedef struct thread_handle * (*HPMHOOK_post_thread_create_opt) (struct thread_handle * retVal___, threadFunc entry_point, void *param, size_t stack_size, enum thread_priority prio); typedef void (*HPMHOOK_pre_thread_destroy) (struct thread_handle **handle); typedef void (*HPMHOOK_post_thread_destroy) (struct thread_handle *handle); -typedef struct thread_handle* (*HPMHOOK_pre_thread_self) (void); -typedef struct thread_handle* (*HPMHOOK_post_thread_self) (struct thread_handle* retVal___); +typedef struct thread_handle * (*HPMHOOK_pre_thread_self) (void); +typedef struct thread_handle * (*HPMHOOK_post_thread_self) (struct thread_handle * retVal___); typedef int (*HPMHOOK_pre_thread_get_tid) (void); typedef int (*HPMHOOK_post_thread_get_tid) (int retVal___); typedef bool (*HPMHOOK_pre_thread_wait) (struct thread_handle **handle, void ***out_exit_code); @@ -9552,8 +9566,8 @@ typedef int (*HPMHOOK_pre_timer_add) (int64 *tick, TimerFunc *func, int *id, int typedef int (*HPMHOOK_post_timer_add) (int retVal___, int64 tick, TimerFunc func, int id, intptr_t data); typedef int (*HPMHOOK_pre_timer_add_interval) (int64 *tick, TimerFunc *func, int *id, intptr_t *data, int *interval); typedef int (*HPMHOOK_post_timer_add_interval) (int retVal___, int64 tick, TimerFunc func, int id, intptr_t data, int interval); -typedef const struct TimerData* (*HPMHOOK_pre_timer_get) (int *tid); -typedef const struct TimerData* (*HPMHOOK_post_timer_get) (const struct TimerData* retVal___, int tid); +typedef const struct TimerData * (*HPMHOOK_pre_timer_get) (int *tid); +typedef const struct TimerData * (*HPMHOOK_post_timer_get) (const struct TimerData * retVal___, int tid); typedef int (*HPMHOOK_pre_timer_delete) (int *tid, TimerFunc *func); typedef int (*HPMHOOK_post_timer_delete) (int retVal___, int tid, TimerFunc func); typedef int64 (*HPMHOOK_pre_timer_addtick) (int *tid, int64 *tick); @@ -9602,12 +9616,12 @@ typedef int (*HPMHOOK_pre_unit_init) (bool *minimal); typedef int (*HPMHOOK_post_unit_init) (int retVal___, bool minimal); typedef int (*HPMHOOK_pre_unit_final) (void); typedef int (*HPMHOOK_post_unit_final) (int retVal___); -typedef struct unit_data* (*HPMHOOK_pre_unit_bl2ud) (struct block_list **bl); -typedef struct unit_data* (*HPMHOOK_post_unit_bl2ud) (struct unit_data* retVal___, struct block_list *bl); -typedef const struct unit_data* (*HPMHOOK_pre_unit_cbl2ud) (const struct block_list **bl); -typedef const struct unit_data* (*HPMHOOK_post_unit_cbl2ud) (const struct unit_data* retVal___, const struct block_list *bl); -typedef struct unit_data* (*HPMHOOK_pre_unit_bl2ud2) (struct block_list **bl); -typedef struct unit_data* (*HPMHOOK_post_unit_bl2ud2) (struct unit_data* retVal___, struct block_list *bl); +typedef struct unit_data * (*HPMHOOK_pre_unit_bl2ud) (struct block_list **bl); +typedef struct unit_data * (*HPMHOOK_post_unit_bl2ud) (struct unit_data * retVal___, struct block_list *bl); +typedef const struct unit_data * (*HPMHOOK_pre_unit_cbl2ud) (const struct block_list **bl); +typedef const struct unit_data * (*HPMHOOK_post_unit_cbl2ud) (const struct unit_data * retVal___, const struct block_list *bl); +typedef struct unit_data * (*HPMHOOK_pre_unit_bl2ud2) (struct block_list **bl); +typedef struct unit_data * (*HPMHOOK_post_unit_bl2ud2) (struct unit_data * retVal___, struct block_list *bl); typedef void (*HPMHOOK_pre_unit_init_ud) (struct unit_data **ud); typedef void (*HPMHOOK_post_unit_init_ud) (struct unit_data *ud); typedef int (*HPMHOOK_pre_unit_attack_timer) (int *tid, int64 *tick, int *id, intptr_t *data); diff --git a/src/plugins/HPMHooking/HPMHooking_api.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_api.Hooks.inc index cb3abb3bf71..fdb4f73de88 100644 --- a/src/plugins/HPMHooking/HPMHooking_api.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_api.Hooks.inc @@ -79,11 +79,11 @@ bool HP_HCache_check(const char *file) { } return retVal___; } -FILE* HP_HCache_open(const char *file, const char *opt) { +FILE * HP_HCache_open(const char *file, const char *opt) { int hIndex = 0; - FILE* retVal___ = NULL; + FILE * retVal___ = NULL; if (HPMHooks.count.HP_HCache_open_pre > 0) { - FILE* (*preHookFunc) (const char **file, const char **opt); + FILE * (*preHookFunc) (const char **file, const char **opt); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_HCache_open_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_HCache_open_pre[hIndex].func; @@ -98,7 +98,7 @@ FILE* HP_HCache_open(const char *file, const char *opt) { retVal___ = HPMHooks.source.HCache.open(file, opt); } if (HPMHooks.count.HP_HCache_open_post > 0) { - FILE* (*postHookFunc) (FILE* retVal___, const char *file, const char *opt); + FILE * (*postHookFunc) (FILE * retVal___, const char *file, const char *opt); for (hIndex = 0; hIndex < HPMHooks.count.HP_HCache_open_post; hIndex++) { postHookFunc = HPMHooks.list.HP_HCache_open_post[hIndex].func; retVal___ = postHookFunc(retVal___, file, opt); @@ -1643,11 +1643,11 @@ void HP_aclif_remove_remove_timer(struct online_api_login_data *data) { } return; } -const char* HP_aclif_get_first_world_name(void) { +const char * HP_aclif_get_first_world_name(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_aclif_get_first_world_name_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_aclif_get_first_world_name_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_aclif_get_first_world_name_pre[hIndex].func; @@ -1662,7 +1662,7 @@ const char* HP_aclif_get_first_world_name(void) { retVal___ = HPMHooks.source.aclif.get_first_world_name(); } if (HPMHooks.count.HP_aclif_get_first_world_name_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_aclif_get_first_world_name_post; hIndex++) { postHookFunc = HPMHooks.list.HP_aclif_get_first_world_name_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -2683,11 +2683,11 @@ bool HP_cmdline_arg_next_value(const char *name, int current_arg, int argc) { } return retVal___; } -const char* HP_cmdline_arg_source(struct CmdlineArgData *arg) { +const char * HP_cmdline_arg_source(struct CmdlineArgData *arg) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_cmdline_arg_source_pre > 0) { - const char* (*preHookFunc) (struct CmdlineArgData **arg); + const char * (*preHookFunc) (struct CmdlineArgData **arg); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_source_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_cmdline_arg_source_pre[hIndex].func; @@ -2702,7 +2702,7 @@ const char* HP_cmdline_arg_source(struct CmdlineArgData *arg) { retVal___ = HPMHooks.source.cmdline.arg_source(arg); } if (HPMHooks.count.HP_cmdline_arg_source_post > 0) { - const char* (*postHookFunc) (const char* retVal___, struct CmdlineArgData *arg); + const char * (*postHookFunc) (const char * retVal___, struct CmdlineArgData *arg); for (hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_source_post; hIndex++) { postHookFunc = HPMHooks.list.HP_cmdline_arg_source_post[hIndex].func; retVal___ = postHookFunc(retVal___, arg); @@ -2978,11 +2978,11 @@ DBReleaser HP_DB_custom_release(enum DBReleaseOption which) { } return retVal___; } -struct DBMap* HP_DB_alloc(const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen) { +struct DBMap * HP_DB_alloc(const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen) { int hIndex = 0; - struct DBMap* retVal___ = NULL; + struct DBMap * retVal___ = NULL; if (HPMHooks.count.HP_DB_alloc_pre > 0) { - struct DBMap* (*preHookFunc) (const char **file, const char **func, int *line, enum DBType *type, enum DBOptions *options, unsigned short *maxlen); + struct DBMap * (*preHookFunc) (const char **file, const char **func, int *line, enum DBType *type, enum DBOptions *options, unsigned short *maxlen); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_DB_alloc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_DB_alloc_pre[hIndex].func; @@ -2997,7 +2997,7 @@ struct DBMap* HP_DB_alloc(const char *file, const char *func, int line, enum DBT retVal___ = HPMHooks.source.DB.alloc(file, func, line, type, options, maxlen); } if (HPMHooks.count.HP_DB_alloc_post > 0) { - struct DBMap* (*postHookFunc) (struct DBMap* retVal___, const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen); + struct DBMap * (*postHookFunc) (struct DBMap * retVal___, const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen); for (hIndex = 0; hIndex < HPMHooks.count.HP_DB_alloc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_DB_alloc_post[hIndex].func; retVal___ = postHookFunc(retVal___, file, func, line, type, options, maxlen); @@ -3275,11 +3275,11 @@ unsigned int HP_DB_data2ui(struct DBData *data) { } return retVal___; } -void* HP_DB_data2ptr(struct DBData *data) { +void * HP_DB_data2ptr(struct DBData *data) { int hIndex = 0; - void* retVal___ = NULL; + void * retVal___ = NULL; if (HPMHooks.count.HP_DB_data2ptr_pre > 0) { - void* (*preHookFunc) (struct DBData **data); + void * (*preHookFunc) (struct DBData **data); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ptr_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_DB_data2ptr_pre[hIndex].func; @@ -3294,7 +3294,7 @@ void* HP_DB_data2ptr(struct DBData *data) { retVal___ = HPMHooks.source.DB.data2ptr(data); } if (HPMHooks.count.HP_DB_data2ptr_post > 0) { - void* (*postHookFunc) (void* retVal___, struct DBData *data); + void * (*postHookFunc) (void * retVal___, struct DBData *data); for (hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ptr_post; hIndex++) { postHookFunc = HPMHooks.list.HP_DB_data2ptr_post[hIndex].func; retVal___ = postHookFunc(retVal___, data); @@ -3702,11 +3702,11 @@ void HP_handlers_sendHotkeyV2Tab(JsonP *json, struct userconfig_userhotkeys_v2 * } return; } -const char* HP_handlers_hotkeyTabIdToName(int tab_id) { +const char * HP_handlers_hotkeyTabIdToName(int tab_id) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_handlers_hotkeyTabIdToName_pre > 0) { - const char* (*preHookFunc) (int *tab_id); + const char * (*preHookFunc) (int *tab_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_handlers_hotkeyTabIdToName_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_handlers_hotkeyTabIdToName_pre[hIndex].func; @@ -3721,7 +3721,7 @@ const char* HP_handlers_hotkeyTabIdToName(int tab_id) { retVal___ = HPMHooks.source.handlers.hotkeyTabIdToName(tab_id); } if (HPMHooks.count.HP_handlers_hotkeyTabIdToName_post > 0) { - const char* (*postHookFunc) (const char* retVal___, int tab_id); + const char * (*postHookFunc) (const char * retVal___, int tab_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_handlers_hotkeyTabIdToName_post; hIndex++) { postHookFunc = HPMHooks.list.HP_handlers_hotkeyTabIdToName_post[hIndex].func; retVal___ = postHookFunc(retVal___, tab_id); @@ -4682,11 +4682,11 @@ void HP_httpparser_init_multi_settings(void) { } return; } -const char* HP_httpparser_get_method_str(struct api_session_data *sd) { +const char * HP_httpparser_get_method_str(struct api_session_data *sd) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_httpparser_get_method_str_pre > 0) { - const char* (*preHookFunc) (struct api_session_data **sd); + const char * (*preHookFunc) (struct api_session_data **sd); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_httpparser_get_method_str_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_httpparser_get_method_str_pre[hIndex].func; @@ -4701,7 +4701,7 @@ const char* HP_httpparser_get_method_str(struct api_session_data *sd) { retVal___ = HPMHooks.source.httpparser.get_method_str(sd); } if (HPMHooks.count.HP_httpparser_get_method_str_post > 0) { - const char* (*postHookFunc) (const char* retVal___, struct api_session_data *sd); + const char * (*postHookFunc) (const char * retVal___, struct api_session_data *sd); for (hIndex = 0; hIndex < HPMHooks.count.HP_httpparser_get_method_str_post; hIndex++) { postHookFunc = HPMHooks.list.HP_httpparser_get_method_str_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd); @@ -5276,11 +5276,11 @@ void HP_httpsender_final(void) { } return; } -const char* HP_httpsender_http_status_name(enum http_status status) { +const char * HP_httpsender_http_status_name(enum http_status status) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_httpsender_http_status_name_pre > 0) { - const char* (*preHookFunc) (enum http_status *status); + const char * (*preHookFunc) (enum http_status *status); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_httpsender_http_status_name_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_httpsender_http_status_name_pre[hIndex].func; @@ -5295,7 +5295,7 @@ const char* HP_httpsender_http_status_name(enum http_status status) { retVal___ = HPMHooks.source.httpsender.http_status_name(status); } if (HPMHooks.count.HP_httpsender_http_status_name_post > 0) { - const char* (*postHookFunc) (const char* retVal___, enum http_status status); + const char * (*postHookFunc) (const char * retVal___, enum http_status status); for (hIndex = 0; hIndex < HPMHooks.count.HP_httpsender_http_status_name_post; hIndex++) { postHookFunc = HPMHooks.list.HP_httpsender_http_status_name_post[hIndex].func; retVal___ = postHookFunc(retVal___, status); @@ -5653,11 +5653,11 @@ void HP_jsonparser_final(void) { } return; } -JsonP* HP_jsonparser_parse(const char *text) { +JsonP * HP_jsonparser_parse(const char *text) { int hIndex = 0; - JsonP* retVal___ = NULL; + JsonP * retVal___ = NULL; if (HPMHooks.count.HP_jsonparser_parse_pre > 0) { - JsonP* (*preHookFunc) (const char **text); + JsonP * (*preHookFunc) (const char **text); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonparser_parse_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonparser_parse_pre[hIndex].func; @@ -5672,7 +5672,7 @@ JsonP* HP_jsonparser_parse(const char *text) { retVal___ = HPMHooks.source.jsonparser.parse(text); } if (HPMHooks.count.HP_jsonparser_parse_post > 0) { - JsonP* (*postHookFunc) (JsonP* retVal___, const char *text); + JsonP * (*postHookFunc) (JsonP * retVal___, const char *text); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonparser_parse_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonparser_parse_post[hIndex].func; retVal___ = postHookFunc(retVal___, text); @@ -5706,11 +5706,11 @@ void HP_jsonparser_print(const JsonP *parent) { } return; } -char* HP_jsonparser_get_string(const JsonP *parent) { +char * HP_jsonparser_get_string(const JsonP *parent) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_jsonparser_get_string_pre > 0) { - char* (*preHookFunc) (const JsonP **parent); + char * (*preHookFunc) (const JsonP **parent); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonparser_get_string_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonparser_get_string_pre[hIndex].func; @@ -5725,7 +5725,7 @@ char* HP_jsonparser_get_string(const JsonP *parent) { retVal___ = HPMHooks.source.jsonparser.get_string(parent); } if (HPMHooks.count.HP_jsonparser_get_string_post > 0) { - char* (*postHookFunc) (char* retVal___, const JsonP *parent); + char * (*postHookFunc) (char * retVal___, const JsonP *parent); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonparser_get_string_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonparser_get_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent); @@ -5733,11 +5733,11 @@ char* HP_jsonparser_get_string(const JsonP *parent) { } return retVal___; } -char* HP_jsonparser_get_formatted_string(const JsonP *parent) { +char * HP_jsonparser_get_formatted_string(const JsonP *parent) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_jsonparser_get_formatted_string_pre > 0) { - char* (*preHookFunc) (const JsonP **parent); + char * (*preHookFunc) (const JsonP **parent); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonparser_get_formatted_string_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonparser_get_formatted_string_pre[hIndex].func; @@ -5752,7 +5752,7 @@ char* HP_jsonparser_get_formatted_string(const JsonP *parent) { retVal___ = HPMHooks.source.jsonparser.get_formatted_string(parent); } if (HPMHooks.count.HP_jsonparser_get_formatted_string_post > 0) { - char* (*postHookFunc) (char* retVal___, const JsonP *parent); + char * (*postHookFunc) (char * retVal___, const JsonP *parent); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonparser_get_formatted_string_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonparser_get_formatted_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent); @@ -5814,11 +5814,11 @@ bool HP_jsonparser_is_null_or_missing(const JsonP *parent) { } return retVal___; } -JsonP* HP_jsonparser_get(const JsonP *parent, const char *name) { +JsonP * HP_jsonparser_get(const JsonP *parent, const char *name) { int hIndex = 0; - JsonP* retVal___ = NULL; + JsonP * retVal___ = NULL; if (HPMHooks.count.HP_jsonparser_get_pre > 0) { - JsonP* (*preHookFunc) (const JsonP **parent, const char **name); + JsonP * (*preHookFunc) (const JsonP **parent, const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonparser_get_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonparser_get_pre[hIndex].func; @@ -5833,7 +5833,7 @@ JsonP* HP_jsonparser_get(const JsonP *parent, const char *name) { retVal___ = HPMHooks.source.jsonparser.get(parent, name); } if (HPMHooks.count.HP_jsonparser_get_post > 0) { - JsonP* (*postHookFunc) (JsonP* retVal___, const JsonP *parent, const char *name); + JsonP * (*postHookFunc) (JsonP * retVal___, const JsonP *parent, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonparser_get_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonparser_get_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, name); @@ -5868,11 +5868,11 @@ int HP_jsonparser_get_array_size(const JsonP *parent) { } return retVal___; } -char* HP_jsonparser_get_string_value(const JsonP *parent) { +char * HP_jsonparser_get_string_value(const JsonP *parent) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_jsonparser_get_string_value_pre > 0) { - char* (*preHookFunc) (const JsonP **parent); + char * (*preHookFunc) (const JsonP **parent); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonparser_get_string_value_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonparser_get_string_value_pre[hIndex].func; @@ -5887,7 +5887,7 @@ char* HP_jsonparser_get_string_value(const JsonP *parent) { retVal___ = HPMHooks.source.jsonparser.get_string_value(parent); } if (HPMHooks.count.HP_jsonparser_get_string_value_post > 0) { - char* (*postHookFunc) (char* retVal___, const JsonP *parent); + char * (*postHookFunc) (char * retVal___, const JsonP *parent); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonparser_get_string_value_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonparser_get_string_value_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent); @@ -5949,11 +5949,11 @@ int HP_jsonparser_get_int_value(const JsonP *parent) { } return retVal___; } -char* HP_jsonparser_get_child_string_value(const JsonP *parent, const char *name) { +char * HP_jsonparser_get_child_string_value(const JsonP *parent, const char *name) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_jsonparser_get_child_string_value_pre > 0) { - char* (*preHookFunc) (const JsonP **parent, const char **name); + char * (*preHookFunc) (const JsonP **parent, const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonparser_get_child_string_value_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonparser_get_child_string_value_pre[hIndex].func; @@ -5968,7 +5968,7 @@ char* HP_jsonparser_get_child_string_value(const JsonP *parent, const char *name retVal___ = HPMHooks.source.jsonparser.get_child_string_value(parent, name); } if (HPMHooks.count.HP_jsonparser_get_child_string_value_post > 0) { - char* (*postHookFunc) (char* retVal___, const JsonP *parent, const char *name); + char * (*postHookFunc) (char * retVal___, const JsonP *parent, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonparser_get_child_string_value_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonparser_get_child_string_value_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, name); @@ -6136,11 +6136,11 @@ void HP_jsonwriter_final(void) { } return; } -JsonW* HP_jsonwriter_create(const char *text) { +JsonW * HP_jsonwriter_create(const char *text) { int hIndex = 0; - JsonW* retVal___ = NULL; + JsonW * retVal___ = NULL; if (HPMHooks.count.HP_jsonwriter_create_pre > 0) { - JsonW* (*preHookFunc) (const char **text); + JsonW * (*preHookFunc) (const char **text); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_create_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonwriter_create_pre[hIndex].func; @@ -6155,7 +6155,7 @@ JsonW* HP_jsonwriter_create(const char *text) { retVal___ = HPMHooks.source.jsonwriter.create(text); } if (HPMHooks.count.HP_jsonwriter_create_post > 0) { - JsonW* (*postHookFunc) (JsonW* retVal___, const char *text); + JsonW * (*postHookFunc) (JsonW * retVal___, const char *text); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_create_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonwriter_create_post[hIndex].func; retVal___ = postHookFunc(retVal___, text); @@ -6163,11 +6163,11 @@ JsonW* HP_jsonwriter_create(const char *text) { } return retVal___; } -JsonW* HP_jsonwriter_create_empty(void) { +JsonW * HP_jsonwriter_create_empty(void) { int hIndex = 0; - JsonW* retVal___ = NULL; + JsonW * retVal___ = NULL; if (HPMHooks.count.HP_jsonwriter_create_empty_pre > 0) { - JsonW* (*preHookFunc) (void); + JsonW * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_create_empty_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonwriter_create_empty_pre[hIndex].func; @@ -6182,7 +6182,7 @@ JsonW* HP_jsonwriter_create_empty(void) { retVal___ = HPMHooks.source.jsonwriter.create_empty(); } if (HPMHooks.count.HP_jsonwriter_create_empty_post > 0) { - JsonW* (*postHookFunc) (JsonW* retVal___); + JsonW * (*postHookFunc) (JsonW * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_create_empty_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonwriter_create_empty_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -6190,11 +6190,11 @@ JsonW* HP_jsonwriter_create_empty(void) { } return retVal___; } -JsonW* HP_jsonwriter_new_array(void) { +JsonW * HP_jsonwriter_new_array(void) { int hIndex = 0; - JsonW* retVal___ = NULL; + JsonW * retVal___ = NULL; if (HPMHooks.count.HP_jsonwriter_new_array_pre > 0) { - JsonW* (*preHookFunc) (void); + JsonW * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_new_array_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonwriter_new_array_pre[hIndex].func; @@ -6209,7 +6209,7 @@ JsonW* HP_jsonwriter_new_array(void) { retVal___ = HPMHooks.source.jsonwriter.new_array(); } if (HPMHooks.count.HP_jsonwriter_new_array_post > 0) { - JsonW* (*postHookFunc) (JsonW* retVal___); + JsonW * (*postHookFunc) (JsonW * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_new_array_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonwriter_new_array_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -6217,11 +6217,11 @@ JsonW* HP_jsonwriter_new_array(void) { } return retVal___; } -JsonW* HP_jsonwriter_new_object(void) { +JsonW * HP_jsonwriter_new_object(void) { int hIndex = 0; - JsonW* retVal___ = NULL; + JsonW * retVal___ = NULL; if (HPMHooks.count.HP_jsonwriter_new_object_pre > 0) { - JsonW* (*preHookFunc) (void); + JsonW * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_new_object_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonwriter_new_object_pre[hIndex].func; @@ -6236,7 +6236,7 @@ JsonW* HP_jsonwriter_new_object(void) { retVal___ = HPMHooks.source.jsonwriter.new_object(); } if (HPMHooks.count.HP_jsonwriter_new_object_post > 0) { - JsonW* (*postHookFunc) (JsonW* retVal___); + JsonW * (*postHookFunc) (JsonW * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_new_object_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonwriter_new_object_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -6244,11 +6244,11 @@ JsonW* HP_jsonwriter_new_object(void) { } return retVal___; } -JsonW* HP_jsonwriter_new_string(const char *str) { +JsonW * HP_jsonwriter_new_string(const char *str) { int hIndex = 0; - JsonW* retVal___ = NULL; + JsonW * retVal___ = NULL; if (HPMHooks.count.HP_jsonwriter_new_string_pre > 0) { - JsonW* (*preHookFunc) (const char **str); + JsonW * (*preHookFunc) (const char **str); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_new_string_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonwriter_new_string_pre[hIndex].func; @@ -6263,7 +6263,7 @@ JsonW* HP_jsonwriter_new_string(const char *str) { retVal___ = HPMHooks.source.jsonwriter.new_string(str); } if (HPMHooks.count.HP_jsonwriter_new_string_post > 0) { - JsonW* (*postHookFunc) (JsonW* retVal___, const char *str); + JsonW * (*postHookFunc) (JsonW * retVal___, const char *str); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_new_string_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonwriter_new_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, str); @@ -6271,11 +6271,11 @@ JsonW* HP_jsonwriter_new_string(const char *str) { } return retVal___; } -JsonW* HP_jsonwriter_new_number(int number) { +JsonW * HP_jsonwriter_new_number(int number) { int hIndex = 0; - JsonW* retVal___ = NULL; + JsonW * retVal___ = NULL; if (HPMHooks.count.HP_jsonwriter_new_number_pre > 0) { - JsonW* (*preHookFunc) (int *number); + JsonW * (*preHookFunc) (int *number); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_new_number_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonwriter_new_number_pre[hIndex].func; @@ -6290,7 +6290,7 @@ JsonW* HP_jsonwriter_new_number(int number) { retVal___ = HPMHooks.source.jsonwriter.new_number(number); } if (HPMHooks.count.HP_jsonwriter_new_number_post > 0) { - JsonW* (*postHookFunc) (JsonW* retVal___, int number); + JsonW * (*postHookFunc) (JsonW * retVal___, int number); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_new_number_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonwriter_new_number_post[hIndex].func; retVal___ = postHookFunc(retVal___, number); @@ -6298,11 +6298,11 @@ JsonW* HP_jsonwriter_new_number(int number) { } return retVal___; } -JsonW* HP_jsonwriter_new_null(void) { +JsonW * HP_jsonwriter_new_null(void) { int hIndex = 0; - JsonW* retVal___ = NULL; + JsonW * retVal___ = NULL; if (HPMHooks.count.HP_jsonwriter_new_null_pre > 0) { - JsonW* (*preHookFunc) (void); + JsonW * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_new_null_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonwriter_new_null_pre[hIndex].func; @@ -6317,7 +6317,7 @@ JsonW* HP_jsonwriter_new_null(void) { retVal___ = HPMHooks.source.jsonwriter.new_null(); } if (HPMHooks.count.HP_jsonwriter_new_null_post > 0) { - JsonW* (*postHookFunc) (JsonW* retVal___); + JsonW * (*postHookFunc) (JsonW * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_new_null_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonwriter_new_null_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -6379,11 +6379,11 @@ JsonWBool HP_jsonwriter_add_node_to_array(JsonW *parent, JsonW *child) { } return retVal___; } -JsonW* HP_jsonwriter_add_new_array(JsonW *parent, const char *name) { +JsonW * HP_jsonwriter_add_new_array(JsonW *parent, const char *name) { int hIndex = 0; - JsonW* retVal___ = NULL; + JsonW * retVal___ = NULL; if (HPMHooks.count.HP_jsonwriter_add_new_array_pre > 0) { - JsonW* (*preHookFunc) (JsonW **parent, const char **name); + JsonW * (*preHookFunc) (JsonW **parent, const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_add_new_array_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonwriter_add_new_array_pre[hIndex].func; @@ -6398,7 +6398,7 @@ JsonW* HP_jsonwriter_add_new_array(JsonW *parent, const char *name) { retVal___ = HPMHooks.source.jsonwriter.add_new_array(parent, name); } if (HPMHooks.count.HP_jsonwriter_add_new_array_post > 0) { - JsonW* (*postHookFunc) (JsonW* retVal___, JsonW *parent, const char *name); + JsonW * (*postHookFunc) (JsonW * retVal___, JsonW *parent, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_add_new_array_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonwriter_add_new_array_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, name); @@ -6406,11 +6406,11 @@ JsonW* HP_jsonwriter_add_new_array(JsonW *parent, const char *name) { } return retVal___; } -JsonW* HP_jsonwriter_add_new_object(JsonW *parent, const char *name) { +JsonW * HP_jsonwriter_add_new_object(JsonW *parent, const char *name) { int hIndex = 0; - JsonW* retVal___ = NULL; + JsonW * retVal___ = NULL; if (HPMHooks.count.HP_jsonwriter_add_new_object_pre > 0) { - JsonW* (*preHookFunc) (JsonW **parent, const char **name); + JsonW * (*preHookFunc) (JsonW **parent, const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_add_new_object_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonwriter_add_new_object_pre[hIndex].func; @@ -6425,7 +6425,7 @@ JsonW* HP_jsonwriter_add_new_object(JsonW *parent, const char *name) { retVal___ = HPMHooks.source.jsonwriter.add_new_object(parent, name); } if (HPMHooks.count.HP_jsonwriter_add_new_object_post > 0) { - JsonW* (*postHookFunc) (JsonW* retVal___, JsonW *parent, const char *name); + JsonW * (*postHookFunc) (JsonW * retVal___, JsonW *parent, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_add_new_object_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonwriter_add_new_object_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, name); @@ -6433,11 +6433,11 @@ JsonW* HP_jsonwriter_add_new_object(JsonW *parent, const char *name) { } return retVal___; } -JsonW* HP_jsonwriter_add_new_null(JsonW *parent, const char *name) { +JsonW * HP_jsonwriter_add_new_null(JsonW *parent, const char *name) { int hIndex = 0; - JsonW* retVal___ = NULL; + JsonW * retVal___ = NULL; if (HPMHooks.count.HP_jsonwriter_add_new_null_pre > 0) { - JsonW* (*preHookFunc) (JsonW **parent, const char **name); + JsonW * (*preHookFunc) (JsonW **parent, const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_add_new_null_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonwriter_add_new_null_pre[hIndex].func; @@ -6452,7 +6452,7 @@ JsonW* HP_jsonwriter_add_new_null(JsonW *parent, const char *name) { retVal___ = HPMHooks.source.jsonwriter.add_new_null(parent, name); } if (HPMHooks.count.HP_jsonwriter_add_new_null_post > 0) { - JsonW* (*postHookFunc) (JsonW* retVal___, JsonW *parent, const char *name); + JsonW * (*postHookFunc) (JsonW * retVal___, JsonW *parent, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_add_new_null_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonwriter_add_new_null_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, name); @@ -6460,11 +6460,11 @@ JsonW* HP_jsonwriter_add_new_null(JsonW *parent, const char *name) { } return retVal___; } -JsonW* HP_jsonwriter_add_new_number(JsonW *parent, const char *name, int number) { +JsonW * HP_jsonwriter_add_new_number(JsonW *parent, const char *name, int number) { int hIndex = 0; - JsonW* retVal___ = NULL; + JsonW * retVal___ = NULL; if (HPMHooks.count.HP_jsonwriter_add_new_number_pre > 0) { - JsonW* (*preHookFunc) (JsonW **parent, const char **name, int *number); + JsonW * (*preHookFunc) (JsonW **parent, const char **name, int *number); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_add_new_number_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonwriter_add_new_number_pre[hIndex].func; @@ -6479,7 +6479,7 @@ JsonW* HP_jsonwriter_add_new_number(JsonW *parent, const char *name, int number) retVal___ = HPMHooks.source.jsonwriter.add_new_number(parent, name, number); } if (HPMHooks.count.HP_jsonwriter_add_new_number_post > 0) { - JsonW* (*postHookFunc) (JsonW* retVal___, JsonW *parent, const char *name, int number); + JsonW * (*postHookFunc) (JsonW * retVal___, JsonW *parent, const char *name, int number); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_add_new_number_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonwriter_add_new_number_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, name, number); @@ -6487,11 +6487,11 @@ JsonW* HP_jsonwriter_add_new_number(JsonW *parent, const char *name, int number) } return retVal___; } -JsonW* HP_jsonwriter_add_new_string(JsonW *parent, const char *name, const char *str) { +JsonW * HP_jsonwriter_add_new_string(JsonW *parent, const char *name, const char *str) { int hIndex = 0; - JsonW* retVal___ = NULL; + JsonW * retVal___ = NULL; if (HPMHooks.count.HP_jsonwriter_add_new_string_pre > 0) { - JsonW* (*preHookFunc) (JsonW **parent, const char **name, const char **str); + JsonW * (*preHookFunc) (JsonW **parent, const char **name, const char **str); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_add_new_string_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonwriter_add_new_string_pre[hIndex].func; @@ -6506,7 +6506,7 @@ JsonW* HP_jsonwriter_add_new_string(JsonW *parent, const char *name, const char retVal___ = HPMHooks.source.jsonwriter.add_new_string(parent, name, str); } if (HPMHooks.count.HP_jsonwriter_add_new_string_post > 0) { - JsonW* (*postHookFunc) (JsonW* retVal___, JsonW *parent, const char *name, const char *str); + JsonW * (*postHookFunc) (JsonW * retVal___, JsonW *parent, const char *name, const char *str); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_add_new_string_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonwriter_add_new_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, name, str); @@ -6514,11 +6514,11 @@ JsonW* HP_jsonwriter_add_new_string(JsonW *parent, const char *name, const char } return retVal___; } -JsonW* HP_jsonwriter_add_new_string_to_array(JsonW *parent, const char *str) { +JsonW * HP_jsonwriter_add_new_string_to_array(JsonW *parent, const char *str) { int hIndex = 0; - JsonW* retVal___ = NULL; + JsonW * retVal___ = NULL; if (HPMHooks.count.HP_jsonwriter_add_new_string_to_array_pre > 0) { - JsonW* (*preHookFunc) (JsonW **parent, const char **str); + JsonW * (*preHookFunc) (JsonW **parent, const char **str); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_add_new_string_to_array_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonwriter_add_new_string_to_array_pre[hIndex].func; @@ -6533,7 +6533,7 @@ JsonW* HP_jsonwriter_add_new_string_to_array(JsonW *parent, const char *str) { retVal___ = HPMHooks.source.jsonwriter.add_new_string_to_array(parent, str); } if (HPMHooks.count.HP_jsonwriter_add_new_string_to_array_post > 0) { - JsonW* (*postHookFunc) (JsonW* retVal___, JsonW *parent, const char *str); + JsonW * (*postHookFunc) (JsonW * retVal___, JsonW *parent, const char *str); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_add_new_string_to_array_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonwriter_add_new_string_to_array_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, str); @@ -6541,11 +6541,11 @@ JsonW* HP_jsonwriter_add_new_string_to_array(JsonW *parent, const char *str) { } return retVal___; } -JsonW* HP_jsonwriter_add_new_object_to_array(JsonW *parent) { +JsonW * HP_jsonwriter_add_new_object_to_array(JsonW *parent) { int hIndex = 0; - JsonW* retVal___ = NULL; + JsonW * retVal___ = NULL; if (HPMHooks.count.HP_jsonwriter_add_new_object_to_array_pre > 0) { - JsonW* (*preHookFunc) (JsonW **parent); + JsonW * (*preHookFunc) (JsonW **parent); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_add_new_object_to_array_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonwriter_add_new_object_to_array_pre[hIndex].func; @@ -6560,7 +6560,7 @@ JsonW* HP_jsonwriter_add_new_object_to_array(JsonW *parent) { retVal___ = HPMHooks.source.jsonwriter.add_new_object_to_array(parent); } if (HPMHooks.count.HP_jsonwriter_add_new_object_to_array_post > 0) { - JsonW* (*postHookFunc) (JsonW* retVal___, JsonW *parent); + JsonW * (*postHookFunc) (JsonW * retVal___, JsonW *parent); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_add_new_object_to_array_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonwriter_add_new_object_to_array_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent); @@ -6594,11 +6594,11 @@ void HP_jsonwriter_print(const JsonW *parent) { } return; } -JsonW* HP_jsonwriter_get(const JsonW *parent, const char *name) { +JsonW * HP_jsonwriter_get(const JsonW *parent, const char *name) { int hIndex = 0; - JsonW* retVal___ = NULL; + JsonW * retVal___ = NULL; if (HPMHooks.count.HP_jsonwriter_get_pre > 0) { - JsonW* (*preHookFunc) (const JsonW **parent, const char **name); + JsonW * (*preHookFunc) (const JsonW **parent, const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_get_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonwriter_get_pre[hIndex].func; @@ -6613,7 +6613,7 @@ JsonW* HP_jsonwriter_get(const JsonW *parent, const char *name) { retVal___ = HPMHooks.source.jsonwriter.get(parent, name); } if (HPMHooks.count.HP_jsonwriter_get_post > 0) { - JsonW* (*postHookFunc) (JsonW* retVal___, const JsonW *parent, const char *name); + JsonW * (*postHookFunc) (JsonW * retVal___, const JsonW *parent, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_get_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonwriter_get_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, name); @@ -6621,11 +6621,11 @@ JsonW* HP_jsonwriter_get(const JsonW *parent, const char *name) { } return retVal___; } -char* HP_jsonwriter_get_string(const JsonW *parent) { +char * HP_jsonwriter_get_string(const JsonW *parent) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_jsonwriter_get_string_pre > 0) { - char* (*preHookFunc) (const JsonW **parent); + char * (*preHookFunc) (const JsonW **parent); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_get_string_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonwriter_get_string_pre[hIndex].func; @@ -6640,7 +6640,7 @@ char* HP_jsonwriter_get_string(const JsonW *parent) { retVal___ = HPMHooks.source.jsonwriter.get_string(parent); } if (HPMHooks.count.HP_jsonwriter_get_string_post > 0) { - char* (*postHookFunc) (char* retVal___, const JsonW *parent); + char * (*postHookFunc) (char * retVal___, const JsonW *parent); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_get_string_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonwriter_get_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent); @@ -6648,11 +6648,11 @@ char* HP_jsonwriter_get_string(const JsonW *parent) { } return retVal___; } -char* HP_jsonwriter_get_formatted_string(const JsonW *parent) { +char * HP_jsonwriter_get_formatted_string(const JsonW *parent) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_jsonwriter_get_formatted_string_pre > 0) { - char* (*preHookFunc) (const JsonW **parent); + char * (*preHookFunc) (const JsonW **parent); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_get_formatted_string_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_jsonwriter_get_formatted_string_pre[hIndex].func; @@ -6667,7 +6667,7 @@ char* HP_jsonwriter_get_formatted_string(const JsonW *parent) { retVal___ = HPMHooks.source.jsonwriter.get_formatted_string(parent); } if (HPMHooks.count.HP_jsonwriter_get_formatted_string_post > 0) { - char* (*postHookFunc) (char* retVal___, const JsonW *parent); + char * (*postHookFunc) (char * retVal___, const JsonW *parent); for (hIndex = 0; hIndex < HPMHooks.count.HP_jsonwriter_get_formatted_string_post; hIndex++) { postHookFunc = HPMHooks.list.HP_jsonwriter_get_formatted_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent); @@ -7179,11 +7179,11 @@ int HP_libconfig_setting_get_bool(const struct config_setting_t *setting) { } return retVal___; } -const char* HP_libconfig_setting_get_string(const struct config_setting_t *setting) { +const char * HP_libconfig_setting_get_string(const struct config_setting_t *setting) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_get_string_pre > 0) { - const char* (*preHookFunc) (const struct config_setting_t **setting); + const char * (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_pre[hIndex].func; @@ -7198,7 +7198,7 @@ const char* HP_libconfig_setting_get_string(const struct config_setting_t *setti retVal___ = HPMHooks.source.libconfig.setting_get_string(setting); } if (HPMHooks.count.HP_libconfig_setting_get_string_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting); + const char * (*postHookFunc) (const char * retVal___, const struct config_setting_t *setting); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -7206,11 +7206,11 @@ const char* HP_libconfig_setting_get_string(const struct config_setting_t *setti } return retVal___; } -struct config_setting_t* HP_libconfig_setting_lookup(struct config_setting_t *setting, const char *name) { +struct config_setting_t * HP_libconfig_setting_lookup(struct config_setting_t *setting, const char *name) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_lookup_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, const char **name); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_pre[hIndex].func; @@ -7225,7 +7225,7 @@ struct config_setting_t* HP_libconfig_setting_lookup(struct config_setting_t *se retVal___ = HPMHooks.source.libconfig.setting_lookup(setting, name); } if (HPMHooks.count.HP_libconfig_setting_lookup_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, const char *name); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name); @@ -7665,11 +7665,11 @@ int HP_libconfig_setting_get_bool_elem(const struct config_setting_t *setting, i } return retVal___; } -const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t *setting, int idx) { +const char * HP_libconfig_setting_get_string_elem(const struct config_setting_t *setting, int idx) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_get_string_elem_pre > 0) { - const char* (*preHookFunc) (const struct config_setting_t **setting, int *idx); + const char * (*preHookFunc) (const struct config_setting_t **setting, int *idx); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_pre[hIndex].func; @@ -7684,7 +7684,7 @@ const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t * retVal___ = HPMHooks.source.libconfig.setting_get_string_elem(setting, idx); } if (HPMHooks.count.HP_libconfig_setting_get_string_elem_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting, int idx); + const char * (*postHookFunc) (const char * retVal___, const struct config_setting_t *setting, int idx); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx); @@ -7692,11 +7692,11 @@ const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t * } return retVal___; } -struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting_t *setting, int idx, int value) { +struct config_setting_t * HP_libconfig_setting_set_int_elem(struct config_setting_t *setting, int idx, int value) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_set_int_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_pre[hIndex].func; @@ -7711,7 +7711,7 @@ struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting retVal___ = HPMHooks.source.libconfig.setting_set_int_elem(setting, idx, value); } if (HPMHooks.count.HP_libconfig_setting_set_int_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int value); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, int value); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx, value); @@ -7719,11 +7719,11 @@ struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting } return retVal___; } -struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setting_t *setting, int idx, int64 value) { +struct config_setting_t * HP_libconfig_setting_set_int64_elem(struct config_setting_t *setting, int idx, int64 value) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, int64 *value); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, int *idx, int64 *value); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_pre[hIndex].func; @@ -7738,7 +7738,7 @@ struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setti retVal___ = HPMHooks.source.libconfig.setting_set_int64_elem(setting, idx, value); } if (HPMHooks.count.HP_libconfig_setting_set_int64_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int64 value); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, int64 value); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx, value); @@ -7746,11 +7746,11 @@ struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setti } return retVal___; } -struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setting_t *setting, int idx, double value) { +struct config_setting_t * HP_libconfig_setting_set_float_elem(struct config_setting_t *setting, int idx, double value) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_set_float_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, double *value); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, int *idx, double *value); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_pre[hIndex].func; @@ -7765,7 +7765,7 @@ struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setti retVal___ = HPMHooks.source.libconfig.setting_set_float_elem(setting, idx, value); } if (HPMHooks.count.HP_libconfig_setting_set_float_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, double value); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, double value); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx, value); @@ -7773,11 +7773,11 @@ struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setti } return retVal___; } -struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_setting_t *setting, int idx, int value) { +struct config_setting_t * HP_libconfig_setting_set_bool_elem(struct config_setting_t *setting, int idx, int value) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_pre[hIndex].func; @@ -7792,7 +7792,7 @@ struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_settin retVal___ = HPMHooks.source.libconfig.setting_set_bool_elem(setting, idx, value); } if (HPMHooks.count.HP_libconfig_setting_set_bool_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int value); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, int value); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx, value); @@ -7800,11 +7800,11 @@ struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_settin } return retVal___; } -struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_setting_t *setting, int idx, const char *value) { +struct config_setting_t * HP_libconfig_setting_set_string_elem(struct config_setting_t *setting, int idx, const char *value) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_set_string_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, const char **value); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, int *idx, const char **value); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_pre[hIndex].func; @@ -7819,7 +7819,7 @@ struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_sett retVal___ = HPMHooks.source.libconfig.setting_set_string_elem(setting, idx, value); } if (HPMHooks.count.HP_libconfig_setting_set_string_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, const char *value); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, const char *value); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx, value); @@ -7881,11 +7881,11 @@ int HP_libconfig_setting_length(const struct config_setting_t *setting) { } return retVal___; } -struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setting_t *setting, unsigned int idx) { +struct config_setting_t * HP_libconfig_setting_get_elem(const struct config_setting_t *setting, unsigned int idx) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_get_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (const struct config_setting_t **setting, unsigned int *idx); + struct config_setting_t * (*preHookFunc) (const struct config_setting_t **setting, unsigned int *idx); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_pre[hIndex].func; @@ -7900,7 +7900,7 @@ struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setti retVal___ = HPMHooks.source.libconfig.setting_get_elem(setting, idx); } if (HPMHooks.count.HP_libconfig_setting_get_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int idx); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, const struct config_setting_t *setting, unsigned int idx); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx); @@ -7908,11 +7908,11 @@ struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setti } return retVal___; } -struct config_setting_t* HP_libconfig_setting_get_member(const struct config_setting_t *setting, const char *name) { +struct config_setting_t * HP_libconfig_setting_get_member(const struct config_setting_t *setting, const char *name) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_get_member_pre > 0) { - struct config_setting_t* (*preHookFunc) (const struct config_setting_t **setting, const char **name); + struct config_setting_t * (*preHookFunc) (const struct config_setting_t **setting, const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_pre[hIndex].func; @@ -7927,7 +7927,7 @@ struct config_setting_t* HP_libconfig_setting_get_member(const struct config_set retVal___ = HPMHooks.source.libconfig.setting_get_member(setting, name); } if (HPMHooks.count.HP_libconfig_setting_get_member_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, const char *name); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, const struct config_setting_t *setting, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name); @@ -7935,11 +7935,11 @@ struct config_setting_t* HP_libconfig_setting_get_member(const struct config_set } return retVal___; } -struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *parent, const char *name, int type) { +struct config_setting_t * HP_libconfig_setting_add(struct config_setting_t *parent, const char *name, int type) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_add_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **parent, const char **name, int *type); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **parent, const char **name, int *type); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_add_pre[hIndex].func; @@ -7954,7 +7954,7 @@ struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *paren retVal___ = HPMHooks.source.libconfig.setting_add(parent, name, type); } if (HPMHooks.count.HP_libconfig_setting_add_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int type); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *parent, const char *name, int type); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_add_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, name, type); @@ -8042,11 +8042,11 @@ void HP_libconfig_setting_set_hook(struct config_setting_t *setting, void *hook) } return; } -struct config_setting_t* HP_libconfig_lookup(const struct config_t *config, const char *filepath) { +struct config_setting_t * HP_libconfig_lookup(const struct config_t *config, const char *filepath) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_lookup_pre > 0) { - struct config_setting_t* (*preHookFunc) (const struct config_t **config, const char **filepath); + struct config_setting_t * (*preHookFunc) (const struct config_t **config, const char **filepath); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_pre[hIndex].func; @@ -8061,7 +8061,7 @@ struct config_setting_t* HP_libconfig_lookup(const struct config_t *config, cons retVal___ = HPMHooks.source.libconfig.lookup(config, filepath); } if (HPMHooks.count.HP_libconfig_lookup_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_t *config, const char *filepath); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, const struct config_t *config, const char *filepath); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath); @@ -8686,11 +8686,11 @@ void HP_md5_salt(int len, char *output) { return; } /* mutex_interface */ -struct mutex_data* HP_mutex_create(void) { +struct mutex_data * HP_mutex_create(void) { int hIndex = 0; - struct mutex_data* retVal___ = NULL; + struct mutex_data * retVal___ = NULL; if (HPMHooks.count.HP_mutex_create_pre > 0) { - struct mutex_data* (*preHookFunc) (void); + struct mutex_data * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mutex_create_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mutex_create_pre[hIndex].func; @@ -8705,7 +8705,7 @@ struct mutex_data* HP_mutex_create(void) { retVal___ = HPMHooks.source.mutex.create(); } if (HPMHooks.count.HP_mutex_create_post > 0) { - struct mutex_data* (*postHookFunc) (struct mutex_data* retVal___); + struct mutex_data * (*postHookFunc) (struct mutex_data * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_mutex_create_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mutex_create_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -8818,11 +8818,11 @@ void HP_mutex_unlock(struct mutex_data *m) { } return; } -struct cond_data* HP_mutex_cond_create(void) { +struct cond_data * HP_mutex_cond_create(void) { int hIndex = 0; - struct cond_data* retVal___ = NULL; + struct cond_data * retVal___ = NULL; if (HPMHooks.count.HP_mutex_cond_create_pre > 0) { - struct cond_data* (*preHookFunc) (void); + struct cond_data * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mutex_cond_create_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mutex_cond_create_pre[hIndex].func; @@ -8837,7 +8837,7 @@ struct cond_data* HP_mutex_cond_create(void) { retVal___ = HPMHooks.source.mutex.cond_create(); } if (HPMHooks.count.HP_mutex_cond_create_post > 0) { - struct cond_data* (*postHookFunc) (struct cond_data* retVal___); + struct cond_data * (*postHookFunc) (struct cond_data * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_mutex_cond_create_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mutex_cond_create_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -9537,11 +9537,11 @@ int HP_showmsg_showMessageV(const char *string, va_list ap) { } return retVal___; } -const char* HP_showmsg_getLogFileName(void) { +const char * HP_showmsg_getLogFileName(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_showmsg_getLogFileName_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_showmsg_getLogFileName_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_showmsg_getLogFileName_pre[hIndex].func; @@ -9556,7 +9556,7 @@ const char* HP_showmsg_getLogFileName(void) { retVal___ = HPMHooks.source.showmsg.getLogFileName(); } if (HPMHooks.count.HP_showmsg_getLogFileName_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_showmsg_getLogFileName_post; hIndex++) { postHookFunc = HPMHooks.list.HP_showmsg_getLogFileName_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -10227,11 +10227,11 @@ uint32 HP_sockt_host2ip(const char *hostname) { } return retVal___; } -const char* HP_sockt_ip2str(uint32 ip, char *ip_str) { +const char * HP_sockt_ip2str(uint32 ip, char *ip_str) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sockt_ip2str_pre > 0) { - const char* (*preHookFunc) (uint32 *ip, char **ip_str); + const char * (*preHookFunc) (uint32 *ip, char **ip_str); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sockt_ip2str_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sockt_ip2str_pre[hIndex].func; @@ -10246,7 +10246,7 @@ const char* HP_sockt_ip2str(uint32 ip, char *ip_str) { retVal___ = HPMHooks.source.sockt.ip2str(ip, ip_str); } if (HPMHooks.count.HP_sockt_ip2str_post > 0) { - const char* (*postHookFunc) (const char* retVal___, uint32 ip, char *ip_str); + const char * (*postHookFunc) (const char * retVal___, uint32 ip, char *ip_str); for (hIndex = 0; hIndex < HPMHooks.count.HP_sockt_ip2str_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sockt_ip2str_post[hIndex].func; retVal___ = postHookFunc(retVal___, ip, ip_str); @@ -10985,11 +10985,11 @@ void HP_SQL_Free(struct Sql *self) { } return; } -struct Sql* HP_SQL_Malloc(void) { +struct Sql * HP_SQL_Malloc(void) { int hIndex = 0; - struct Sql* retVal___ = NULL; + struct Sql * retVal___ = NULL; if (HPMHooks.count.HP_SQL_Malloc_pre > 0) { - struct Sql* (*preHookFunc) (void); + struct Sql * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Malloc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_SQL_Malloc_pre[hIndex].func; @@ -11004,7 +11004,7 @@ struct Sql* HP_SQL_Malloc(void) { retVal___ = HPMHooks.source.SQL.Malloc(); } if (HPMHooks.count.HP_SQL_Malloc_post > 0) { - struct Sql* (*postHookFunc) (struct Sql* retVal___); + struct Sql * (*postHookFunc) (struct Sql * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Malloc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_SQL_Malloc_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -11012,11 +11012,11 @@ struct Sql* HP_SQL_Malloc(void) { } return retVal___; } -struct SqlStmt* HP_SQL_StmtMalloc(struct Sql *sql) { +struct SqlStmt * HP_SQL_StmtMalloc(struct Sql *sql) { int hIndex = 0; - struct SqlStmt* retVal___ = NULL; + struct SqlStmt * retVal___ = NULL; if (HPMHooks.count.HP_SQL_StmtMalloc_pre > 0) { - struct SqlStmt* (*preHookFunc) (struct Sql **sql); + struct SqlStmt * (*preHookFunc) (struct Sql **sql); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtMalloc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_SQL_StmtMalloc_pre[hIndex].func; @@ -11031,7 +11031,7 @@ struct SqlStmt* HP_SQL_StmtMalloc(struct Sql *sql) { retVal___ = HPMHooks.source.SQL.StmtMalloc(sql); } if (HPMHooks.count.HP_SQL_StmtMalloc_post > 0) { - struct SqlStmt* (*postHookFunc) (struct SqlStmt* retVal___, struct Sql *sql); + struct SqlStmt * (*postHookFunc) (struct SqlStmt * retVal___, struct Sql *sql); for (hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtMalloc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_SQL_StmtMalloc_post[hIndex].func; retVal___ = postHookFunc(retVal___, sql); @@ -11394,11 +11394,11 @@ void HP_SQL_StmtShowDebug_(struct SqlStmt *self, const char *debug_file, const u return; } /* stringbuf_interface */ -StringBuf* HP_StrBuf_Malloc(void) { +StringBuf * HP_StrBuf_Malloc(void) { int hIndex = 0; - StringBuf* retVal___ = NULL; + StringBuf * retVal___ = NULL; if (HPMHooks.count.HP_StrBuf_Malloc_pre > 0) { - StringBuf* (*preHookFunc) (void); + StringBuf * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Malloc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_StrBuf_Malloc_pre[hIndex].func; @@ -11413,7 +11413,7 @@ StringBuf* HP_StrBuf_Malloc(void) { retVal___ = HPMHooks.source.StrBuf.Malloc(); } if (HPMHooks.count.HP_StrBuf_Malloc_post > 0) { - StringBuf* (*postHookFunc) (StringBuf* retVal___); + StringBuf * (*postHookFunc) (StringBuf * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Malloc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_StrBuf_Malloc_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -11561,11 +11561,11 @@ int HP_StrBuf_Length(StringBuf *self) { } return retVal___; } -char* HP_StrBuf_Value(StringBuf *self) { +char * HP_StrBuf_Value(StringBuf *self) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_StrBuf_Value_pre > 0) { - char* (*preHookFunc) (StringBuf **self); + char * (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Value_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_StrBuf_Value_pre[hIndex].func; @@ -11580,7 +11580,7 @@ char* HP_StrBuf_Value(StringBuf *self) { retVal___ = HPMHooks.source.StrBuf.Value(self); } if (HPMHooks.count.HP_StrBuf_Value_post > 0) { - char* (*postHookFunc) (char* retVal___, StringBuf *self); + char * (*postHookFunc) (char * retVal___, StringBuf *self); for (hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Value_post; hIndex++) { postHookFunc = HPMHooks.list.HP_StrBuf_Value_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -11667,11 +11667,11 @@ void HP_StrBuf_Free(StringBuf *self) { return; } /* strlib_interface */ -char* HP_strlib_jstrescape(char *pt) { +char * HP_strlib_jstrescape(char *pt) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_jstrescape_pre > 0) { - char* (*preHookFunc) (char **pt); + char * (*preHookFunc) (char **pt); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescape_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_jstrescape_pre[hIndex].func; @@ -11686,7 +11686,7 @@ char* HP_strlib_jstrescape(char *pt) { retVal___ = HPMHooks.source.strlib.jstrescape(pt); } if (HPMHooks.count.HP_strlib_jstrescape_post > 0) { - char* (*postHookFunc) (char* retVal___, char *pt); + char * (*postHookFunc) (char * retVal___, char *pt); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescape_post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_jstrescape_post[hIndex].func; retVal___ = postHookFunc(retVal___, pt); @@ -11694,11 +11694,11 @@ char* HP_strlib_jstrescape(char *pt) { } return retVal___; } -char* HP_strlib_jstrescapecpy(char *pt, const char *spt) { +char * HP_strlib_jstrescapecpy(char *pt, const char *spt) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_jstrescapecpy_pre > 0) { - char* (*preHookFunc) (char **pt, const char **spt); + char * (*preHookFunc) (char **pt, const char **spt); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescapecpy_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_jstrescapecpy_pre[hIndex].func; @@ -11713,7 +11713,7 @@ char* HP_strlib_jstrescapecpy(char *pt, const char *spt) { retVal___ = HPMHooks.source.strlib.jstrescapecpy(pt, spt); } if (HPMHooks.count.HP_strlib_jstrescapecpy_post > 0) { - char* (*postHookFunc) (char* retVal___, char *pt, const char *spt); + char * (*postHookFunc) (char * retVal___, char *pt, const char *spt); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescapecpy_post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_jstrescapecpy_post[hIndex].func; retVal___ = postHookFunc(retVal___, pt, spt); @@ -11775,11 +11775,11 @@ int HP_strlib_remove_control_chars_(char *str) { } return retVal___; } -char* HP_strlib_trim_(char *str) { +char * HP_strlib_trim_(char *str) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_trim__pre > 0) { - char* (*preHookFunc) (char **str); + char * (*preHookFunc) (char **str); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_trim__pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_trim__pre[hIndex].func; @@ -11794,7 +11794,7 @@ char* HP_strlib_trim_(char *str) { retVal___ = HPMHooks.source.strlib.trim_(str); } if (HPMHooks.count.HP_strlib_trim__post > 0) { - char* (*postHookFunc) (char* retVal___, char *str); + char * (*postHookFunc) (char * retVal___, char *str); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_trim__post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_trim__post[hIndex].func; retVal___ = postHookFunc(retVal___, str); @@ -11802,11 +11802,11 @@ char* HP_strlib_trim_(char *str) { } return retVal___; } -char* HP_strlib_normalize_name_(char *str, const char *delims) { +char * HP_strlib_normalize_name_(char *str, const char *delims) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_normalize_name__pre > 0) { - char* (*preHookFunc) (char **str, const char **delims); + char * (*preHookFunc) (char **str, const char **delims); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_normalize_name__pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_normalize_name__pre[hIndex].func; @@ -11821,7 +11821,7 @@ char* HP_strlib_normalize_name_(char *str, const char *delims) { retVal___ = HPMHooks.source.strlib.normalize_name_(str, delims); } if (HPMHooks.count.HP_strlib_normalize_name__post > 0) { - char* (*postHookFunc) (char* retVal___, char *str, const char *delims); + char * (*postHookFunc) (char * retVal___, char *str, const char *delims); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_normalize_name__post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_normalize_name__post[hIndex].func; retVal___ = postHookFunc(retVal___, str, delims); @@ -11829,11 +11829,11 @@ char* HP_strlib_normalize_name_(char *str, const char *delims) { } return retVal___; } -const char* HP_strlib_stristr_(const char *haystack, const char *needle) { +const char * HP_strlib_stristr_(const char *haystack, const char *needle) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_stristr__pre > 0) { - const char* (*preHookFunc) (const char **haystack, const char **needle); + const char * (*preHookFunc) (const char **haystack, const char **needle); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_stristr__pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_stristr__pre[hIndex].func; @@ -11848,7 +11848,7 @@ const char* HP_strlib_stristr_(const char *haystack, const char *needle) { retVal___ = HPMHooks.source.strlib.stristr_(haystack, needle); } if (HPMHooks.count.HP_strlib_stristr__post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *haystack, const char *needle); + const char * (*postHookFunc) (const char * retVal___, const char *haystack, const char *needle); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_stristr__post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_stristr__post[hIndex].func; retVal___ = postHookFunc(retVal___, haystack, needle); @@ -11883,11 +11883,11 @@ size_t HP_strlib_strnlen_(const char *string, size_t maxlen) { } return retVal___; } -char* HP_strlib_strtok_r_(char *s1, const char *s2, char **lasts) { +char * HP_strlib_strtok_r_(char *s1, const char *s2, char **lasts) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_strtok_r__pre > 0) { - char* (*preHookFunc) (char **s1, const char **s2, char ***lasts); + char * (*preHookFunc) (char **s1, const char **s2, char ***lasts); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strtok_r__pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_strtok_r__pre[hIndex].func; @@ -11902,7 +11902,7 @@ char* HP_strlib_strtok_r_(char *s1, const char *s2, char **lasts) { retVal___ = HPMHooks.source.strlib.strtok_r_(s1, s2, lasts); } if (HPMHooks.count.HP_strlib_strtok_r__post > 0) { - char* (*postHookFunc) (char* retVal___, char *s1, const char *s2, char **lasts); + char * (*postHookFunc) (char * retVal___, char *s1, const char *s2, char **lasts); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strtok_r__post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_strtok_r__post[hIndex].func; retVal___ = postHookFunc(retVal___, s1, s2, lasts); @@ -11964,11 +11964,11 @@ int HP_strlib_config_switch_(const char *str) { } return retVal___; } -char* HP_strlib_safestrncpy_(char *dst, const char *src, size_t n) { +char * HP_strlib_safestrncpy_(char *dst, const char *src, size_t n) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_safestrncpy__pre > 0) { - char* (*preHookFunc) (char **dst, const char **src, size_t *n); + char * (*preHookFunc) (char **dst, const char **src, size_t *n); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_safestrncpy__pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_safestrncpy__pre[hIndex].func; @@ -11983,7 +11983,7 @@ char* HP_strlib_safestrncpy_(char *dst, const char *src, size_t n) { retVal___ = HPMHooks.source.strlib.safestrncpy_(dst, src, n); } if (HPMHooks.count.HP_strlib_safestrncpy__post > 0) { - char* (*postHookFunc) (char* retVal___, char *dst, const char *src, size_t n); + char * (*postHookFunc) (char * retVal___, char *dst, const char *src, size_t n); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_safestrncpy__post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_safestrncpy__post[hIndex].func; retVal___ = postHookFunc(retVal___, dst, src, n); @@ -12208,11 +12208,11 @@ size_t HP_sv_unescape_c(char *out_dest, const char *src, size_t len) { } return retVal___; } -const char* HP_sv_skip_escaped_c(const char *p) { +const char * HP_sv_skip_escaped_c(const char *p) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sv_skip_escaped_c_pre > 0) { - const char* (*preHookFunc) (const char **p); + const char * (*preHookFunc) (const char **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sv_skip_escaped_c_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sv_skip_escaped_c_pre[hIndex].func; @@ -12227,7 +12227,7 @@ const char* HP_sv_skip_escaped_c(const char *p) { retVal___ = HPMHooks.source.sv.skip_escaped_c(p); } if (HPMHooks.count.HP_sv_skip_escaped_c_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p); + const char * (*postHookFunc) (const char * retVal___, const char *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_sv_skip_escaped_c_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sv_skip_escaped_c_post[hIndex].func; retVal___ = postHookFunc(retVal___, p); @@ -12290,11 +12290,11 @@ long HP_sysinfo_getpagesize(void) { } return retVal___; } -const char* HP_sysinfo_platform(void) { +const char * HP_sysinfo_platform(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_platform_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_platform_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_platform_pre[hIndex].func; @@ -12309,7 +12309,7 @@ const char* HP_sysinfo_platform(void) { retVal___ = HPMHooks.source.sysinfo.platform(); } if (HPMHooks.count.HP_sysinfo_platform_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_platform_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_platform_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -12317,11 +12317,11 @@ const char* HP_sysinfo_platform(void) { } return retVal___; } -const char* HP_sysinfo_osversion(void) { +const char * HP_sysinfo_osversion(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_osversion_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_osversion_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_osversion_pre[hIndex].func; @@ -12336,7 +12336,7 @@ const char* HP_sysinfo_osversion(void) { retVal___ = HPMHooks.source.sysinfo.osversion(); } if (HPMHooks.count.HP_sysinfo_osversion_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_osversion_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_osversion_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -12344,11 +12344,11 @@ const char* HP_sysinfo_osversion(void) { } return retVal___; } -const char* HP_sysinfo_cpu(void) { +const char * HP_sysinfo_cpu(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_cpu_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_cpu_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_cpu_pre[hIndex].func; @@ -12363,7 +12363,7 @@ const char* HP_sysinfo_cpu(void) { retVal___ = HPMHooks.source.sysinfo.cpu(); } if (HPMHooks.count.HP_sysinfo_cpu_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_cpu_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_cpu_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -12398,11 +12398,11 @@ int HP_sysinfo_cpucores(void) { } return retVal___; } -const char* HP_sysinfo_arch(void) { +const char * HP_sysinfo_arch(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_arch_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_arch_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_arch_pre[hIndex].func; @@ -12417,7 +12417,7 @@ const char* HP_sysinfo_arch(void) { retVal___ = HPMHooks.source.sysinfo.arch(); } if (HPMHooks.count.HP_sysinfo_arch_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_arch_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_arch_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -12452,11 +12452,11 @@ bool HP_sysinfo_is64bit(void) { } return retVal___; } -const char* HP_sysinfo_compiler(void) { +const char * HP_sysinfo_compiler(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_compiler_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_compiler_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_compiler_pre[hIndex].func; @@ -12471,7 +12471,7 @@ const char* HP_sysinfo_compiler(void) { retVal___ = HPMHooks.source.sysinfo.compiler(); } if (HPMHooks.count.HP_sysinfo_compiler_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_compiler_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_compiler_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -12479,11 +12479,11 @@ const char* HP_sysinfo_compiler(void) { } return retVal___; } -const char* HP_sysinfo_cflags(void) { +const char * HP_sysinfo_cflags(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_cflags_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_cflags_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_cflags_pre[hIndex].func; @@ -12498,7 +12498,7 @@ const char* HP_sysinfo_cflags(void) { retVal___ = HPMHooks.source.sysinfo.cflags(); } if (HPMHooks.count.HP_sysinfo_cflags_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_cflags_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_cflags_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -12506,11 +12506,11 @@ const char* HP_sysinfo_cflags(void) { } return retVal___; } -const char* HP_sysinfo_time(void) { +const char * HP_sysinfo_time(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_time_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_time_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_time_pre[hIndex].func; @@ -12525,7 +12525,7 @@ const char* HP_sysinfo_time(void) { retVal___ = HPMHooks.source.sysinfo.time(); } if (HPMHooks.count.HP_sysinfo_time_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_time_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_time_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -12533,11 +12533,11 @@ const char* HP_sysinfo_time(void) { } return retVal___; } -const char* HP_sysinfo_vcstype(void) { +const char * HP_sysinfo_vcstype(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_vcstype_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcstype_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_vcstype_pre[hIndex].func; @@ -12552,7 +12552,7 @@ const char* HP_sysinfo_vcstype(void) { retVal___ = HPMHooks.source.sysinfo.vcstype(); } if (HPMHooks.count.HP_sysinfo_vcstype_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcstype_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_vcstype_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -12587,11 +12587,11 @@ int HP_sysinfo_vcstypeid(void) { } return retVal___; } -const char* HP_sysinfo_vcsrevision_src(void) { +const char * HP_sysinfo_vcsrevision_src(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_vcsrevision_src_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcsrevision_src_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_vcsrevision_src_pre[hIndex].func; @@ -12606,7 +12606,7 @@ const char* HP_sysinfo_vcsrevision_src(void) { retVal___ = HPMHooks.source.sysinfo.vcsrevision_src(); } if (HPMHooks.count.HP_sysinfo_vcsrevision_src_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcsrevision_src_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_vcsrevision_src_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -12614,11 +12614,11 @@ const char* HP_sysinfo_vcsrevision_src(void) { } return retVal___; } -const char* HP_sysinfo_vcsrevision_scripts(void) { +const char * HP_sysinfo_vcsrevision_scripts(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_vcsrevision_scripts_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcsrevision_scripts_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_vcsrevision_scripts_pre[hIndex].func; @@ -12633,7 +12633,7 @@ const char* HP_sysinfo_vcsrevision_scripts(void) { retVal___ = HPMHooks.source.sysinfo.vcsrevision_scripts(); } if (HPMHooks.count.HP_sysinfo_vcsrevision_scripts_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcsrevision_scripts_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_vcsrevision_scripts_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -12748,11 +12748,11 @@ bool HP_sysinfo_is_superuser(void) { } return retVal___; } -const char* HP_sysinfo_zlib(void) { +const char * HP_sysinfo_zlib(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_zlib_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_zlib_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_zlib_pre[hIndex].func; @@ -12767,7 +12767,7 @@ const char* HP_sysinfo_zlib(void) { retVal___ = HPMHooks.source.sysinfo.zlib(); } if (HPMHooks.count.HP_sysinfo_zlib_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_zlib_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_zlib_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -12880,11 +12880,11 @@ void HP_thread_final(void) { } return; } -struct thread_handle* HP_thread_create(threadFunc entry_point, void *param) { +struct thread_handle * HP_thread_create(threadFunc entry_point, void *param) { int hIndex = 0; - struct thread_handle* retVal___ = NULL; + struct thread_handle * retVal___ = NULL; if (HPMHooks.count.HP_thread_create_pre > 0) { - struct thread_handle* (*preHookFunc) (threadFunc *entry_point, void **param); + struct thread_handle * (*preHookFunc) (threadFunc *entry_point, void **param); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_create_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_thread_create_pre[hIndex].func; @@ -12899,7 +12899,7 @@ struct thread_handle* HP_thread_create(threadFunc entry_point, void *param) { retVal___ = HPMHooks.source.thread.create(entry_point, param); } if (HPMHooks.count.HP_thread_create_post > 0) { - struct thread_handle* (*postHookFunc) (struct thread_handle* retVal___, threadFunc entry_point, void *param); + struct thread_handle * (*postHookFunc) (struct thread_handle * retVal___, threadFunc entry_point, void *param); for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_create_post; hIndex++) { postHookFunc = HPMHooks.list.HP_thread_create_post[hIndex].func; retVal___ = postHookFunc(retVal___, entry_point, param); @@ -12907,11 +12907,11 @@ struct thread_handle* HP_thread_create(threadFunc entry_point, void *param) { } return retVal___; } -struct thread_handle* HP_thread_create_opt(threadFunc entry_point, void *param, size_t stack_size, enum thread_priority prio) { +struct thread_handle * HP_thread_create_opt(threadFunc entry_point, void *param, size_t stack_size, enum thread_priority prio) { int hIndex = 0; - struct thread_handle* retVal___ = NULL; + struct thread_handle * retVal___ = NULL; if (HPMHooks.count.HP_thread_create_opt_pre > 0) { - struct thread_handle* (*preHookFunc) (threadFunc *entry_point, void **param, size_t *stack_size, enum thread_priority *prio); + struct thread_handle * (*preHookFunc) (threadFunc *entry_point, void **param, size_t *stack_size, enum thread_priority *prio); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_create_opt_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_thread_create_opt_pre[hIndex].func; @@ -12926,7 +12926,7 @@ struct thread_handle* HP_thread_create_opt(threadFunc entry_point, void *param, retVal___ = HPMHooks.source.thread.create_opt(entry_point, param, stack_size, prio); } if (HPMHooks.count.HP_thread_create_opt_post > 0) { - struct thread_handle* (*postHookFunc) (struct thread_handle* retVal___, threadFunc entry_point, void *param, size_t stack_size, enum thread_priority prio); + struct thread_handle * (*postHookFunc) (struct thread_handle * retVal___, threadFunc entry_point, void *param, size_t stack_size, enum thread_priority prio); for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_create_opt_post; hIndex++) { postHookFunc = HPMHooks.list.HP_thread_create_opt_post[hIndex].func; retVal___ = postHookFunc(retVal___, entry_point, param, stack_size, prio); @@ -12960,11 +12960,11 @@ void HP_thread_destroy(struct thread_handle *handle) { } return; } -struct thread_handle* HP_thread_self(void) { +struct thread_handle * HP_thread_self(void) { int hIndex = 0; - struct thread_handle* retVal___ = NULL; + struct thread_handle * retVal___ = NULL; if (HPMHooks.count.HP_thread_self_pre > 0) { - struct thread_handle* (*preHookFunc) (void); + struct thread_handle * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_self_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_thread_self_pre[hIndex].func; @@ -12979,7 +12979,7 @@ struct thread_handle* HP_thread_self(void) { retVal___ = HPMHooks.source.thread.self(); } if (HPMHooks.count.HP_thread_self_post > 0) { - struct thread_handle* (*postHookFunc) (struct thread_handle* retVal___); + struct thread_handle * (*postHookFunc) (struct thread_handle * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_self_post; hIndex++) { postHookFunc = HPMHooks.list.HP_thread_self_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -13229,11 +13229,11 @@ int HP_timer_add_interval(int64 tick, TimerFunc func, int id, intptr_t data, int } return retVal___; } -const struct TimerData* HP_timer_get(int tid) { +const struct TimerData * HP_timer_get(int tid) { int hIndex = 0; - const struct TimerData* retVal___ = NULL; + const struct TimerData * retVal___ = NULL; if (HPMHooks.count.HP_timer_get_pre > 0) { - const struct TimerData* (*preHookFunc) (int *tid); + const struct TimerData * (*preHookFunc) (int *tid); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_timer_get_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_timer_get_pre[hIndex].func; @@ -13248,7 +13248,7 @@ const struct TimerData* HP_timer_get(int tid) { retVal___ = HPMHooks.source.timer.get(tid); } if (HPMHooks.count.HP_timer_get_post > 0) { - const struct TimerData* (*postHookFunc) (const struct TimerData* retVal___, int tid); + const struct TimerData * (*postHookFunc) (const struct TimerData * retVal___, int tid); for (hIndex = 0; hIndex < HPMHooks.count.HP_timer_get_post; hIndex++) { postHookFunc = HPMHooks.list.HP_timer_get_post[hIndex].func; retVal___ = postHookFunc(retVal___, tid); diff --git a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc index b4b3b34645b..35787b9043b 100644 --- a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc @@ -79,11 +79,11 @@ bool HP_HCache_check(const char *file) { } return retVal___; } -FILE* HP_HCache_open(const char *file, const char *opt) { +FILE * HP_HCache_open(const char *file, const char *opt) { int hIndex = 0; - FILE* retVal___ = NULL; + FILE * retVal___ = NULL; if (HPMHooks.count.HP_HCache_open_pre > 0) { - FILE* (*preHookFunc) (const char **file, const char **opt); + FILE * (*preHookFunc) (const char **file, const char **opt); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_HCache_open_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_HCache_open_pre[hIndex].func; @@ -98,7 +98,7 @@ FILE* HP_HCache_open(const char *file, const char *opt) { retVal___ = HPMHooks.source.HCache.open(file, opt); } if (HPMHooks.count.HP_HCache_open_post > 0) { - FILE* (*postHookFunc) (FILE* retVal___, const char *file, const char *opt); + FILE * (*postHookFunc) (FILE * retVal___, const char *file, const char *opt); for (hIndex = 0; hIndex < HPMHooks.count.HP_HCache_open_post; hIndex++) { postHookFunc = HPMHooks.list.HP_HCache_open_post[hIndex].func; retVal___ = postHookFunc(retVal___, file, opt); @@ -187,11 +187,11 @@ void HP_capiif_final(void) { } return; } -struct online_char_data* HP_capiif_get_online_character(const struct PACKET_API_PROXY *p) { +struct online_char_data * HP_capiif_get_online_character(const struct PACKET_API_PROXY *p) { int hIndex = 0; - struct online_char_data* retVal___ = NULL; + struct online_char_data * retVal___ = NULL; if (HPMHooks.count.HP_capiif_get_online_character_pre > 0) { - struct online_char_data* (*preHookFunc) (const struct PACKET_API_PROXY **p); + struct online_char_data * (*preHookFunc) (const struct PACKET_API_PROXY **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_capiif_get_online_character_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_capiif_get_online_character_pre[hIndex].func; @@ -206,7 +206,7 @@ struct online_char_data* HP_capiif_get_online_character(const struct PACKET_API_ retVal___ = HPMHooks.source.capiif.get_online_character(p); } if (HPMHooks.count.HP_capiif_get_online_character_post > 0) { - struct online_char_data* (*postHookFunc) (struct online_char_data* retVal___, const struct PACKET_API_PROXY *p); + struct online_char_data * (*postHookFunc) (struct online_char_data * retVal___, const struct PACKET_API_PROXY *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_capiif_get_online_character_post; hIndex++) { postHookFunc = HPMHooks.list.HP_capiif_get_online_character_post[hIndex].func; retVal___ = postHookFunc(retVal___, p); @@ -5446,11 +5446,11 @@ bool HP_cmdline_arg_next_value(const char *name, int current_arg, int argc) { } return retVal___; } -const char* HP_cmdline_arg_source(struct CmdlineArgData *arg) { +const char * HP_cmdline_arg_source(struct CmdlineArgData *arg) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_cmdline_arg_source_pre > 0) { - const char* (*preHookFunc) (struct CmdlineArgData **arg); + const char * (*preHookFunc) (struct CmdlineArgData **arg); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_source_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_cmdline_arg_source_pre[hIndex].func; @@ -5465,7 +5465,7 @@ const char* HP_cmdline_arg_source(struct CmdlineArgData *arg) { retVal___ = HPMHooks.source.cmdline.arg_source(arg); } if (HPMHooks.count.HP_cmdline_arg_source_post > 0) { - const char* (*postHookFunc) (const char* retVal___, struct CmdlineArgData *arg); + const char * (*postHookFunc) (const char * retVal___, struct CmdlineArgData *arg); for (hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_source_post; hIndex++) { postHookFunc = HPMHooks.list.HP_cmdline_arg_source_post[hIndex].func; retVal___ = postHookFunc(retVal___, arg); @@ -5741,11 +5741,11 @@ DBReleaser HP_DB_custom_release(enum DBReleaseOption which) { } return retVal___; } -struct DBMap* HP_DB_alloc(const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen) { +struct DBMap * HP_DB_alloc(const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen) { int hIndex = 0; - struct DBMap* retVal___ = NULL; + struct DBMap * retVal___ = NULL; if (HPMHooks.count.HP_DB_alloc_pre > 0) { - struct DBMap* (*preHookFunc) (const char **file, const char **func, int *line, enum DBType *type, enum DBOptions *options, unsigned short *maxlen); + struct DBMap * (*preHookFunc) (const char **file, const char **func, int *line, enum DBType *type, enum DBOptions *options, unsigned short *maxlen); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_DB_alloc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_DB_alloc_pre[hIndex].func; @@ -5760,7 +5760,7 @@ struct DBMap* HP_DB_alloc(const char *file, const char *func, int line, enum DBT retVal___ = HPMHooks.source.DB.alloc(file, func, line, type, options, maxlen); } if (HPMHooks.count.HP_DB_alloc_post > 0) { - struct DBMap* (*postHookFunc) (struct DBMap* retVal___, const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen); + struct DBMap * (*postHookFunc) (struct DBMap * retVal___, const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen); for (hIndex = 0; hIndex < HPMHooks.count.HP_DB_alloc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_DB_alloc_post[hIndex].func; retVal___ = postHookFunc(retVal___, file, func, line, type, options, maxlen); @@ -6038,11 +6038,11 @@ unsigned int HP_DB_data2ui(struct DBData *data) { } return retVal___; } -void* HP_DB_data2ptr(struct DBData *data) { +void * HP_DB_data2ptr(struct DBData *data) { int hIndex = 0; - void* retVal___ = NULL; + void * retVal___ = NULL; if (HPMHooks.count.HP_DB_data2ptr_pre > 0) { - void* (*preHookFunc) (struct DBData **data); + void * (*preHookFunc) (struct DBData **data); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ptr_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_DB_data2ptr_pre[hIndex].func; @@ -6057,7 +6057,7 @@ void* HP_DB_data2ptr(struct DBData *data) { retVal___ = HPMHooks.source.DB.data2ptr(data); } if (HPMHooks.count.HP_DB_data2ptr_post > 0) { - void* (*postHookFunc) (void* retVal___, struct DBData *data); + void * (*postHookFunc) (void * retVal___, struct DBData *data); for (hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ptr_post; hIndex++) { postHookFunc = HPMHooks.list.HP_DB_data2ptr_post[hIndex].func; retVal___ = postHookFunc(retVal___, data); @@ -6386,11 +6386,11 @@ bool HP_extraconf_read_emblems(void) { return retVal___; } /* geoip_interface */ -const char* HP_geoip_getcountry(uint32 ipnum) { +const char * HP_geoip_getcountry(uint32 ipnum) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_geoip_getcountry_pre > 0) { - const char* (*preHookFunc) (uint32 *ipnum); + const char * (*preHookFunc) (uint32 *ipnum); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_geoip_getcountry_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_geoip_getcountry_pre[hIndex].func; @@ -6405,7 +6405,7 @@ const char* HP_geoip_getcountry(uint32 ipnum) { retVal___ = HPMHooks.source.geoip.getcountry(ipnum); } if (HPMHooks.count.HP_geoip_getcountry_post > 0) { - const char* (*postHookFunc) (const char* retVal___, uint32 ipnum); + const char * (*postHookFunc) (const char * retVal___, uint32 ipnum); for (hIndex = 0; hIndex < HPMHooks.count.HP_geoip_getcountry_post; hIndex++) { postHookFunc = HPMHooks.list.HP_geoip_getcountry_post[hIndex].func; retVal___ = postHookFunc(retVal___, ipnum); @@ -7553,11 +7553,11 @@ bool HP_inter_guild_tosql(struct guild *g, int flag) { } return retVal___; } -struct guild* HP_inter_guild_fromsql(int guild_id) { +struct guild * HP_inter_guild_fromsql(int guild_id) { int hIndex = 0; - struct guild* retVal___ = NULL; + struct guild * retVal___ = NULL; if (HPMHooks.count.HP_inter_guild_fromsql_pre > 0) { - struct guild* (*preHookFunc) (int *guild_id); + struct guild * (*preHookFunc) (int *guild_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_fromsql_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_inter_guild_fromsql_pre[hIndex].func; @@ -7572,7 +7572,7 @@ struct guild* HP_inter_guild_fromsql(int guild_id) { retVal___ = HPMHooks.source.inter_guild.fromsql(guild_id); } if (HPMHooks.count.HP_inter_guild_fromsql_post > 0) { - struct guild* (*postHookFunc) (struct guild* retVal___, int guild_id); + struct guild * (*postHookFunc) (struct guild * retVal___, int guild_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_fromsql_post; hIndex++) { postHookFunc = HPMHooks.list.HP_inter_guild_fromsql_post[hIndex].func; retVal___ = postHookFunc(retVal___, guild_id); @@ -7607,11 +7607,11 @@ int HP_inter_guild_castle_tosql(struct guild_castle *gc) { } return retVal___; } -struct guild_castle* HP_inter_guild_castle_fromsql(int castle_id) { +struct guild_castle * HP_inter_guild_castle_fromsql(int castle_id) { int hIndex = 0; - struct guild_castle* retVal___ = NULL; + struct guild_castle * retVal___ = NULL; if (HPMHooks.count.HP_inter_guild_castle_fromsql_pre > 0) { - struct guild_castle* (*preHookFunc) (int *castle_id); + struct guild_castle * (*preHookFunc) (int *castle_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_castle_fromsql_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_inter_guild_castle_fromsql_pre[hIndex].func; @@ -7626,7 +7626,7 @@ struct guild_castle* HP_inter_guild_castle_fromsql(int castle_id) { retVal___ = HPMHooks.source.inter_guild.castle_fromsql(castle_id); } if (HPMHooks.count.HP_inter_guild_castle_fromsql_post > 0) { - struct guild_castle* (*postHookFunc) (struct guild_castle* retVal___, int castle_id); + struct guild_castle * (*postHookFunc) (struct guild_castle * retVal___, int castle_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_castle_fromsql_post; hIndex++) { postHookFunc = HPMHooks.list.HP_inter_guild_castle_fromsql_post[hIndex].func; retVal___ = postHookFunc(retVal___, castle_id); @@ -8044,11 +8044,11 @@ int HP_inter_guild_broken(int guild_id) { } return retVal___; } -struct guild* HP_inter_guild_create(const char *name, const struct guild_member *master) { +struct guild * HP_inter_guild_create(const char *name, const struct guild_member *master) { int hIndex = 0; - struct guild* retVal___ = NULL; + struct guild * retVal___ = NULL; if (HPMHooks.count.HP_inter_guild_create_pre > 0) { - struct guild* (*preHookFunc) (const char **name, const struct guild_member **master); + struct guild * (*preHookFunc) (const char **name, const struct guild_member **master); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_create_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_inter_guild_create_pre[hIndex].func; @@ -8063,7 +8063,7 @@ struct guild* HP_inter_guild_create(const char *name, const struct guild_member retVal___ = HPMHooks.source.inter_guild.create(name, master); } if (HPMHooks.count.HP_inter_guild_create_post > 0) { - struct guild* (*postHookFunc) (struct guild* retVal___, const char *name, const struct guild_member *master); + struct guild * (*postHookFunc) (struct guild * retVal___, const char *name, const struct guild_member *master); for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_create_post; hIndex++) { postHookFunc = HPMHooks.list.HP_inter_guild_create_post[hIndex].func; retVal___ = postHookFunc(retVal___, name, master); @@ -8693,11 +8693,11 @@ bool HP_inter_homunculus_rename(const char *name) { return retVal___; } /* inter_interface */ -const char* HP_inter_msg_txt(int msg_number) { +const char * HP_inter_msg_txt(int msg_number) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_inter_msg_txt_pre > 0) { - const char* (*preHookFunc) (int *msg_number); + const char * (*preHookFunc) (int *msg_number); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_msg_txt_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_inter_msg_txt_pre[hIndex].func; @@ -8712,7 +8712,7 @@ const char* HP_inter_msg_txt(int msg_number) { retVal___ = HPMHooks.source.inter.msg_txt(msg_number); } if (HPMHooks.count.HP_inter_msg_txt_post > 0) { - const char* (*postHookFunc) (const char* retVal___, int msg_number); + const char * (*postHookFunc) (const char * retVal___, int msg_number); for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_msg_txt_post; hIndex++) { postHookFunc = HPMHooks.list.HP_inter_msg_txt_post[hIndex].func; retVal___ = postHookFunc(retVal___, msg_number); @@ -8773,11 +8773,11 @@ void HP_inter_do_final_msg(void) { } return; } -const char* HP_inter_job_name(int class) { +const char * HP_inter_job_name(int class) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_inter_job_name_pre > 0) { - const char* (*preHookFunc) (int *class); + const char * (*preHookFunc) (int *class); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_job_name_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_inter_job_name_pre[hIndex].func; @@ -8792,7 +8792,7 @@ const char* HP_inter_job_name(int class) { retVal___ = HPMHooks.source.inter.job_name(class); } if (HPMHooks.count.HP_inter_job_name_post > 0) { - const char* (*postHookFunc) (const char* retVal___, int class); + const char * (*postHookFunc) (const char * retVal___, int class); for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_job_name_post; hIndex++) { postHookFunc = HPMHooks.list.HP_inter_job_name_post[hIndex].func; retVal___ = postHookFunc(retVal___, class); @@ -9940,11 +9940,11 @@ int HP_inter_party_del_nonexistent_party(int party_id) { } return retVal___; } -struct party_data* HP_inter_party_fromsql(int party_id) { +struct party_data * HP_inter_party_fromsql(int party_id) { int hIndex = 0; - struct party_data* retVal___ = NULL; + struct party_data * retVal___ = NULL; if (HPMHooks.count.HP_inter_party_fromsql_pre > 0) { - struct party_data* (*preHookFunc) (int *party_id); + struct party_data * (*preHookFunc) (int *party_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_fromsql_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_inter_party_fromsql_pre[hIndex].func; @@ -9959,7 +9959,7 @@ struct party_data* HP_inter_party_fromsql(int party_id) { retVal___ = HPMHooks.source.inter_party.fromsql(party_id); } if (HPMHooks.count.HP_inter_party_fromsql_post > 0) { - struct party_data* (*postHookFunc) (struct party_data* retVal___, int party_id); + struct party_data * (*postHookFunc) (struct party_data * retVal___, int party_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_fromsql_post; hIndex++) { postHookFunc = HPMHooks.list.HP_inter_party_fromsql_post[hIndex].func; retVal___ = postHookFunc(retVal___, party_id); @@ -10020,11 +10020,11 @@ void HP_inter_party_sql_final(void) { } return; } -struct party_data* HP_inter_party_search_partyname(const char *str) { +struct party_data * HP_inter_party_search_partyname(const char *str) { int hIndex = 0; - struct party_data* retVal___ = NULL; + struct party_data * retVal___ = NULL; if (HPMHooks.count.HP_inter_party_search_partyname_pre > 0) { - struct party_data* (*preHookFunc) (const char **str); + struct party_data * (*preHookFunc) (const char **str); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_search_partyname_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_inter_party_search_partyname_pre[hIndex].func; @@ -10039,7 +10039,7 @@ struct party_data* HP_inter_party_search_partyname(const char *str) { retVal___ = HPMHooks.source.inter_party.search_partyname(str); } if (HPMHooks.count.HP_inter_party_search_partyname_post > 0) { - struct party_data* (*postHookFunc) (struct party_data* retVal___, const char *str); + struct party_data * (*postHookFunc) (struct party_data * retVal___, const char *str); for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_search_partyname_post; hIndex++) { postHookFunc = HPMHooks.list.HP_inter_party_search_partyname_post[hIndex].func; retVal___ = postHookFunc(retVal___, str); @@ -10209,11 +10209,11 @@ int HP_inter_party_CharOffline(int char_id, int party_id) { } return retVal___; } -struct party_data* HP_inter_party_create(const char *name, int item, int item2, const struct party_member *leader) { +struct party_data * HP_inter_party_create(const char *name, int item, int item2, const struct party_member *leader) { int hIndex = 0; - struct party_data* retVal___ = NULL; + struct party_data * retVal___ = NULL; if (HPMHooks.count.HP_inter_party_create_pre > 0) { - struct party_data* (*preHookFunc) (const char **name, int *item, int *item2, const struct party_member **leader); + struct party_data * (*preHookFunc) (const char **name, int *item, int *item2, const struct party_member **leader); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_create_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_inter_party_create_pre[hIndex].func; @@ -10228,7 +10228,7 @@ struct party_data* HP_inter_party_create(const char *name, int item, int item2, retVal___ = HPMHooks.source.inter_party.create(name, item, item2, leader); } if (HPMHooks.count.HP_inter_party_create_post > 0) { - struct party_data* (*postHookFunc) (struct party_data* retVal___, const char *name, int item, int item2, const struct party_member *leader); + struct party_data * (*postHookFunc) (struct party_data * retVal___, const char *name, int item, int item2, const struct party_member *leader); for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_create_post; hIndex++) { postHookFunc = HPMHooks.list.HP_inter_party_create_post[hIndex].func; retVal___ = postHookFunc(retVal___, name, item, item2, leader); @@ -10560,11 +10560,11 @@ int HP_inter_pet_parse_frommap(int fd) { } return retVal___; } -struct s_pet* HP_inter_pet_create(int account_id, int char_id, int pet_class, int pet_lv, int pet_egg_id, int pet_equip, short intimate, short hungry, char rename_flag, char incubate, const char *pet_name) { +struct s_pet * HP_inter_pet_create(int account_id, int char_id, int pet_class, int pet_lv, int pet_egg_id, int pet_equip, short intimate, short hungry, char rename_flag, char incubate, const char *pet_name) { int hIndex = 0; - struct s_pet* retVal___ = NULL; + struct s_pet * retVal___ = NULL; if (HPMHooks.count.HP_inter_pet_create_pre > 0) { - struct s_pet* (*preHookFunc) (int *account_id, int *char_id, int *pet_class, int *pet_lv, int *pet_egg_id, int *pet_equip, short *intimate, short *hungry, char *rename_flag, char *incubate, const char **pet_name); + struct s_pet * (*preHookFunc) (int *account_id, int *char_id, int *pet_class, int *pet_lv, int *pet_egg_id, int *pet_equip, short *intimate, short *hungry, char *rename_flag, char *incubate, const char **pet_name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_pet_create_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_inter_pet_create_pre[hIndex].func; @@ -10579,7 +10579,7 @@ struct s_pet* HP_inter_pet_create(int account_id, int char_id, int pet_class, in retVal___ = HPMHooks.source.inter_pet.create(account_id, char_id, pet_class, pet_lv, pet_egg_id, pet_equip, intimate, hungry, rename_flag, incubate, pet_name); } if (HPMHooks.count.HP_inter_pet_create_post > 0) { - struct s_pet* (*postHookFunc) (struct s_pet* retVal___, int account_id, int char_id, int pet_class, int pet_lv, int pet_egg_id, int pet_equip, short intimate, short hungry, char rename_flag, char incubate, const char *pet_name); + struct s_pet * (*postHookFunc) (struct s_pet * retVal___, int account_id, int char_id, int pet_class, int pet_lv, int pet_egg_id, int pet_equip, short intimate, short hungry, char rename_flag, char incubate, const char *pet_name); for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_pet_create_post; hIndex++) { postHookFunc = HPMHooks.list.HP_inter_pet_create_post[hIndex].func; retVal___ = postHookFunc(retVal___, account_id, char_id, pet_class, pet_lv, pet_egg_id, pet_equip, intimate, hungry, rename_flag, incubate, pet_name); @@ -10587,11 +10587,11 @@ struct s_pet* HP_inter_pet_create(int account_id, int char_id, int pet_class, in } return retVal___; } -struct s_pet* HP_inter_pet_load(int account_id, int char_id, int pet_id) { +struct s_pet * HP_inter_pet_load(int account_id, int char_id, int pet_id) { int hIndex = 0; - struct s_pet* retVal___ = NULL; + struct s_pet * retVal___ = NULL; if (HPMHooks.count.HP_inter_pet_load_pre > 0) { - struct s_pet* (*preHookFunc) (int *account_id, int *char_id, int *pet_id); + struct s_pet * (*preHookFunc) (int *account_id, int *char_id, int *pet_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_pet_load_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_inter_pet_load_pre[hIndex].func; @@ -10606,7 +10606,7 @@ struct s_pet* HP_inter_pet_load(int account_id, int char_id, int pet_id) { retVal___ = HPMHooks.source.inter_pet.load(account_id, char_id, pet_id); } if (HPMHooks.count.HP_inter_pet_load_post > 0) { - struct s_pet* (*postHookFunc) (struct s_pet* retVal___, int account_id, int char_id, int pet_id); + struct s_pet * (*postHookFunc) (struct s_pet * retVal___, int account_id, int char_id, int pet_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_pet_load_post; hIndex++) { postHookFunc = HPMHooks.list.HP_inter_pet_load_post[hIndex].func; retVal___ = postHookFunc(retVal___, account_id, char_id, pet_id); @@ -10642,11 +10642,11 @@ int HP_inter_quest_parse_frommap(int fd) { } return retVal___; } -struct quest* HP_inter_quest_fromsql(int char_id, int *count) { +struct quest * HP_inter_quest_fromsql(int char_id, int *count) { int hIndex = 0; - struct quest* retVal___ = NULL; + struct quest * retVal___ = NULL; if (HPMHooks.count.HP_inter_quest_fromsql_pre > 0) { - struct quest* (*preHookFunc) (int *char_id, int **count); + struct quest * (*preHookFunc) (int *char_id, int **count); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_quest_fromsql_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_inter_quest_fromsql_pre[hIndex].func; @@ -10661,7 +10661,7 @@ struct quest* HP_inter_quest_fromsql(int char_id, int *count) { retVal___ = HPMHooks.source.inter_quest.fromsql(char_id, count); } if (HPMHooks.count.HP_inter_quest_fromsql_post > 0) { - struct quest* (*postHookFunc) (struct quest* retVal___, int char_id, int *count); + struct quest * (*postHookFunc) (struct quest * retVal___, int char_id, int *count); for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_quest_fromsql_post; hIndex++) { postHookFunc = HPMHooks.list.HP_inter_quest_fromsql_post[hIndex].func; retVal___ = postHookFunc(retVal___, char_id, count); @@ -11048,15 +11048,15 @@ int HP_inter_rodex_getitems(int64 mail_id, struct rodex_item *items) { return retVal___; } /* inter_storage_interface */ -int HP_inter_storage_tosql(int account_id, const struct storage_data *p) { +int HP_inter_storage_tosql(int account_id, int storage_id, const struct storage_data *p) { int hIndex = 0; int retVal___ = 0; if (HPMHooks.count.HP_inter_storage_tosql_pre > 0) { - int (*preHookFunc) (int *account_id, const struct storage_data **p); + int (*preHookFunc) (int *account_id, int *storage_id, const struct storage_data **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_storage_tosql_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_inter_storage_tosql_pre[hIndex].func; - retVal___ = preHookFunc(&account_id, &p); + retVal___ = preHookFunc(&account_id, &storage_id, &p); } if (*HPMforce_return) { *HPMforce_return = false; @@ -11064,26 +11064,26 @@ int HP_inter_storage_tosql(int account_id, const struct storage_data *p) { } } { - retVal___ = HPMHooks.source.inter_storage.tosql(account_id, p); + retVal___ = HPMHooks.source.inter_storage.tosql(account_id, storage_id, p); } if (HPMHooks.count.HP_inter_storage_tosql_post > 0) { - int (*postHookFunc) (int retVal___, int account_id, const struct storage_data *p); + int (*postHookFunc) (int retVal___, int account_id, int storage_id, const struct storage_data *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_storage_tosql_post; hIndex++) { postHookFunc = HPMHooks.list.HP_inter_storage_tosql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, account_id, p); + retVal___ = postHookFunc(retVal___, account_id, storage_id, p); } } return retVal___; } -int HP_inter_storage_fromsql(int account_id, struct storage_data *p) { +int HP_inter_storage_fromsql(int account_id, int storage_id, struct storage_data *p) { int hIndex = 0; int retVal___ = 0; if (HPMHooks.count.HP_inter_storage_fromsql_pre > 0) { - int (*preHookFunc) (int *account_id, struct storage_data **p); + int (*preHookFunc) (int *account_id, int *storage_id, struct storage_data **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_storage_fromsql_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_inter_storage_fromsql_pre[hIndex].func; - retVal___ = preHookFunc(&account_id, &p); + retVal___ = preHookFunc(&account_id, &storage_id, &p); } if (*HPMforce_return) { *HPMforce_return = false; @@ -11091,13 +11091,13 @@ int HP_inter_storage_fromsql(int account_id, struct storage_data *p) { } } { - retVal___ = HPMHooks.source.inter_storage.fromsql(account_id, p); + retVal___ = HPMHooks.source.inter_storage.fromsql(account_id, storage_id, p); } if (HPMHooks.count.HP_inter_storage_fromsql_post > 0) { - int (*postHookFunc) (int retVal___, int account_id, struct storage_data *p); + int (*postHookFunc) (int retVal___, int account_id, int storage_id, struct storage_data *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_storage_fromsql_post; hIndex++) { postHookFunc = HPMHooks.list.HP_inter_storage_fromsql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, account_id, p); + retVal___ = postHookFunc(retVal___, account_id, storage_id, p); } } return retVal___; @@ -12037,11 +12037,11 @@ int HP_libconfig_setting_get_bool(const struct config_setting_t *setting) { } return retVal___; } -const char* HP_libconfig_setting_get_string(const struct config_setting_t *setting) { +const char * HP_libconfig_setting_get_string(const struct config_setting_t *setting) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_get_string_pre > 0) { - const char* (*preHookFunc) (const struct config_setting_t **setting); + const char * (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_pre[hIndex].func; @@ -12056,7 +12056,7 @@ const char* HP_libconfig_setting_get_string(const struct config_setting_t *setti retVal___ = HPMHooks.source.libconfig.setting_get_string(setting); } if (HPMHooks.count.HP_libconfig_setting_get_string_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting); + const char * (*postHookFunc) (const char * retVal___, const struct config_setting_t *setting); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -12064,11 +12064,11 @@ const char* HP_libconfig_setting_get_string(const struct config_setting_t *setti } return retVal___; } -struct config_setting_t* HP_libconfig_setting_lookup(struct config_setting_t *setting, const char *name) { +struct config_setting_t * HP_libconfig_setting_lookup(struct config_setting_t *setting, const char *name) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_lookup_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, const char **name); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_pre[hIndex].func; @@ -12083,7 +12083,7 @@ struct config_setting_t* HP_libconfig_setting_lookup(struct config_setting_t *se retVal___ = HPMHooks.source.libconfig.setting_lookup(setting, name); } if (HPMHooks.count.HP_libconfig_setting_lookup_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, const char *name); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name); @@ -12523,11 +12523,11 @@ int HP_libconfig_setting_get_bool_elem(const struct config_setting_t *setting, i } return retVal___; } -const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t *setting, int idx) { +const char * HP_libconfig_setting_get_string_elem(const struct config_setting_t *setting, int idx) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_get_string_elem_pre > 0) { - const char* (*preHookFunc) (const struct config_setting_t **setting, int *idx); + const char * (*preHookFunc) (const struct config_setting_t **setting, int *idx); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_pre[hIndex].func; @@ -12542,7 +12542,7 @@ const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t * retVal___ = HPMHooks.source.libconfig.setting_get_string_elem(setting, idx); } if (HPMHooks.count.HP_libconfig_setting_get_string_elem_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting, int idx); + const char * (*postHookFunc) (const char * retVal___, const struct config_setting_t *setting, int idx); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx); @@ -12550,11 +12550,11 @@ const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t * } return retVal___; } -struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting_t *setting, int idx, int value) { +struct config_setting_t * HP_libconfig_setting_set_int_elem(struct config_setting_t *setting, int idx, int value) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_set_int_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_pre[hIndex].func; @@ -12569,7 +12569,7 @@ struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting retVal___ = HPMHooks.source.libconfig.setting_set_int_elem(setting, idx, value); } if (HPMHooks.count.HP_libconfig_setting_set_int_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int value); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, int value); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx, value); @@ -12577,11 +12577,11 @@ struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting } return retVal___; } -struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setting_t *setting, int idx, int64 value) { +struct config_setting_t * HP_libconfig_setting_set_int64_elem(struct config_setting_t *setting, int idx, int64 value) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, int64 *value); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, int *idx, int64 *value); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_pre[hIndex].func; @@ -12596,7 +12596,7 @@ struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setti retVal___ = HPMHooks.source.libconfig.setting_set_int64_elem(setting, idx, value); } if (HPMHooks.count.HP_libconfig_setting_set_int64_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int64 value); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, int64 value); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx, value); @@ -12604,11 +12604,11 @@ struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setti } return retVal___; } -struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setting_t *setting, int idx, double value) { +struct config_setting_t * HP_libconfig_setting_set_float_elem(struct config_setting_t *setting, int idx, double value) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_set_float_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, double *value); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, int *idx, double *value); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_pre[hIndex].func; @@ -12623,7 +12623,7 @@ struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setti retVal___ = HPMHooks.source.libconfig.setting_set_float_elem(setting, idx, value); } if (HPMHooks.count.HP_libconfig_setting_set_float_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, double value); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, double value); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx, value); @@ -12631,11 +12631,11 @@ struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setti } return retVal___; } -struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_setting_t *setting, int idx, int value) { +struct config_setting_t * HP_libconfig_setting_set_bool_elem(struct config_setting_t *setting, int idx, int value) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_pre[hIndex].func; @@ -12650,7 +12650,7 @@ struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_settin retVal___ = HPMHooks.source.libconfig.setting_set_bool_elem(setting, idx, value); } if (HPMHooks.count.HP_libconfig_setting_set_bool_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int value); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, int value); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx, value); @@ -12658,11 +12658,11 @@ struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_settin } return retVal___; } -struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_setting_t *setting, int idx, const char *value) { +struct config_setting_t * HP_libconfig_setting_set_string_elem(struct config_setting_t *setting, int idx, const char *value) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_set_string_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, const char **value); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, int *idx, const char **value); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_pre[hIndex].func; @@ -12677,7 +12677,7 @@ struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_sett retVal___ = HPMHooks.source.libconfig.setting_set_string_elem(setting, idx, value); } if (HPMHooks.count.HP_libconfig_setting_set_string_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, const char *value); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, const char *value); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx, value); @@ -12739,11 +12739,11 @@ int HP_libconfig_setting_length(const struct config_setting_t *setting) { } return retVal___; } -struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setting_t *setting, unsigned int idx) { +struct config_setting_t * HP_libconfig_setting_get_elem(const struct config_setting_t *setting, unsigned int idx) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_get_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (const struct config_setting_t **setting, unsigned int *idx); + struct config_setting_t * (*preHookFunc) (const struct config_setting_t **setting, unsigned int *idx); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_pre[hIndex].func; @@ -12758,7 +12758,7 @@ struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setti retVal___ = HPMHooks.source.libconfig.setting_get_elem(setting, idx); } if (HPMHooks.count.HP_libconfig_setting_get_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int idx); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, const struct config_setting_t *setting, unsigned int idx); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx); @@ -12766,11 +12766,11 @@ struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setti } return retVal___; } -struct config_setting_t* HP_libconfig_setting_get_member(const struct config_setting_t *setting, const char *name) { +struct config_setting_t * HP_libconfig_setting_get_member(const struct config_setting_t *setting, const char *name) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_get_member_pre > 0) { - struct config_setting_t* (*preHookFunc) (const struct config_setting_t **setting, const char **name); + struct config_setting_t * (*preHookFunc) (const struct config_setting_t **setting, const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_pre[hIndex].func; @@ -12785,7 +12785,7 @@ struct config_setting_t* HP_libconfig_setting_get_member(const struct config_set retVal___ = HPMHooks.source.libconfig.setting_get_member(setting, name); } if (HPMHooks.count.HP_libconfig_setting_get_member_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, const char *name); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, const struct config_setting_t *setting, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name); @@ -12793,11 +12793,11 @@ struct config_setting_t* HP_libconfig_setting_get_member(const struct config_set } return retVal___; } -struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *parent, const char *name, int type) { +struct config_setting_t * HP_libconfig_setting_add(struct config_setting_t *parent, const char *name, int type) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_add_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **parent, const char **name, int *type); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **parent, const char **name, int *type); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_add_pre[hIndex].func; @@ -12812,7 +12812,7 @@ struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *paren retVal___ = HPMHooks.source.libconfig.setting_add(parent, name, type); } if (HPMHooks.count.HP_libconfig_setting_add_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int type); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *parent, const char *name, int type); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_add_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, name, type); @@ -12900,11 +12900,11 @@ void HP_libconfig_setting_set_hook(struct config_setting_t *setting, void *hook) } return; } -struct config_setting_t* HP_libconfig_lookup(const struct config_t *config, const char *filepath) { +struct config_setting_t * HP_libconfig_lookup(const struct config_t *config, const char *filepath) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_lookup_pre > 0) { - struct config_setting_t* (*preHookFunc) (const struct config_t **config, const char **filepath); + struct config_setting_t * (*preHookFunc) (const struct config_t **config, const char **filepath); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_pre[hIndex].func; @@ -12919,7 +12919,7 @@ struct config_setting_t* HP_libconfig_lookup(const struct config_t *config, cons retVal___ = HPMHooks.source.libconfig.lookup(config, filepath); } if (HPMHooks.count.HP_libconfig_lookup_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_t *config, const char *filepath); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, const struct config_t *config, const char *filepath); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath); @@ -17587,15 +17587,15 @@ int HP_mapif_parse_SaveGuildStorage(int fd) { } return retVal___; } -int HP_mapif_account_storage_load(int fd, int account_id) { +int HP_mapif_account_storage_load(int fd, int account_id, int storage_id, int storage_size) { int hIndex = 0; int retVal___ = 0; if (HPMHooks.count.HP_mapif_account_storage_load_pre > 0) { - int (*preHookFunc) (int *fd, int *account_id); + int (*preHookFunc) (int *fd, int *account_id, int *storage_id, int *storage_size); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_account_storage_load_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mapif_account_storage_load_pre[hIndex].func; - retVal___ = preHookFunc(&fd, &account_id); + retVal___ = preHookFunc(&fd, &account_id, &storage_id, &storage_size); } if (*HPMforce_return) { *HPMforce_return = false; @@ -17603,13 +17603,13 @@ int HP_mapif_account_storage_load(int fd, int account_id) { } } { - retVal___ = HPMHooks.source.mapif.account_storage_load(fd, account_id); + retVal___ = HPMHooks.source.mapif.account_storage_load(fd, account_id, storage_id, storage_size); } if (HPMHooks.count.HP_mapif_account_storage_load_post > 0) { - int (*postHookFunc) (int retVal___, int fd, int account_id); + int (*postHookFunc) (int retVal___, int fd, int account_id, int storage_id, int storage_size); for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_account_storage_load_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mapif_account_storage_load_post[hIndex].func; - retVal___ = postHookFunc(retVal___, fd, account_id); + retVal___ = postHookFunc(retVal___, fd, account_id, storage_id, storage_size); } } return retVal___; @@ -17668,14 +17668,14 @@ int HP_mapif_pAccountStorageSave(int fd) { } return retVal___; } -void HP_mapif_sAccountStorageSaveAck(int fd, int account_id, bool save) { +void HP_mapif_sAccountStorageSaveAck(int fd, int account_id, int storage_id, bool save) { int hIndex = 0; if (HPMHooks.count.HP_mapif_sAccountStorageSaveAck_pre > 0) { - void (*preHookFunc) (int *fd, int *account_id, bool *save); + void (*preHookFunc) (int *fd, int *account_id, int *storage_id, bool *save); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_sAccountStorageSaveAck_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mapif_sAccountStorageSaveAck_pre[hIndex].func; - preHookFunc(&fd, &account_id, &save); + preHookFunc(&fd, &account_id, &storage_id, &save); } if (*HPMforce_return) { *HPMforce_return = false; @@ -17683,13 +17683,13 @@ void HP_mapif_sAccountStorageSaveAck(int fd, int account_id, bool save) { } } { - HPMHooks.source.mapif.sAccountStorageSaveAck(fd, account_id, save); + HPMHooks.source.mapif.sAccountStorageSaveAck(fd, account_id, storage_id, save); } if (HPMHooks.count.HP_mapif_sAccountStorageSaveAck_post > 0) { - void (*postHookFunc) (int fd, int account_id, bool save); + void (*postHookFunc) (int fd, int account_id, int storage_id, bool save); for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_sAccountStorageSaveAck_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mapif_sAccountStorageSaveAck_post[hIndex].func; - postHookFunc(fd, account_id, save); + postHookFunc(fd, account_id, storage_id, save); } } return; @@ -18175,11 +18175,11 @@ void HP_mapindex_removemap(int index) { } return; } -const char* HP_mapindex_getmapname(const char *string, char *output) { +const char * HP_mapindex_getmapname(const char *string, char *output) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_mapindex_getmapname_pre > 0) { - const char* (*preHookFunc) (const char **string, char **output); + const char * (*preHookFunc) (const char **string, char **output); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_getmapname_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mapindex_getmapname_pre[hIndex].func; @@ -18194,7 +18194,7 @@ const char* HP_mapindex_getmapname(const char *string, char *output) { retVal___ = HPMHooks.source.mapindex.getmapname(string, output); } if (HPMHooks.count.HP_mapindex_getmapname_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *string, char *output); + const char * (*postHookFunc) (const char * retVal___, const char *string, char *output); for (hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_getmapname_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mapindex_getmapname_post[hIndex].func; retVal___ = postHookFunc(retVal___, string, output); @@ -18202,11 +18202,11 @@ const char* HP_mapindex_getmapname(const char *string, char *output) { } return retVal___; } -const char* HP_mapindex_getmapname_ext(const char *string, char *output) { +const char * HP_mapindex_getmapname_ext(const char *string, char *output) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_mapindex_getmapname_ext_pre > 0) { - const char* (*preHookFunc) (const char **string, char **output); + const char * (*preHookFunc) (const char **string, char **output); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_getmapname_ext_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mapindex_getmapname_ext_pre[hIndex].func; @@ -18221,7 +18221,7 @@ const char* HP_mapindex_getmapname_ext(const char *string, char *output) { retVal___ = HPMHooks.source.mapindex.getmapname_ext(string, output); } if (HPMHooks.count.HP_mapindex_getmapname_ext_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *string, char *output); + const char * (*postHookFunc) (const char * retVal___, const char *string, char *output); for (hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_getmapname_ext_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mapindex_getmapname_ext_post[hIndex].func; retVal___ = postHookFunc(retVal___, string, output); @@ -18256,11 +18256,11 @@ unsigned short HP_mapindex_name2id(const char *p1) { } return retVal___; } -const char* HP_mapindex_id2name(uint16 id, const char *file, int line, const char *func) { +const char * HP_mapindex_id2name(uint16 id, const char *file, int line, const char *func) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_mapindex_id2name_pre > 0) { - const char* (*preHookFunc) (uint16 *id, const char **file, int *line, const char **func); + const char * (*preHookFunc) (uint16 *id, const char **file, int *line, const char **func); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_id2name_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mapindex_id2name_pre[hIndex].func; @@ -18275,7 +18275,7 @@ const char* HP_mapindex_id2name(uint16 id, const char *file, int line, const cha retVal___ = HPMHooks.source.mapindex.id2name(id, file, line, func); } if (HPMHooks.count.HP_mapindex_id2name_post > 0) { - const char* (*postHookFunc) (const char* retVal___, uint16 id, const char *file, int line, const char *func); + const char * (*postHookFunc) (const char * retVal___, uint16 id, const char *file, int line, const char *func); for (hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_id2name_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mapindex_id2name_post[hIndex].func; retVal___ = postHookFunc(retVal___, id, file, line, func); @@ -18390,11 +18390,11 @@ void HP_md5_salt(int len, char *output) { return; } /* mutex_interface */ -struct mutex_data* HP_mutex_create(void) { +struct mutex_data * HP_mutex_create(void) { int hIndex = 0; - struct mutex_data* retVal___ = NULL; + struct mutex_data * retVal___ = NULL; if (HPMHooks.count.HP_mutex_create_pre > 0) { - struct mutex_data* (*preHookFunc) (void); + struct mutex_data * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mutex_create_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mutex_create_pre[hIndex].func; @@ -18409,7 +18409,7 @@ struct mutex_data* HP_mutex_create(void) { retVal___ = HPMHooks.source.mutex.create(); } if (HPMHooks.count.HP_mutex_create_post > 0) { - struct mutex_data* (*postHookFunc) (struct mutex_data* retVal___); + struct mutex_data * (*postHookFunc) (struct mutex_data * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_mutex_create_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mutex_create_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -18522,11 +18522,11 @@ void HP_mutex_unlock(struct mutex_data *m) { } return; } -struct cond_data* HP_mutex_cond_create(void) { +struct cond_data * HP_mutex_cond_create(void) { int hIndex = 0; - struct cond_data* retVal___ = NULL; + struct cond_data * retVal___ = NULL; if (HPMHooks.count.HP_mutex_cond_create_pre > 0) { - struct cond_data* (*preHookFunc) (void); + struct cond_data * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mutex_cond_create_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mutex_cond_create_pre[hIndex].func; @@ -18541,7 +18541,7 @@ struct cond_data* HP_mutex_cond_create(void) { retVal___ = HPMHooks.source.mutex.cond_create(); } if (HPMHooks.count.HP_mutex_cond_create_post > 0) { - struct cond_data* (*postHookFunc) (struct cond_data* retVal___); + struct cond_data * (*postHookFunc) (struct cond_data * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_mutex_cond_create_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mutex_cond_create_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -19661,11 +19661,11 @@ int HP_showmsg_showMessageV(const char *string, va_list ap) { } return retVal___; } -const char* HP_showmsg_getLogFileName(void) { +const char * HP_showmsg_getLogFileName(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_showmsg_getLogFileName_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_showmsg_getLogFileName_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_showmsg_getLogFileName_pre[hIndex].func; @@ -19680,7 +19680,7 @@ const char* HP_showmsg_getLogFileName(void) { retVal___ = HPMHooks.source.showmsg.getLogFileName(); } if (HPMHooks.count.HP_showmsg_getLogFileName_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_showmsg_getLogFileName_post; hIndex++) { postHookFunc = HPMHooks.list.HP_showmsg_getLogFileName_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -20351,11 +20351,11 @@ uint32 HP_sockt_host2ip(const char *hostname) { } return retVal___; } -const char* HP_sockt_ip2str(uint32 ip, char *ip_str) { +const char * HP_sockt_ip2str(uint32 ip, char *ip_str) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sockt_ip2str_pre > 0) { - const char* (*preHookFunc) (uint32 *ip, char **ip_str); + const char * (*preHookFunc) (uint32 *ip, char **ip_str); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sockt_ip2str_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sockt_ip2str_pre[hIndex].func; @@ -20370,7 +20370,7 @@ const char* HP_sockt_ip2str(uint32 ip, char *ip_str) { retVal___ = HPMHooks.source.sockt.ip2str(ip, ip_str); } if (HPMHooks.count.HP_sockt_ip2str_post > 0) { - const char* (*postHookFunc) (const char* retVal___, uint32 ip, char *ip_str); + const char * (*postHookFunc) (const char * retVal___, uint32 ip, char *ip_str); for (hIndex = 0; hIndex < HPMHooks.count.HP_sockt_ip2str_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sockt_ip2str_post[hIndex].func; retVal___ = postHookFunc(retVal___, ip, ip_str); @@ -21109,11 +21109,11 @@ void HP_SQL_Free(struct Sql *self) { } return; } -struct Sql* HP_SQL_Malloc(void) { +struct Sql * HP_SQL_Malloc(void) { int hIndex = 0; - struct Sql* retVal___ = NULL; + struct Sql * retVal___ = NULL; if (HPMHooks.count.HP_SQL_Malloc_pre > 0) { - struct Sql* (*preHookFunc) (void); + struct Sql * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Malloc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_SQL_Malloc_pre[hIndex].func; @@ -21128,7 +21128,7 @@ struct Sql* HP_SQL_Malloc(void) { retVal___ = HPMHooks.source.SQL.Malloc(); } if (HPMHooks.count.HP_SQL_Malloc_post > 0) { - struct Sql* (*postHookFunc) (struct Sql* retVal___); + struct Sql * (*postHookFunc) (struct Sql * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Malloc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_SQL_Malloc_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -21136,11 +21136,11 @@ struct Sql* HP_SQL_Malloc(void) { } return retVal___; } -struct SqlStmt* HP_SQL_StmtMalloc(struct Sql *sql) { +struct SqlStmt * HP_SQL_StmtMalloc(struct Sql *sql) { int hIndex = 0; - struct SqlStmt* retVal___ = NULL; + struct SqlStmt * retVal___ = NULL; if (HPMHooks.count.HP_SQL_StmtMalloc_pre > 0) { - struct SqlStmt* (*preHookFunc) (struct Sql **sql); + struct SqlStmt * (*preHookFunc) (struct Sql **sql); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtMalloc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_SQL_StmtMalloc_pre[hIndex].func; @@ -21155,7 +21155,7 @@ struct SqlStmt* HP_SQL_StmtMalloc(struct Sql *sql) { retVal___ = HPMHooks.source.SQL.StmtMalloc(sql); } if (HPMHooks.count.HP_SQL_StmtMalloc_post > 0) { - struct SqlStmt* (*postHookFunc) (struct SqlStmt* retVal___, struct Sql *sql); + struct SqlStmt * (*postHookFunc) (struct SqlStmt * retVal___, struct Sql *sql); for (hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtMalloc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_SQL_StmtMalloc_post[hIndex].func; retVal___ = postHookFunc(retVal___, sql); @@ -21518,11 +21518,11 @@ void HP_SQL_StmtShowDebug_(struct SqlStmt *self, const char *debug_file, const u return; } /* stringbuf_interface */ -StringBuf* HP_StrBuf_Malloc(void) { +StringBuf * HP_StrBuf_Malloc(void) { int hIndex = 0; - StringBuf* retVal___ = NULL; + StringBuf * retVal___ = NULL; if (HPMHooks.count.HP_StrBuf_Malloc_pre > 0) { - StringBuf* (*preHookFunc) (void); + StringBuf * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Malloc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_StrBuf_Malloc_pre[hIndex].func; @@ -21537,7 +21537,7 @@ StringBuf* HP_StrBuf_Malloc(void) { retVal___ = HPMHooks.source.StrBuf.Malloc(); } if (HPMHooks.count.HP_StrBuf_Malloc_post > 0) { - StringBuf* (*postHookFunc) (StringBuf* retVal___); + StringBuf * (*postHookFunc) (StringBuf * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Malloc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_StrBuf_Malloc_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -21685,11 +21685,11 @@ int HP_StrBuf_Length(StringBuf *self) { } return retVal___; } -char* HP_StrBuf_Value(StringBuf *self) { +char * HP_StrBuf_Value(StringBuf *self) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_StrBuf_Value_pre > 0) { - char* (*preHookFunc) (StringBuf **self); + char * (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Value_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_StrBuf_Value_pre[hIndex].func; @@ -21704,7 +21704,7 @@ char* HP_StrBuf_Value(StringBuf *self) { retVal___ = HPMHooks.source.StrBuf.Value(self); } if (HPMHooks.count.HP_StrBuf_Value_post > 0) { - char* (*postHookFunc) (char* retVal___, StringBuf *self); + char * (*postHookFunc) (char * retVal___, StringBuf *self); for (hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Value_post; hIndex++) { postHookFunc = HPMHooks.list.HP_StrBuf_Value_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -21791,11 +21791,11 @@ void HP_StrBuf_Free(StringBuf *self) { return; } /* strlib_interface */ -char* HP_strlib_jstrescape(char *pt) { +char * HP_strlib_jstrescape(char *pt) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_jstrescape_pre > 0) { - char* (*preHookFunc) (char **pt); + char * (*preHookFunc) (char **pt); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescape_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_jstrescape_pre[hIndex].func; @@ -21810,7 +21810,7 @@ char* HP_strlib_jstrescape(char *pt) { retVal___ = HPMHooks.source.strlib.jstrescape(pt); } if (HPMHooks.count.HP_strlib_jstrescape_post > 0) { - char* (*postHookFunc) (char* retVal___, char *pt); + char * (*postHookFunc) (char * retVal___, char *pt); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescape_post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_jstrescape_post[hIndex].func; retVal___ = postHookFunc(retVal___, pt); @@ -21818,11 +21818,11 @@ char* HP_strlib_jstrescape(char *pt) { } return retVal___; } -char* HP_strlib_jstrescapecpy(char *pt, const char *spt) { +char * HP_strlib_jstrescapecpy(char *pt, const char *spt) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_jstrescapecpy_pre > 0) { - char* (*preHookFunc) (char **pt, const char **spt); + char * (*preHookFunc) (char **pt, const char **spt); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescapecpy_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_jstrescapecpy_pre[hIndex].func; @@ -21837,7 +21837,7 @@ char* HP_strlib_jstrescapecpy(char *pt, const char *spt) { retVal___ = HPMHooks.source.strlib.jstrescapecpy(pt, spt); } if (HPMHooks.count.HP_strlib_jstrescapecpy_post > 0) { - char* (*postHookFunc) (char* retVal___, char *pt, const char *spt); + char * (*postHookFunc) (char * retVal___, char *pt, const char *spt); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescapecpy_post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_jstrescapecpy_post[hIndex].func; retVal___ = postHookFunc(retVal___, pt, spt); @@ -21899,11 +21899,11 @@ int HP_strlib_remove_control_chars_(char *str) { } return retVal___; } -char* HP_strlib_trim_(char *str) { +char * HP_strlib_trim_(char *str) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_trim__pre > 0) { - char* (*preHookFunc) (char **str); + char * (*preHookFunc) (char **str); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_trim__pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_trim__pre[hIndex].func; @@ -21918,7 +21918,7 @@ char* HP_strlib_trim_(char *str) { retVal___ = HPMHooks.source.strlib.trim_(str); } if (HPMHooks.count.HP_strlib_trim__post > 0) { - char* (*postHookFunc) (char* retVal___, char *str); + char * (*postHookFunc) (char * retVal___, char *str); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_trim__post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_trim__post[hIndex].func; retVal___ = postHookFunc(retVal___, str); @@ -21926,11 +21926,11 @@ char* HP_strlib_trim_(char *str) { } return retVal___; } -char* HP_strlib_normalize_name_(char *str, const char *delims) { +char * HP_strlib_normalize_name_(char *str, const char *delims) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_normalize_name__pre > 0) { - char* (*preHookFunc) (char **str, const char **delims); + char * (*preHookFunc) (char **str, const char **delims); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_normalize_name__pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_normalize_name__pre[hIndex].func; @@ -21945,7 +21945,7 @@ char* HP_strlib_normalize_name_(char *str, const char *delims) { retVal___ = HPMHooks.source.strlib.normalize_name_(str, delims); } if (HPMHooks.count.HP_strlib_normalize_name__post > 0) { - char* (*postHookFunc) (char* retVal___, char *str, const char *delims); + char * (*postHookFunc) (char * retVal___, char *str, const char *delims); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_normalize_name__post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_normalize_name__post[hIndex].func; retVal___ = postHookFunc(retVal___, str, delims); @@ -21953,11 +21953,11 @@ char* HP_strlib_normalize_name_(char *str, const char *delims) { } return retVal___; } -const char* HP_strlib_stristr_(const char *haystack, const char *needle) { +const char * HP_strlib_stristr_(const char *haystack, const char *needle) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_stristr__pre > 0) { - const char* (*preHookFunc) (const char **haystack, const char **needle); + const char * (*preHookFunc) (const char **haystack, const char **needle); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_stristr__pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_stristr__pre[hIndex].func; @@ -21972,7 +21972,7 @@ const char* HP_strlib_stristr_(const char *haystack, const char *needle) { retVal___ = HPMHooks.source.strlib.stristr_(haystack, needle); } if (HPMHooks.count.HP_strlib_stristr__post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *haystack, const char *needle); + const char * (*postHookFunc) (const char * retVal___, const char *haystack, const char *needle); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_stristr__post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_stristr__post[hIndex].func; retVal___ = postHookFunc(retVal___, haystack, needle); @@ -22007,11 +22007,11 @@ size_t HP_strlib_strnlen_(const char *string, size_t maxlen) { } return retVal___; } -char* HP_strlib_strtok_r_(char *s1, const char *s2, char **lasts) { +char * HP_strlib_strtok_r_(char *s1, const char *s2, char **lasts) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_strtok_r__pre > 0) { - char* (*preHookFunc) (char **s1, const char **s2, char ***lasts); + char * (*preHookFunc) (char **s1, const char **s2, char ***lasts); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strtok_r__pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_strtok_r__pre[hIndex].func; @@ -22026,7 +22026,7 @@ char* HP_strlib_strtok_r_(char *s1, const char *s2, char **lasts) { retVal___ = HPMHooks.source.strlib.strtok_r_(s1, s2, lasts); } if (HPMHooks.count.HP_strlib_strtok_r__post > 0) { - char* (*postHookFunc) (char* retVal___, char *s1, const char *s2, char **lasts); + char * (*postHookFunc) (char * retVal___, char *s1, const char *s2, char **lasts); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strtok_r__post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_strtok_r__post[hIndex].func; retVal___ = postHookFunc(retVal___, s1, s2, lasts); @@ -22088,11 +22088,11 @@ int HP_strlib_config_switch_(const char *str) { } return retVal___; } -char* HP_strlib_safestrncpy_(char *dst, const char *src, size_t n) { +char * HP_strlib_safestrncpy_(char *dst, const char *src, size_t n) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_safestrncpy__pre > 0) { - char* (*preHookFunc) (char **dst, const char **src, size_t *n); + char * (*preHookFunc) (char **dst, const char **src, size_t *n); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_safestrncpy__pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_safestrncpy__pre[hIndex].func; @@ -22107,7 +22107,7 @@ char* HP_strlib_safestrncpy_(char *dst, const char *src, size_t n) { retVal___ = HPMHooks.source.strlib.safestrncpy_(dst, src, n); } if (HPMHooks.count.HP_strlib_safestrncpy__post > 0) { - char* (*postHookFunc) (char* retVal___, char *dst, const char *src, size_t n); + char * (*postHookFunc) (char * retVal___, char *dst, const char *src, size_t n); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_safestrncpy__post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_safestrncpy__post[hIndex].func; retVal___ = postHookFunc(retVal___, dst, src, n); @@ -22332,11 +22332,11 @@ size_t HP_sv_unescape_c(char *out_dest, const char *src, size_t len) { } return retVal___; } -const char* HP_sv_skip_escaped_c(const char *p) { +const char * HP_sv_skip_escaped_c(const char *p) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sv_skip_escaped_c_pre > 0) { - const char* (*preHookFunc) (const char **p); + const char * (*preHookFunc) (const char **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sv_skip_escaped_c_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sv_skip_escaped_c_pre[hIndex].func; @@ -22351,7 +22351,7 @@ const char* HP_sv_skip_escaped_c(const char *p) { retVal___ = HPMHooks.source.sv.skip_escaped_c(p); } if (HPMHooks.count.HP_sv_skip_escaped_c_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p); + const char * (*postHookFunc) (const char * retVal___, const char *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_sv_skip_escaped_c_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sv_skip_escaped_c_post[hIndex].func; retVal___ = postHookFunc(retVal___, p); @@ -22414,11 +22414,11 @@ long HP_sysinfo_getpagesize(void) { } return retVal___; } -const char* HP_sysinfo_platform(void) { +const char * HP_sysinfo_platform(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_platform_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_platform_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_platform_pre[hIndex].func; @@ -22433,7 +22433,7 @@ const char* HP_sysinfo_platform(void) { retVal___ = HPMHooks.source.sysinfo.platform(); } if (HPMHooks.count.HP_sysinfo_platform_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_platform_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_platform_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -22441,11 +22441,11 @@ const char* HP_sysinfo_platform(void) { } return retVal___; } -const char* HP_sysinfo_osversion(void) { +const char * HP_sysinfo_osversion(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_osversion_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_osversion_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_osversion_pre[hIndex].func; @@ -22460,7 +22460,7 @@ const char* HP_sysinfo_osversion(void) { retVal___ = HPMHooks.source.sysinfo.osversion(); } if (HPMHooks.count.HP_sysinfo_osversion_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_osversion_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_osversion_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -22468,11 +22468,11 @@ const char* HP_sysinfo_osversion(void) { } return retVal___; } -const char* HP_sysinfo_cpu(void) { +const char * HP_sysinfo_cpu(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_cpu_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_cpu_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_cpu_pre[hIndex].func; @@ -22487,7 +22487,7 @@ const char* HP_sysinfo_cpu(void) { retVal___ = HPMHooks.source.sysinfo.cpu(); } if (HPMHooks.count.HP_sysinfo_cpu_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_cpu_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_cpu_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -22522,11 +22522,11 @@ int HP_sysinfo_cpucores(void) { } return retVal___; } -const char* HP_sysinfo_arch(void) { +const char * HP_sysinfo_arch(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_arch_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_arch_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_arch_pre[hIndex].func; @@ -22541,7 +22541,7 @@ const char* HP_sysinfo_arch(void) { retVal___ = HPMHooks.source.sysinfo.arch(); } if (HPMHooks.count.HP_sysinfo_arch_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_arch_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_arch_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -22576,11 +22576,11 @@ bool HP_sysinfo_is64bit(void) { } return retVal___; } -const char* HP_sysinfo_compiler(void) { +const char * HP_sysinfo_compiler(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_compiler_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_compiler_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_compiler_pre[hIndex].func; @@ -22595,7 +22595,7 @@ const char* HP_sysinfo_compiler(void) { retVal___ = HPMHooks.source.sysinfo.compiler(); } if (HPMHooks.count.HP_sysinfo_compiler_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_compiler_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_compiler_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -22603,11 +22603,11 @@ const char* HP_sysinfo_compiler(void) { } return retVal___; } -const char* HP_sysinfo_cflags(void) { +const char * HP_sysinfo_cflags(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_cflags_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_cflags_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_cflags_pre[hIndex].func; @@ -22622,7 +22622,7 @@ const char* HP_sysinfo_cflags(void) { retVal___ = HPMHooks.source.sysinfo.cflags(); } if (HPMHooks.count.HP_sysinfo_cflags_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_cflags_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_cflags_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -22630,11 +22630,11 @@ const char* HP_sysinfo_cflags(void) { } return retVal___; } -const char* HP_sysinfo_time(void) { +const char * HP_sysinfo_time(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_time_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_time_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_time_pre[hIndex].func; @@ -22649,7 +22649,7 @@ const char* HP_sysinfo_time(void) { retVal___ = HPMHooks.source.sysinfo.time(); } if (HPMHooks.count.HP_sysinfo_time_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_time_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_time_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -22657,11 +22657,11 @@ const char* HP_sysinfo_time(void) { } return retVal___; } -const char* HP_sysinfo_vcstype(void) { +const char * HP_sysinfo_vcstype(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_vcstype_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcstype_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_vcstype_pre[hIndex].func; @@ -22676,7 +22676,7 @@ const char* HP_sysinfo_vcstype(void) { retVal___ = HPMHooks.source.sysinfo.vcstype(); } if (HPMHooks.count.HP_sysinfo_vcstype_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcstype_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_vcstype_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -22711,11 +22711,11 @@ int HP_sysinfo_vcstypeid(void) { } return retVal___; } -const char* HP_sysinfo_vcsrevision_src(void) { +const char * HP_sysinfo_vcsrevision_src(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_vcsrevision_src_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcsrevision_src_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_vcsrevision_src_pre[hIndex].func; @@ -22730,7 +22730,7 @@ const char* HP_sysinfo_vcsrevision_src(void) { retVal___ = HPMHooks.source.sysinfo.vcsrevision_src(); } if (HPMHooks.count.HP_sysinfo_vcsrevision_src_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcsrevision_src_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_vcsrevision_src_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -22738,11 +22738,11 @@ const char* HP_sysinfo_vcsrevision_src(void) { } return retVal___; } -const char* HP_sysinfo_vcsrevision_scripts(void) { +const char * HP_sysinfo_vcsrevision_scripts(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_vcsrevision_scripts_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcsrevision_scripts_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_vcsrevision_scripts_pre[hIndex].func; @@ -22757,7 +22757,7 @@ const char* HP_sysinfo_vcsrevision_scripts(void) { retVal___ = HPMHooks.source.sysinfo.vcsrevision_scripts(); } if (HPMHooks.count.HP_sysinfo_vcsrevision_scripts_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcsrevision_scripts_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_vcsrevision_scripts_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -22872,11 +22872,11 @@ bool HP_sysinfo_is_superuser(void) { } return retVal___; } -const char* HP_sysinfo_zlib(void) { +const char * HP_sysinfo_zlib(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_zlib_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_zlib_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_zlib_pre[hIndex].func; @@ -22891,7 +22891,7 @@ const char* HP_sysinfo_zlib(void) { retVal___ = HPMHooks.source.sysinfo.zlib(); } if (HPMHooks.count.HP_sysinfo_zlib_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_zlib_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_zlib_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -23004,11 +23004,11 @@ void HP_thread_final(void) { } return; } -struct thread_handle* HP_thread_create(threadFunc entry_point, void *param) { +struct thread_handle * HP_thread_create(threadFunc entry_point, void *param) { int hIndex = 0; - struct thread_handle* retVal___ = NULL; + struct thread_handle * retVal___ = NULL; if (HPMHooks.count.HP_thread_create_pre > 0) { - struct thread_handle* (*preHookFunc) (threadFunc *entry_point, void **param); + struct thread_handle * (*preHookFunc) (threadFunc *entry_point, void **param); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_create_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_thread_create_pre[hIndex].func; @@ -23023,7 +23023,7 @@ struct thread_handle* HP_thread_create(threadFunc entry_point, void *param) { retVal___ = HPMHooks.source.thread.create(entry_point, param); } if (HPMHooks.count.HP_thread_create_post > 0) { - struct thread_handle* (*postHookFunc) (struct thread_handle* retVal___, threadFunc entry_point, void *param); + struct thread_handle * (*postHookFunc) (struct thread_handle * retVal___, threadFunc entry_point, void *param); for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_create_post; hIndex++) { postHookFunc = HPMHooks.list.HP_thread_create_post[hIndex].func; retVal___ = postHookFunc(retVal___, entry_point, param); @@ -23031,11 +23031,11 @@ struct thread_handle* HP_thread_create(threadFunc entry_point, void *param) { } return retVal___; } -struct thread_handle* HP_thread_create_opt(threadFunc entry_point, void *param, size_t stack_size, enum thread_priority prio) { +struct thread_handle * HP_thread_create_opt(threadFunc entry_point, void *param, size_t stack_size, enum thread_priority prio) { int hIndex = 0; - struct thread_handle* retVal___ = NULL; + struct thread_handle * retVal___ = NULL; if (HPMHooks.count.HP_thread_create_opt_pre > 0) { - struct thread_handle* (*preHookFunc) (threadFunc *entry_point, void **param, size_t *stack_size, enum thread_priority *prio); + struct thread_handle * (*preHookFunc) (threadFunc *entry_point, void **param, size_t *stack_size, enum thread_priority *prio); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_create_opt_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_thread_create_opt_pre[hIndex].func; @@ -23050,7 +23050,7 @@ struct thread_handle* HP_thread_create_opt(threadFunc entry_point, void *param, retVal___ = HPMHooks.source.thread.create_opt(entry_point, param, stack_size, prio); } if (HPMHooks.count.HP_thread_create_opt_post > 0) { - struct thread_handle* (*postHookFunc) (struct thread_handle* retVal___, threadFunc entry_point, void *param, size_t stack_size, enum thread_priority prio); + struct thread_handle * (*postHookFunc) (struct thread_handle * retVal___, threadFunc entry_point, void *param, size_t stack_size, enum thread_priority prio); for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_create_opt_post; hIndex++) { postHookFunc = HPMHooks.list.HP_thread_create_opt_post[hIndex].func; retVal___ = postHookFunc(retVal___, entry_point, param, stack_size, prio); @@ -23084,11 +23084,11 @@ void HP_thread_destroy(struct thread_handle *handle) { } return; } -struct thread_handle* HP_thread_self(void) { +struct thread_handle * HP_thread_self(void) { int hIndex = 0; - struct thread_handle* retVal___ = NULL; + struct thread_handle * retVal___ = NULL; if (HPMHooks.count.HP_thread_self_pre > 0) { - struct thread_handle* (*preHookFunc) (void); + struct thread_handle * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_self_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_thread_self_pre[hIndex].func; @@ -23103,7 +23103,7 @@ struct thread_handle* HP_thread_self(void) { retVal___ = HPMHooks.source.thread.self(); } if (HPMHooks.count.HP_thread_self_post > 0) { - struct thread_handle* (*postHookFunc) (struct thread_handle* retVal___); + struct thread_handle * (*postHookFunc) (struct thread_handle * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_self_post; hIndex++) { postHookFunc = HPMHooks.list.HP_thread_self_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -23353,11 +23353,11 @@ int HP_timer_add_interval(int64 tick, TimerFunc func, int id, intptr_t data, int } return retVal___; } -const struct TimerData* HP_timer_get(int tid) { +const struct TimerData * HP_timer_get(int tid) { int hIndex = 0; - const struct TimerData* retVal___ = NULL; + const struct TimerData * retVal___ = NULL; if (HPMHooks.count.HP_timer_get_pre > 0) { - const struct TimerData* (*preHookFunc) (int *tid); + const struct TimerData * (*preHookFunc) (int *tid); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_timer_get_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_timer_get_pre[hIndex].func; @@ -23372,7 +23372,7 @@ const struct TimerData* HP_timer_get(int tid) { retVal___ = HPMHooks.source.timer.get(tid); } if (HPMHooks.count.HP_timer_get_post > 0) { - const struct TimerData* (*postHookFunc) (const struct TimerData* retVal___, int tid); + const struct TimerData * (*postHookFunc) (const struct TimerData * retVal___, int tid); for (hIndex = 0; hIndex < HPMHooks.count.HP_timer_get_post; hIndex++) { postHookFunc = HPMHooks.list.HP_timer_get_post[hIndex].func; retVal___ = postHookFunc(retVal___, tid); diff --git a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc index eb9b7d9e8b2..ccca310ce8d 100644 --- a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc @@ -79,11 +79,11 @@ bool HP_HCache_check(const char *file) { } return retVal___; } -FILE* HP_HCache_open(const char *file, const char *opt) { +FILE * HP_HCache_open(const char *file, const char *opt) { int hIndex = 0; - FILE* retVal___ = NULL; + FILE * retVal___ = NULL; if (HPMHooks.count.HP_HCache_open_pre > 0) { - FILE* (*preHookFunc) (const char **file, const char **opt); + FILE * (*preHookFunc) (const char **file, const char **opt); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_HCache_open_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_HCache_open_pre[hIndex].func; @@ -98,7 +98,7 @@ FILE* HP_HCache_open(const char *file, const char *opt) { retVal___ = HPMHooks.source.HCache.open(file, opt); } if (HPMHooks.count.HP_HCache_open_post > 0) { - FILE* (*postHookFunc) (FILE* retVal___, const char *file, const char *opt); + FILE * (*postHookFunc) (FILE * retVal___, const char *file, const char *opt); for (hIndex = 0; hIndex < HPMHooks.count.HP_HCache_open_post; hIndex++) { postHookFunc = HPMHooks.list.HP_HCache_open_post[hIndex].func; retVal___ = postHookFunc(retVal___, file, opt); @@ -107,11 +107,11 @@ FILE* HP_HCache_open(const char *file, const char *opt) { return retVal___; } /* account_interface */ -struct Sql* HP_account_db_sql_up(AccountDB *self) { +struct Sql * HP_account_db_sql_up(AccountDB *self) { int hIndex = 0; - struct Sql* retVal___ = NULL; + struct Sql * retVal___ = NULL; if (HPMHooks.count.HP_account_db_sql_up_pre > 0) { - struct Sql* (*preHookFunc) (AccountDB **self); + struct Sql * (*preHookFunc) (AccountDB **self); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_account_db_sql_up_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_account_db_sql_up_pre[hIndex].func; @@ -126,7 +126,7 @@ struct Sql* HP_account_db_sql_up(AccountDB *self) { retVal___ = HPMHooks.source.account.db_sql_up(self); } if (HPMHooks.count.HP_account_db_sql_up_post > 0) { - struct Sql* (*postHookFunc) (struct Sql* retVal___, AccountDB *self); + struct Sql * (*postHookFunc) (struct Sql * retVal___, AccountDB *self); for (hIndex = 0; hIndex < HPMHooks.count.HP_account_db_sql_up_post; hIndex++) { postHookFunc = HPMHooks.list.HP_account_db_sql_up_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -240,11 +240,11 @@ bool HP_account_mmo_auth_tosql(AccountDB_SQL *db, const struct mmo_account *acc, } return retVal___; } -AccountDB* HP_account_db_sql(void) { +AccountDB * HP_account_db_sql(void) { int hIndex = 0; - AccountDB* retVal___ = NULL; + AccountDB * retVal___ = NULL; if (HPMHooks.count.HP_account_db_sql_pre > 0) { - AccountDB* (*preHookFunc) (void); + AccountDB * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_account_db_sql_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_account_db_sql_pre[hIndex].func; @@ -259,7 +259,7 @@ AccountDB* HP_account_db_sql(void) { retVal___ = HPMHooks.source.account.db_sql(); } if (HPMHooks.count.HP_account_db_sql_post > 0) { - AccountDB* (*postHookFunc) (AccountDB* retVal___); + AccountDB * (*postHookFunc) (AccountDB * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_account_db_sql_post; hIndex++) { postHookFunc = HPMHooks.list.HP_account_db_sql_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -509,11 +509,11 @@ bool HP_account_db_sql_load_str(AccountDB *self, struct mmo_account *acc, const } return retVal___; } -AccountDBIterator* HP_account_db_sql_iterator(AccountDB *self) { +AccountDBIterator * HP_account_db_sql_iterator(AccountDB *self) { int hIndex = 0; - AccountDBIterator* retVal___ = NULL; + AccountDBIterator * retVal___ = NULL; if (HPMHooks.count.HP_account_db_sql_iterator_pre > 0) { - AccountDBIterator* (*preHookFunc) (AccountDB **self); + AccountDBIterator * (*preHookFunc) (AccountDB **self); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_account_db_sql_iterator_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_account_db_sql_iterator_pre[hIndex].func; @@ -528,7 +528,7 @@ AccountDBIterator* HP_account_db_sql_iterator(AccountDB *self) { retVal___ = HPMHooks.source.account.db_sql_iterator(self); } if (HPMHooks.count.HP_account_db_sql_iterator_post > 0) { - AccountDBIterator* (*postHookFunc) (AccountDBIterator* retVal___, AccountDB *self); + AccountDBIterator * (*postHookFunc) (AccountDBIterator * retVal___, AccountDB *self); for (hIndex = 0; hIndex < HPMHooks.count.HP_account_db_sql_iterator_post; hIndex++) { postHookFunc = HPMHooks.list.HP_account_db_sql_iterator_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -778,11 +778,11 @@ bool HP_cmdline_arg_next_value(const char *name, int current_arg, int argc) { } return retVal___; } -const char* HP_cmdline_arg_source(struct CmdlineArgData *arg) { +const char * HP_cmdline_arg_source(struct CmdlineArgData *arg) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_cmdline_arg_source_pre > 0) { - const char* (*preHookFunc) (struct CmdlineArgData **arg); + const char * (*preHookFunc) (struct CmdlineArgData **arg); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_source_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_cmdline_arg_source_pre[hIndex].func; @@ -797,7 +797,7 @@ const char* HP_cmdline_arg_source(struct CmdlineArgData *arg) { retVal___ = HPMHooks.source.cmdline.arg_source(arg); } if (HPMHooks.count.HP_cmdline_arg_source_post > 0) { - const char* (*postHookFunc) (const char* retVal___, struct CmdlineArgData *arg); + const char * (*postHookFunc) (const char * retVal___, struct CmdlineArgData *arg); for (hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_source_post; hIndex++) { postHookFunc = HPMHooks.list.HP_cmdline_arg_source_post[hIndex].func; retVal___ = postHookFunc(retVal___, arg); @@ -1073,11 +1073,11 @@ DBReleaser HP_DB_custom_release(enum DBReleaseOption which) { } return retVal___; } -struct DBMap* HP_DB_alloc(const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen) { +struct DBMap * HP_DB_alloc(const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen) { int hIndex = 0; - struct DBMap* retVal___ = NULL; + struct DBMap * retVal___ = NULL; if (HPMHooks.count.HP_DB_alloc_pre > 0) { - struct DBMap* (*preHookFunc) (const char **file, const char **func, int *line, enum DBType *type, enum DBOptions *options, unsigned short *maxlen); + struct DBMap * (*preHookFunc) (const char **file, const char **func, int *line, enum DBType *type, enum DBOptions *options, unsigned short *maxlen); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_DB_alloc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_DB_alloc_pre[hIndex].func; @@ -1092,7 +1092,7 @@ struct DBMap* HP_DB_alloc(const char *file, const char *func, int line, enum DBT retVal___ = HPMHooks.source.DB.alloc(file, func, line, type, options, maxlen); } if (HPMHooks.count.HP_DB_alloc_post > 0) { - struct DBMap* (*postHookFunc) (struct DBMap* retVal___, const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen); + struct DBMap * (*postHookFunc) (struct DBMap * retVal___, const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen); for (hIndex = 0; hIndex < HPMHooks.count.HP_DB_alloc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_DB_alloc_post[hIndex].func; retVal___ = postHookFunc(retVal___, file, func, line, type, options, maxlen); @@ -1370,11 +1370,11 @@ unsigned int HP_DB_data2ui(struct DBData *data) { } return retVal___; } -void* HP_DB_data2ptr(struct DBData *data) { +void * HP_DB_data2ptr(struct DBData *data) { int hIndex = 0; - void* retVal___ = NULL; + void * retVal___ = NULL; if (HPMHooks.count.HP_DB_data2ptr_pre > 0) { - void* (*preHookFunc) (struct DBData **data); + void * (*preHookFunc) (struct DBData **data); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ptr_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_DB_data2ptr_pre[hIndex].func; @@ -1389,7 +1389,7 @@ void* HP_DB_data2ptr(struct DBData *data) { retVal___ = HPMHooks.source.DB.data2ptr(data); } if (HPMHooks.count.HP_DB_data2ptr_post > 0) { - void* (*postHookFunc) (void* retVal___, struct DBData *data); + void * (*postHookFunc) (void * retVal___, struct DBData *data); for (hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ptr_post; hIndex++) { postHookFunc = HPMHooks.list.HP_DB_data2ptr_post[hIndex].func; retVal___ = postHookFunc(retVal___, data); @@ -2822,11 +2822,11 @@ void HP_lclif_coding_key(int fd, struct login_session_data *sd) { } return; } -const struct login_packet_db* HP_lclif_packet(int16 packet_id) { +const struct login_packet_db * HP_lclif_packet(int16 packet_id) { int hIndex = 0; - const struct login_packet_db* retVal___ = NULL; + const struct login_packet_db * retVal___ = NULL; if (HPMHooks.count.HP_lclif_packet_pre > 0) { - const struct login_packet_db* (*preHookFunc) (int16 *packet_id); + const struct login_packet_db * (*preHookFunc) (int16 *packet_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_lclif_packet_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_lclif_packet_pre[hIndex].func; @@ -2841,7 +2841,7 @@ const struct login_packet_db* HP_lclif_packet(int16 packet_id) { retVal___ = HPMHooks.source.lclif.packet(packet_id); } if (HPMHooks.count.HP_lclif_packet_post > 0) { - const struct login_packet_db* (*postHookFunc) (const struct login_packet_db* retVal___, int16 packet_id); + const struct login_packet_db * (*postHookFunc) (const struct login_packet_db * retVal___, int16 packet_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_lclif_packet_post; hIndex++) { postHookFunc = HPMHooks.list.HP_lclif_packet_post[hIndex].func; retVal___ = postHookFunc(retVal___, packet_id); @@ -3814,11 +3814,11 @@ int HP_libconfig_setting_get_bool(const struct config_setting_t *setting) { } return retVal___; } -const char* HP_libconfig_setting_get_string(const struct config_setting_t *setting) { +const char * HP_libconfig_setting_get_string(const struct config_setting_t *setting) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_get_string_pre > 0) { - const char* (*preHookFunc) (const struct config_setting_t **setting); + const char * (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_pre[hIndex].func; @@ -3833,7 +3833,7 @@ const char* HP_libconfig_setting_get_string(const struct config_setting_t *setti retVal___ = HPMHooks.source.libconfig.setting_get_string(setting); } if (HPMHooks.count.HP_libconfig_setting_get_string_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting); + const char * (*postHookFunc) (const char * retVal___, const struct config_setting_t *setting); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -3841,11 +3841,11 @@ const char* HP_libconfig_setting_get_string(const struct config_setting_t *setti } return retVal___; } -struct config_setting_t* HP_libconfig_setting_lookup(struct config_setting_t *setting, const char *name) { +struct config_setting_t * HP_libconfig_setting_lookup(struct config_setting_t *setting, const char *name) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_lookup_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, const char **name); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_pre[hIndex].func; @@ -3860,7 +3860,7 @@ struct config_setting_t* HP_libconfig_setting_lookup(struct config_setting_t *se retVal___ = HPMHooks.source.libconfig.setting_lookup(setting, name); } if (HPMHooks.count.HP_libconfig_setting_lookup_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, const char *name); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name); @@ -4300,11 +4300,11 @@ int HP_libconfig_setting_get_bool_elem(const struct config_setting_t *setting, i } return retVal___; } -const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t *setting, int idx) { +const char * HP_libconfig_setting_get_string_elem(const struct config_setting_t *setting, int idx) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_get_string_elem_pre > 0) { - const char* (*preHookFunc) (const struct config_setting_t **setting, int *idx); + const char * (*preHookFunc) (const struct config_setting_t **setting, int *idx); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_pre[hIndex].func; @@ -4319,7 +4319,7 @@ const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t * retVal___ = HPMHooks.source.libconfig.setting_get_string_elem(setting, idx); } if (HPMHooks.count.HP_libconfig_setting_get_string_elem_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting, int idx); + const char * (*postHookFunc) (const char * retVal___, const struct config_setting_t *setting, int idx); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx); @@ -4327,11 +4327,11 @@ const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t * } return retVal___; } -struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting_t *setting, int idx, int value) { +struct config_setting_t * HP_libconfig_setting_set_int_elem(struct config_setting_t *setting, int idx, int value) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_set_int_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_pre[hIndex].func; @@ -4346,7 +4346,7 @@ struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting retVal___ = HPMHooks.source.libconfig.setting_set_int_elem(setting, idx, value); } if (HPMHooks.count.HP_libconfig_setting_set_int_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int value); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, int value); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx, value); @@ -4354,11 +4354,11 @@ struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting } return retVal___; } -struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setting_t *setting, int idx, int64 value) { +struct config_setting_t * HP_libconfig_setting_set_int64_elem(struct config_setting_t *setting, int idx, int64 value) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, int64 *value); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, int *idx, int64 *value); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_pre[hIndex].func; @@ -4373,7 +4373,7 @@ struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setti retVal___ = HPMHooks.source.libconfig.setting_set_int64_elem(setting, idx, value); } if (HPMHooks.count.HP_libconfig_setting_set_int64_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int64 value); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, int64 value); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx, value); @@ -4381,11 +4381,11 @@ struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setti } return retVal___; } -struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setting_t *setting, int idx, double value) { +struct config_setting_t * HP_libconfig_setting_set_float_elem(struct config_setting_t *setting, int idx, double value) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_set_float_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, double *value); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, int *idx, double *value); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_pre[hIndex].func; @@ -4400,7 +4400,7 @@ struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setti retVal___ = HPMHooks.source.libconfig.setting_set_float_elem(setting, idx, value); } if (HPMHooks.count.HP_libconfig_setting_set_float_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, double value); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, double value); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx, value); @@ -4408,11 +4408,11 @@ struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setti } return retVal___; } -struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_setting_t *setting, int idx, int value) { +struct config_setting_t * HP_libconfig_setting_set_bool_elem(struct config_setting_t *setting, int idx, int value) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_pre[hIndex].func; @@ -4427,7 +4427,7 @@ struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_settin retVal___ = HPMHooks.source.libconfig.setting_set_bool_elem(setting, idx, value); } if (HPMHooks.count.HP_libconfig_setting_set_bool_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int value); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, int value); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx, value); @@ -4435,11 +4435,11 @@ struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_settin } return retVal___; } -struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_setting_t *setting, int idx, const char *value) { +struct config_setting_t * HP_libconfig_setting_set_string_elem(struct config_setting_t *setting, int idx, const char *value) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_set_string_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, const char **value); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, int *idx, const char **value); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_pre[hIndex].func; @@ -4454,7 +4454,7 @@ struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_sett retVal___ = HPMHooks.source.libconfig.setting_set_string_elem(setting, idx, value); } if (HPMHooks.count.HP_libconfig_setting_set_string_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, const char *value); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, const char *value); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx, value); @@ -4516,11 +4516,11 @@ int HP_libconfig_setting_length(const struct config_setting_t *setting) { } return retVal___; } -struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setting_t *setting, unsigned int idx) { +struct config_setting_t * HP_libconfig_setting_get_elem(const struct config_setting_t *setting, unsigned int idx) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_get_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (const struct config_setting_t **setting, unsigned int *idx); + struct config_setting_t * (*preHookFunc) (const struct config_setting_t **setting, unsigned int *idx); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_pre[hIndex].func; @@ -4535,7 +4535,7 @@ struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setti retVal___ = HPMHooks.source.libconfig.setting_get_elem(setting, idx); } if (HPMHooks.count.HP_libconfig_setting_get_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int idx); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, const struct config_setting_t *setting, unsigned int idx); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx); @@ -4543,11 +4543,11 @@ struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setti } return retVal___; } -struct config_setting_t* HP_libconfig_setting_get_member(const struct config_setting_t *setting, const char *name) { +struct config_setting_t * HP_libconfig_setting_get_member(const struct config_setting_t *setting, const char *name) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_get_member_pre > 0) { - struct config_setting_t* (*preHookFunc) (const struct config_setting_t **setting, const char **name); + struct config_setting_t * (*preHookFunc) (const struct config_setting_t **setting, const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_pre[hIndex].func; @@ -4562,7 +4562,7 @@ struct config_setting_t* HP_libconfig_setting_get_member(const struct config_set retVal___ = HPMHooks.source.libconfig.setting_get_member(setting, name); } if (HPMHooks.count.HP_libconfig_setting_get_member_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, const char *name); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, const struct config_setting_t *setting, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name); @@ -4570,11 +4570,11 @@ struct config_setting_t* HP_libconfig_setting_get_member(const struct config_set } return retVal___; } -struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *parent, const char *name, int type) { +struct config_setting_t * HP_libconfig_setting_add(struct config_setting_t *parent, const char *name, int type) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_add_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **parent, const char **name, int *type); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **parent, const char **name, int *type); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_add_pre[hIndex].func; @@ -4589,7 +4589,7 @@ struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *paren retVal___ = HPMHooks.source.libconfig.setting_add(parent, name, type); } if (HPMHooks.count.HP_libconfig_setting_add_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int type); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *parent, const char *name, int type); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_add_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, name, type); @@ -4677,11 +4677,11 @@ void HP_libconfig_setting_set_hook(struct config_setting_t *setting, void *hook) } return; } -struct config_setting_t* HP_libconfig_lookup(const struct config_t *config, const char *filepath) { +struct config_setting_t * HP_libconfig_lookup(const struct config_t *config, const char *filepath) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_lookup_pre > 0) { - struct config_setting_t* (*preHookFunc) (const struct config_t **config, const char **filepath); + struct config_setting_t * (*preHookFunc) (const struct config_t **config, const char **filepath); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_pre[hIndex].func; @@ -4696,7 +4696,7 @@ struct config_setting_t* HP_libconfig_lookup(const struct config_t *config, cons retVal___ = HPMHooks.source.libconfig.lookup(config, filepath); } if (HPMHooks.count.HP_libconfig_lookup_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_t *config, const char *filepath); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, const struct config_t *config, const char *filepath); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath); @@ -5356,11 +5356,11 @@ struct DBData HP_login_create_online_user(union DBKey key, va_list args) { } return retVal___; } -struct online_login_data* HP_login_add_online_user(int char_server, int account_id) { +struct online_login_data * HP_login_add_online_user(int char_server, int account_id) { int hIndex = 0; - struct online_login_data* retVal___ = NULL; + struct online_login_data * retVal___ = NULL; if (HPMHooks.count.HP_login_add_online_user_pre > 0) { - struct online_login_data* (*preHookFunc) (int *char_server, int *account_id); + struct online_login_data * (*preHookFunc) (int *char_server, int *account_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_login_add_online_user_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_login_add_online_user_pre[hIndex].func; @@ -5375,7 +5375,7 @@ struct online_login_data* HP_login_add_online_user(int char_server, int account_ retVal___ = HPMHooks.source.login.add_online_user(char_server, account_id); } if (HPMHooks.count.HP_login_add_online_user_post > 0) { - struct online_login_data* (*postHookFunc) (struct online_login_data* retVal___, int char_server, int account_id); + struct online_login_data * (*postHookFunc) (struct online_login_data * retVal___, int char_server, int account_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_login_add_online_user_post; hIndex++) { postHookFunc = HPMHooks.list.HP_login_add_online_user_post[hIndex].func; retVal___ = postHookFunc(retVal___, char_server, account_id); @@ -7350,11 +7350,11 @@ void HP_md5_salt(int len, char *output) { return; } /* mutex_interface */ -struct mutex_data* HP_mutex_create(void) { +struct mutex_data * HP_mutex_create(void) { int hIndex = 0; - struct mutex_data* retVal___ = NULL; + struct mutex_data * retVal___ = NULL; if (HPMHooks.count.HP_mutex_create_pre > 0) { - struct mutex_data* (*preHookFunc) (void); + struct mutex_data * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mutex_create_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mutex_create_pre[hIndex].func; @@ -7369,7 +7369,7 @@ struct mutex_data* HP_mutex_create(void) { retVal___ = HPMHooks.source.mutex.create(); } if (HPMHooks.count.HP_mutex_create_post > 0) { - struct mutex_data* (*postHookFunc) (struct mutex_data* retVal___); + struct mutex_data * (*postHookFunc) (struct mutex_data * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_mutex_create_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mutex_create_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -7482,11 +7482,11 @@ void HP_mutex_unlock(struct mutex_data *m) { } return; } -struct cond_data* HP_mutex_cond_create(void) { +struct cond_data * HP_mutex_cond_create(void) { int hIndex = 0; - struct cond_data* retVal___ = NULL; + struct cond_data * retVal___ = NULL; if (HPMHooks.count.HP_mutex_cond_create_pre > 0) { - struct cond_data* (*preHookFunc) (void); + struct cond_data * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mutex_cond_create_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mutex_cond_create_pre[hIndex].func; @@ -7501,7 +7501,7 @@ struct cond_data* HP_mutex_cond_create(void) { retVal___ = HPMHooks.source.mutex.cond_create(); } if (HPMHooks.count.HP_mutex_cond_create_post > 0) { - struct cond_data* (*postHookFunc) (struct cond_data* retVal___); + struct cond_data * (*postHookFunc) (struct cond_data * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_mutex_cond_create_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mutex_cond_create_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -8201,11 +8201,11 @@ int HP_showmsg_showMessageV(const char *string, va_list ap) { } return retVal___; } -const char* HP_showmsg_getLogFileName(void) { +const char * HP_showmsg_getLogFileName(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_showmsg_getLogFileName_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_showmsg_getLogFileName_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_showmsg_getLogFileName_pre[hIndex].func; @@ -8220,7 +8220,7 @@ const char* HP_showmsg_getLogFileName(void) { retVal___ = HPMHooks.source.showmsg.getLogFileName(); } if (HPMHooks.count.HP_showmsg_getLogFileName_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_showmsg_getLogFileName_post; hIndex++) { postHookFunc = HPMHooks.list.HP_showmsg_getLogFileName_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -8891,11 +8891,11 @@ uint32 HP_sockt_host2ip(const char *hostname) { } return retVal___; } -const char* HP_sockt_ip2str(uint32 ip, char *ip_str) { +const char * HP_sockt_ip2str(uint32 ip, char *ip_str) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sockt_ip2str_pre > 0) { - const char* (*preHookFunc) (uint32 *ip, char **ip_str); + const char * (*preHookFunc) (uint32 *ip, char **ip_str); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sockt_ip2str_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sockt_ip2str_pre[hIndex].func; @@ -8910,7 +8910,7 @@ const char* HP_sockt_ip2str(uint32 ip, char *ip_str) { retVal___ = HPMHooks.source.sockt.ip2str(ip, ip_str); } if (HPMHooks.count.HP_sockt_ip2str_post > 0) { - const char* (*postHookFunc) (const char* retVal___, uint32 ip, char *ip_str); + const char * (*postHookFunc) (const char * retVal___, uint32 ip, char *ip_str); for (hIndex = 0; hIndex < HPMHooks.count.HP_sockt_ip2str_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sockt_ip2str_post[hIndex].func; retVal___ = postHookFunc(retVal___, ip, ip_str); @@ -9649,11 +9649,11 @@ void HP_SQL_Free(struct Sql *self) { } return; } -struct Sql* HP_SQL_Malloc(void) { +struct Sql * HP_SQL_Malloc(void) { int hIndex = 0; - struct Sql* retVal___ = NULL; + struct Sql * retVal___ = NULL; if (HPMHooks.count.HP_SQL_Malloc_pre > 0) { - struct Sql* (*preHookFunc) (void); + struct Sql * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Malloc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_SQL_Malloc_pre[hIndex].func; @@ -9668,7 +9668,7 @@ struct Sql* HP_SQL_Malloc(void) { retVal___ = HPMHooks.source.SQL.Malloc(); } if (HPMHooks.count.HP_SQL_Malloc_post > 0) { - struct Sql* (*postHookFunc) (struct Sql* retVal___); + struct Sql * (*postHookFunc) (struct Sql * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Malloc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_SQL_Malloc_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -9676,11 +9676,11 @@ struct Sql* HP_SQL_Malloc(void) { } return retVal___; } -struct SqlStmt* HP_SQL_StmtMalloc(struct Sql *sql) { +struct SqlStmt * HP_SQL_StmtMalloc(struct Sql *sql) { int hIndex = 0; - struct SqlStmt* retVal___ = NULL; + struct SqlStmt * retVal___ = NULL; if (HPMHooks.count.HP_SQL_StmtMalloc_pre > 0) { - struct SqlStmt* (*preHookFunc) (struct Sql **sql); + struct SqlStmt * (*preHookFunc) (struct Sql **sql); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtMalloc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_SQL_StmtMalloc_pre[hIndex].func; @@ -9695,7 +9695,7 @@ struct SqlStmt* HP_SQL_StmtMalloc(struct Sql *sql) { retVal___ = HPMHooks.source.SQL.StmtMalloc(sql); } if (HPMHooks.count.HP_SQL_StmtMalloc_post > 0) { - struct SqlStmt* (*postHookFunc) (struct SqlStmt* retVal___, struct Sql *sql); + struct SqlStmt * (*postHookFunc) (struct SqlStmt * retVal___, struct Sql *sql); for (hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtMalloc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_SQL_StmtMalloc_post[hIndex].func; retVal___ = postHookFunc(retVal___, sql); @@ -10058,11 +10058,11 @@ void HP_SQL_StmtShowDebug_(struct SqlStmt *self, const char *debug_file, const u return; } /* stringbuf_interface */ -StringBuf* HP_StrBuf_Malloc(void) { +StringBuf * HP_StrBuf_Malloc(void) { int hIndex = 0; - StringBuf* retVal___ = NULL; + StringBuf * retVal___ = NULL; if (HPMHooks.count.HP_StrBuf_Malloc_pre > 0) { - StringBuf* (*preHookFunc) (void); + StringBuf * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Malloc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_StrBuf_Malloc_pre[hIndex].func; @@ -10077,7 +10077,7 @@ StringBuf* HP_StrBuf_Malloc(void) { retVal___ = HPMHooks.source.StrBuf.Malloc(); } if (HPMHooks.count.HP_StrBuf_Malloc_post > 0) { - StringBuf* (*postHookFunc) (StringBuf* retVal___); + StringBuf * (*postHookFunc) (StringBuf * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Malloc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_StrBuf_Malloc_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -10225,11 +10225,11 @@ int HP_StrBuf_Length(StringBuf *self) { } return retVal___; } -char* HP_StrBuf_Value(StringBuf *self) { +char * HP_StrBuf_Value(StringBuf *self) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_StrBuf_Value_pre > 0) { - char* (*preHookFunc) (StringBuf **self); + char * (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Value_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_StrBuf_Value_pre[hIndex].func; @@ -10244,7 +10244,7 @@ char* HP_StrBuf_Value(StringBuf *self) { retVal___ = HPMHooks.source.StrBuf.Value(self); } if (HPMHooks.count.HP_StrBuf_Value_post > 0) { - char* (*postHookFunc) (char* retVal___, StringBuf *self); + char * (*postHookFunc) (char * retVal___, StringBuf *self); for (hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Value_post; hIndex++) { postHookFunc = HPMHooks.list.HP_StrBuf_Value_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -10331,11 +10331,11 @@ void HP_StrBuf_Free(StringBuf *self) { return; } /* strlib_interface */ -char* HP_strlib_jstrescape(char *pt) { +char * HP_strlib_jstrescape(char *pt) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_jstrescape_pre > 0) { - char* (*preHookFunc) (char **pt); + char * (*preHookFunc) (char **pt); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescape_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_jstrescape_pre[hIndex].func; @@ -10350,7 +10350,7 @@ char* HP_strlib_jstrescape(char *pt) { retVal___ = HPMHooks.source.strlib.jstrescape(pt); } if (HPMHooks.count.HP_strlib_jstrescape_post > 0) { - char* (*postHookFunc) (char* retVal___, char *pt); + char * (*postHookFunc) (char * retVal___, char *pt); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescape_post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_jstrescape_post[hIndex].func; retVal___ = postHookFunc(retVal___, pt); @@ -10358,11 +10358,11 @@ char* HP_strlib_jstrescape(char *pt) { } return retVal___; } -char* HP_strlib_jstrescapecpy(char *pt, const char *spt) { +char * HP_strlib_jstrescapecpy(char *pt, const char *spt) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_jstrescapecpy_pre > 0) { - char* (*preHookFunc) (char **pt, const char **spt); + char * (*preHookFunc) (char **pt, const char **spt); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescapecpy_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_jstrescapecpy_pre[hIndex].func; @@ -10377,7 +10377,7 @@ char* HP_strlib_jstrescapecpy(char *pt, const char *spt) { retVal___ = HPMHooks.source.strlib.jstrescapecpy(pt, spt); } if (HPMHooks.count.HP_strlib_jstrescapecpy_post > 0) { - char* (*postHookFunc) (char* retVal___, char *pt, const char *spt); + char * (*postHookFunc) (char * retVal___, char *pt, const char *spt); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescapecpy_post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_jstrescapecpy_post[hIndex].func; retVal___ = postHookFunc(retVal___, pt, spt); @@ -10439,11 +10439,11 @@ int HP_strlib_remove_control_chars_(char *str) { } return retVal___; } -char* HP_strlib_trim_(char *str) { +char * HP_strlib_trim_(char *str) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_trim__pre > 0) { - char* (*preHookFunc) (char **str); + char * (*preHookFunc) (char **str); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_trim__pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_trim__pre[hIndex].func; @@ -10458,7 +10458,7 @@ char* HP_strlib_trim_(char *str) { retVal___ = HPMHooks.source.strlib.trim_(str); } if (HPMHooks.count.HP_strlib_trim__post > 0) { - char* (*postHookFunc) (char* retVal___, char *str); + char * (*postHookFunc) (char * retVal___, char *str); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_trim__post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_trim__post[hIndex].func; retVal___ = postHookFunc(retVal___, str); @@ -10466,11 +10466,11 @@ char* HP_strlib_trim_(char *str) { } return retVal___; } -char* HP_strlib_normalize_name_(char *str, const char *delims) { +char * HP_strlib_normalize_name_(char *str, const char *delims) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_normalize_name__pre > 0) { - char* (*preHookFunc) (char **str, const char **delims); + char * (*preHookFunc) (char **str, const char **delims); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_normalize_name__pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_normalize_name__pre[hIndex].func; @@ -10485,7 +10485,7 @@ char* HP_strlib_normalize_name_(char *str, const char *delims) { retVal___ = HPMHooks.source.strlib.normalize_name_(str, delims); } if (HPMHooks.count.HP_strlib_normalize_name__post > 0) { - char* (*postHookFunc) (char* retVal___, char *str, const char *delims); + char * (*postHookFunc) (char * retVal___, char *str, const char *delims); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_normalize_name__post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_normalize_name__post[hIndex].func; retVal___ = postHookFunc(retVal___, str, delims); @@ -10493,11 +10493,11 @@ char* HP_strlib_normalize_name_(char *str, const char *delims) { } return retVal___; } -const char* HP_strlib_stristr_(const char *haystack, const char *needle) { +const char * HP_strlib_stristr_(const char *haystack, const char *needle) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_stristr__pre > 0) { - const char* (*preHookFunc) (const char **haystack, const char **needle); + const char * (*preHookFunc) (const char **haystack, const char **needle); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_stristr__pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_stristr__pre[hIndex].func; @@ -10512,7 +10512,7 @@ const char* HP_strlib_stristr_(const char *haystack, const char *needle) { retVal___ = HPMHooks.source.strlib.stristr_(haystack, needle); } if (HPMHooks.count.HP_strlib_stristr__post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *haystack, const char *needle); + const char * (*postHookFunc) (const char * retVal___, const char *haystack, const char *needle); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_stristr__post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_stristr__post[hIndex].func; retVal___ = postHookFunc(retVal___, haystack, needle); @@ -10547,11 +10547,11 @@ size_t HP_strlib_strnlen_(const char *string, size_t maxlen) { } return retVal___; } -char* HP_strlib_strtok_r_(char *s1, const char *s2, char **lasts) { +char * HP_strlib_strtok_r_(char *s1, const char *s2, char **lasts) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_strtok_r__pre > 0) { - char* (*preHookFunc) (char **s1, const char **s2, char ***lasts); + char * (*preHookFunc) (char **s1, const char **s2, char ***lasts); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strtok_r__pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_strtok_r__pre[hIndex].func; @@ -10566,7 +10566,7 @@ char* HP_strlib_strtok_r_(char *s1, const char *s2, char **lasts) { retVal___ = HPMHooks.source.strlib.strtok_r_(s1, s2, lasts); } if (HPMHooks.count.HP_strlib_strtok_r__post > 0) { - char* (*postHookFunc) (char* retVal___, char *s1, const char *s2, char **lasts); + char * (*postHookFunc) (char * retVal___, char *s1, const char *s2, char **lasts); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strtok_r__post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_strtok_r__post[hIndex].func; retVal___ = postHookFunc(retVal___, s1, s2, lasts); @@ -10628,11 +10628,11 @@ int HP_strlib_config_switch_(const char *str) { } return retVal___; } -char* HP_strlib_safestrncpy_(char *dst, const char *src, size_t n) { +char * HP_strlib_safestrncpy_(char *dst, const char *src, size_t n) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_safestrncpy__pre > 0) { - char* (*preHookFunc) (char **dst, const char **src, size_t *n); + char * (*preHookFunc) (char **dst, const char **src, size_t *n); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_safestrncpy__pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_safestrncpy__pre[hIndex].func; @@ -10647,7 +10647,7 @@ char* HP_strlib_safestrncpy_(char *dst, const char *src, size_t n) { retVal___ = HPMHooks.source.strlib.safestrncpy_(dst, src, n); } if (HPMHooks.count.HP_strlib_safestrncpy__post > 0) { - char* (*postHookFunc) (char* retVal___, char *dst, const char *src, size_t n); + char * (*postHookFunc) (char * retVal___, char *dst, const char *src, size_t n); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_safestrncpy__post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_safestrncpy__post[hIndex].func; retVal___ = postHookFunc(retVal___, dst, src, n); @@ -10872,11 +10872,11 @@ size_t HP_sv_unescape_c(char *out_dest, const char *src, size_t len) { } return retVal___; } -const char* HP_sv_skip_escaped_c(const char *p) { +const char * HP_sv_skip_escaped_c(const char *p) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sv_skip_escaped_c_pre > 0) { - const char* (*preHookFunc) (const char **p); + const char * (*preHookFunc) (const char **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sv_skip_escaped_c_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sv_skip_escaped_c_pre[hIndex].func; @@ -10891,7 +10891,7 @@ const char* HP_sv_skip_escaped_c(const char *p) { retVal___ = HPMHooks.source.sv.skip_escaped_c(p); } if (HPMHooks.count.HP_sv_skip_escaped_c_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p); + const char * (*postHookFunc) (const char * retVal___, const char *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_sv_skip_escaped_c_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sv_skip_escaped_c_post[hIndex].func; retVal___ = postHookFunc(retVal___, p); @@ -10954,11 +10954,11 @@ long HP_sysinfo_getpagesize(void) { } return retVal___; } -const char* HP_sysinfo_platform(void) { +const char * HP_sysinfo_platform(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_platform_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_platform_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_platform_pre[hIndex].func; @@ -10973,7 +10973,7 @@ const char* HP_sysinfo_platform(void) { retVal___ = HPMHooks.source.sysinfo.platform(); } if (HPMHooks.count.HP_sysinfo_platform_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_platform_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_platform_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -10981,11 +10981,11 @@ const char* HP_sysinfo_platform(void) { } return retVal___; } -const char* HP_sysinfo_osversion(void) { +const char * HP_sysinfo_osversion(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_osversion_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_osversion_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_osversion_pre[hIndex].func; @@ -11000,7 +11000,7 @@ const char* HP_sysinfo_osversion(void) { retVal___ = HPMHooks.source.sysinfo.osversion(); } if (HPMHooks.count.HP_sysinfo_osversion_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_osversion_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_osversion_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -11008,11 +11008,11 @@ const char* HP_sysinfo_osversion(void) { } return retVal___; } -const char* HP_sysinfo_cpu(void) { +const char * HP_sysinfo_cpu(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_cpu_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_cpu_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_cpu_pre[hIndex].func; @@ -11027,7 +11027,7 @@ const char* HP_sysinfo_cpu(void) { retVal___ = HPMHooks.source.sysinfo.cpu(); } if (HPMHooks.count.HP_sysinfo_cpu_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_cpu_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_cpu_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -11062,11 +11062,11 @@ int HP_sysinfo_cpucores(void) { } return retVal___; } -const char* HP_sysinfo_arch(void) { +const char * HP_sysinfo_arch(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_arch_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_arch_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_arch_pre[hIndex].func; @@ -11081,7 +11081,7 @@ const char* HP_sysinfo_arch(void) { retVal___ = HPMHooks.source.sysinfo.arch(); } if (HPMHooks.count.HP_sysinfo_arch_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_arch_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_arch_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -11116,11 +11116,11 @@ bool HP_sysinfo_is64bit(void) { } return retVal___; } -const char* HP_sysinfo_compiler(void) { +const char * HP_sysinfo_compiler(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_compiler_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_compiler_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_compiler_pre[hIndex].func; @@ -11135,7 +11135,7 @@ const char* HP_sysinfo_compiler(void) { retVal___ = HPMHooks.source.sysinfo.compiler(); } if (HPMHooks.count.HP_sysinfo_compiler_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_compiler_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_compiler_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -11143,11 +11143,11 @@ const char* HP_sysinfo_compiler(void) { } return retVal___; } -const char* HP_sysinfo_cflags(void) { +const char * HP_sysinfo_cflags(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_cflags_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_cflags_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_cflags_pre[hIndex].func; @@ -11162,7 +11162,7 @@ const char* HP_sysinfo_cflags(void) { retVal___ = HPMHooks.source.sysinfo.cflags(); } if (HPMHooks.count.HP_sysinfo_cflags_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_cflags_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_cflags_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -11170,11 +11170,11 @@ const char* HP_sysinfo_cflags(void) { } return retVal___; } -const char* HP_sysinfo_time(void) { +const char * HP_sysinfo_time(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_time_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_time_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_time_pre[hIndex].func; @@ -11189,7 +11189,7 @@ const char* HP_sysinfo_time(void) { retVal___ = HPMHooks.source.sysinfo.time(); } if (HPMHooks.count.HP_sysinfo_time_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_time_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_time_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -11197,11 +11197,11 @@ const char* HP_sysinfo_time(void) { } return retVal___; } -const char* HP_sysinfo_vcstype(void) { +const char * HP_sysinfo_vcstype(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_vcstype_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcstype_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_vcstype_pre[hIndex].func; @@ -11216,7 +11216,7 @@ const char* HP_sysinfo_vcstype(void) { retVal___ = HPMHooks.source.sysinfo.vcstype(); } if (HPMHooks.count.HP_sysinfo_vcstype_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcstype_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_vcstype_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -11251,11 +11251,11 @@ int HP_sysinfo_vcstypeid(void) { } return retVal___; } -const char* HP_sysinfo_vcsrevision_src(void) { +const char * HP_sysinfo_vcsrevision_src(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_vcsrevision_src_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcsrevision_src_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_vcsrevision_src_pre[hIndex].func; @@ -11270,7 +11270,7 @@ const char* HP_sysinfo_vcsrevision_src(void) { retVal___ = HPMHooks.source.sysinfo.vcsrevision_src(); } if (HPMHooks.count.HP_sysinfo_vcsrevision_src_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcsrevision_src_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_vcsrevision_src_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -11278,11 +11278,11 @@ const char* HP_sysinfo_vcsrevision_src(void) { } return retVal___; } -const char* HP_sysinfo_vcsrevision_scripts(void) { +const char * HP_sysinfo_vcsrevision_scripts(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_vcsrevision_scripts_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcsrevision_scripts_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_vcsrevision_scripts_pre[hIndex].func; @@ -11297,7 +11297,7 @@ const char* HP_sysinfo_vcsrevision_scripts(void) { retVal___ = HPMHooks.source.sysinfo.vcsrevision_scripts(); } if (HPMHooks.count.HP_sysinfo_vcsrevision_scripts_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcsrevision_scripts_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_vcsrevision_scripts_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -11412,11 +11412,11 @@ bool HP_sysinfo_is_superuser(void) { } return retVal___; } -const char* HP_sysinfo_zlib(void) { +const char * HP_sysinfo_zlib(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_zlib_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_zlib_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_zlib_pre[hIndex].func; @@ -11431,7 +11431,7 @@ const char* HP_sysinfo_zlib(void) { retVal___ = HPMHooks.source.sysinfo.zlib(); } if (HPMHooks.count.HP_sysinfo_zlib_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_zlib_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_zlib_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -11544,11 +11544,11 @@ void HP_thread_final(void) { } return; } -struct thread_handle* HP_thread_create(threadFunc entry_point, void *param) { +struct thread_handle * HP_thread_create(threadFunc entry_point, void *param) { int hIndex = 0; - struct thread_handle* retVal___ = NULL; + struct thread_handle * retVal___ = NULL; if (HPMHooks.count.HP_thread_create_pre > 0) { - struct thread_handle* (*preHookFunc) (threadFunc *entry_point, void **param); + struct thread_handle * (*preHookFunc) (threadFunc *entry_point, void **param); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_create_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_thread_create_pre[hIndex].func; @@ -11563,7 +11563,7 @@ struct thread_handle* HP_thread_create(threadFunc entry_point, void *param) { retVal___ = HPMHooks.source.thread.create(entry_point, param); } if (HPMHooks.count.HP_thread_create_post > 0) { - struct thread_handle* (*postHookFunc) (struct thread_handle* retVal___, threadFunc entry_point, void *param); + struct thread_handle * (*postHookFunc) (struct thread_handle * retVal___, threadFunc entry_point, void *param); for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_create_post; hIndex++) { postHookFunc = HPMHooks.list.HP_thread_create_post[hIndex].func; retVal___ = postHookFunc(retVal___, entry_point, param); @@ -11571,11 +11571,11 @@ struct thread_handle* HP_thread_create(threadFunc entry_point, void *param) { } return retVal___; } -struct thread_handle* HP_thread_create_opt(threadFunc entry_point, void *param, size_t stack_size, enum thread_priority prio) { +struct thread_handle * HP_thread_create_opt(threadFunc entry_point, void *param, size_t stack_size, enum thread_priority prio) { int hIndex = 0; - struct thread_handle* retVal___ = NULL; + struct thread_handle * retVal___ = NULL; if (HPMHooks.count.HP_thread_create_opt_pre > 0) { - struct thread_handle* (*preHookFunc) (threadFunc *entry_point, void **param, size_t *stack_size, enum thread_priority *prio); + struct thread_handle * (*preHookFunc) (threadFunc *entry_point, void **param, size_t *stack_size, enum thread_priority *prio); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_create_opt_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_thread_create_opt_pre[hIndex].func; @@ -11590,7 +11590,7 @@ struct thread_handle* HP_thread_create_opt(threadFunc entry_point, void *param, retVal___ = HPMHooks.source.thread.create_opt(entry_point, param, stack_size, prio); } if (HPMHooks.count.HP_thread_create_opt_post > 0) { - struct thread_handle* (*postHookFunc) (struct thread_handle* retVal___, threadFunc entry_point, void *param, size_t stack_size, enum thread_priority prio); + struct thread_handle * (*postHookFunc) (struct thread_handle * retVal___, threadFunc entry_point, void *param, size_t stack_size, enum thread_priority prio); for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_create_opt_post; hIndex++) { postHookFunc = HPMHooks.list.HP_thread_create_opt_post[hIndex].func; retVal___ = postHookFunc(retVal___, entry_point, param, stack_size, prio); @@ -11624,11 +11624,11 @@ void HP_thread_destroy(struct thread_handle *handle) { } return; } -struct thread_handle* HP_thread_self(void) { +struct thread_handle * HP_thread_self(void) { int hIndex = 0; - struct thread_handle* retVal___ = NULL; + struct thread_handle * retVal___ = NULL; if (HPMHooks.count.HP_thread_self_pre > 0) { - struct thread_handle* (*preHookFunc) (void); + struct thread_handle * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_self_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_thread_self_pre[hIndex].func; @@ -11643,7 +11643,7 @@ struct thread_handle* HP_thread_self(void) { retVal___ = HPMHooks.source.thread.self(); } if (HPMHooks.count.HP_thread_self_post > 0) { - struct thread_handle* (*postHookFunc) (struct thread_handle* retVal___); + struct thread_handle * (*postHookFunc) (struct thread_handle * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_self_post; hIndex++) { postHookFunc = HPMHooks.list.HP_thread_self_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -11893,11 +11893,11 @@ int HP_timer_add_interval(int64 tick, TimerFunc func, int id, intptr_t data, int } return retVal___; } -const struct TimerData* HP_timer_get(int tid) { +const struct TimerData * HP_timer_get(int tid) { int hIndex = 0; - const struct TimerData* retVal___ = NULL; + const struct TimerData * retVal___ = NULL; if (HPMHooks.count.HP_timer_get_pre > 0) { - const struct TimerData* (*preHookFunc) (int *tid); + const struct TimerData * (*preHookFunc) (int *tid); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_timer_get_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_timer_get_pre[hIndex].func; @@ -11912,7 +11912,7 @@ const struct TimerData* HP_timer_get(int tid) { retVal___ = HPMHooks.source.timer.get(tid); } if (HPMHooks.count.HP_timer_get_post > 0) { - const struct TimerData* (*postHookFunc) (const struct TimerData* retVal___, int tid); + const struct TimerData * (*postHookFunc) (const struct TimerData * retVal___, int tid); for (hIndex = 0; hIndex < HPMHooks.count.HP_timer_get_post; hIndex++) { postHookFunc = HPMHooks.list.HP_timer_get_post[hIndex].func; retVal___ = postHookFunc(retVal___, tid); diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc index 8474299307b..29833e0f2f6 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc @@ -7272,8 +7272,22 @@ struct { struct HPMHookPoint *HP_status_base_matk_max_post; struct HPMHookPoint *HP_status_check_job_bonus_pre; struct HPMHookPoint *HP_status_check_job_bonus_post; + struct HPMHookPoint *HP_storage_init_pre; + struct HPMHookPoint *HP_storage_init_post; + struct HPMHookPoint *HP_storage_final_pre; + struct HPMHookPoint *HP_storage_final_post; struct HPMHookPoint *HP_storage_reconnect_pre; struct HPMHookPoint *HP_storage_reconnect_post; + struct HPMHookPoint *HP_storage_config_read_pre; + struct HPMHookPoint *HP_storage_config_read_post; + struct HPMHookPoint *HP_storage_config_read_additional_fields_pre; + struct HPMHookPoint *HP_storage_config_read_additional_fields_post; + struct HPMHookPoint *HP_storage_get_id_by_name_pre; + struct HPMHookPoint *HP_storage_get_id_by_name_post; + struct HPMHookPoint *HP_storage_ensure_pre; + struct HPMHookPoint *HP_storage_ensure_post; + struct HPMHookPoint *HP_storage_get_settings_pre; + struct HPMHookPoint *HP_storage_get_settings_post; struct HPMHookPoint *HP_storage_delitem_pre; struct HPMHookPoint *HP_storage_delitem_post; struct HPMHookPoint *HP_storage_open_pre; @@ -14863,8 +14877,22 @@ struct { int HP_status_base_matk_max_post; int HP_status_check_job_bonus_pre; int HP_status_check_job_bonus_post; + int HP_storage_init_pre; + int HP_storage_init_post; + int HP_storage_final_pre; + int HP_storage_final_post; int HP_storage_reconnect_pre; int HP_storage_reconnect_post; + int HP_storage_config_read_pre; + int HP_storage_config_read_post; + int HP_storage_config_read_additional_fields_pre; + int HP_storage_config_read_additional_fields_post; + int HP_storage_get_id_by_name_pre; + int HP_storage_get_id_by_name_post; + int HP_storage_ensure_pre; + int HP_storage_ensure_post; + int HP_storage_get_settings_pre; + int HP_storage_get_settings_post; int HP_storage_delitem_pre; int HP_storage_delitem_post; int HP_storage_open_pre; diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc index a710ed6e6fe..61c23362aba 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc @@ -3716,7 +3716,14 @@ struct HookingPointData HookingPoints[] = { { HP_POP(status->base_matk_max, HP_status_base_matk_max) }, { HP_POP(status->check_job_bonus, HP_status_check_job_bonus) }, /* storage_interface */ + { HP_POP(storage->init, HP_storage_init) }, + { HP_POP(storage->final, HP_storage_final) }, { HP_POP(storage->reconnect, HP_storage_reconnect) }, + { HP_POP(storage->config_read, HP_storage_config_read) }, + { HP_POP(storage->config_read_additional_fields, HP_storage_config_read_additional_fields) }, + { HP_POP(storage->get_id_by_name, HP_storage_get_id_by_name) }, + { HP_POP(storage->ensure, HP_storage_ensure) }, + { HP_POP(storage->get_settings, HP_storage_get_settings) }, { HP_POP(storage->delitem, HP_storage_delitem) }, { HP_POP(storage->open, HP_storage_open) }, { HP_POP(storage->add, HP_storage_add) }, diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc index 7dc4d79b5b3..a761c1a00ee 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc @@ -79,11 +79,11 @@ bool HP_HCache_check(const char *file) { } return retVal___; } -FILE* HP_HCache_open(const char *file, const char *opt) { +FILE * HP_HCache_open(const char *file, const char *opt) { int hIndex = 0; - FILE* retVal___ = NULL; + FILE * retVal___ = NULL; if (HPMHooks.count.HP_HCache_open_pre > 0) { - FILE* (*preHookFunc) (const char **file, const char **opt); + FILE * (*preHookFunc) (const char **file, const char **opt); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_HCache_open_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_HCache_open_pre[hIndex].func; @@ -98,7 +98,7 @@ FILE* HP_HCache_open(const char *file, const char *opt) { retVal___ = HPMHooks.source.HCache.open(file, opt); } if (HPMHooks.count.HP_HCache_open_post > 0) { - FILE* (*postHookFunc) (FILE* retVal___, const char *file, const char *opt); + FILE * (*postHookFunc) (FILE * retVal___, const char *file, const char *opt); for (hIndex = 0; hIndex < HPMHooks.count.HP_HCache_open_post; hIndex++) { postHookFunc = HPMHooks.list.HP_HCache_open_post[hIndex].func; retVal___ = postHookFunc(retVal___, file, opt); @@ -645,11 +645,11 @@ void HP_achievement_readdb_ranks(void) { } return; } -const struct achievement_data* HP_achievement_get(int aid) { +const struct achievement_data * HP_achievement_get(int aid) { int hIndex = 0; - const struct achievement_data* retVal___ = NULL; + const struct achievement_data * retVal___ = NULL; if (HPMHooks.count.HP_achievement_get_pre > 0) { - const struct achievement_data* (*preHookFunc) (int *aid); + const struct achievement_data * (*preHookFunc) (int *aid); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_achievement_get_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_achievement_get_pre[hIndex].func; @@ -664,7 +664,7 @@ const struct achievement_data* HP_achievement_get(int aid) { retVal___ = HPMHooks.source.achievement.get(aid); } if (HPMHooks.count.HP_achievement_get_post > 0) { - const struct achievement_data* (*postHookFunc) (const struct achievement_data* retVal___, int aid); + const struct achievement_data * (*postHookFunc) (const struct achievement_data * retVal___, int aid); for (hIndex = 0; hIndex < HPMHooks.count.HP_achievement_get_post; hIndex++) { postHookFunc = HPMHooks.list.HP_achievement_get_post[hIndex].func; retVal___ = postHookFunc(retVal___, aid); @@ -672,11 +672,11 @@ const struct achievement_data* HP_achievement_get(int aid) { } return retVal___; } -struct achievement* HP_achievement_ensure(struct map_session_data *sd, const struct achievement_data *ad) { +struct achievement * HP_achievement_ensure(struct map_session_data *sd, const struct achievement_data *ad) { int hIndex = 0; - struct achievement* retVal___ = NULL; + struct achievement * retVal___ = NULL; if (HPMHooks.count.HP_achievement_ensure_pre > 0) { - struct achievement* (*preHookFunc) (struct map_session_data **sd, const struct achievement_data **ad); + struct achievement * (*preHookFunc) (struct map_session_data **sd, const struct achievement_data **ad); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_achievement_ensure_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_achievement_ensure_pre[hIndex].func; @@ -691,7 +691,7 @@ struct achievement* HP_achievement_ensure(struct map_session_data *sd, const str retVal___ = HPMHooks.source.achievement.ensure(sd, ad); } if (HPMHooks.count.HP_achievement_ensure_post > 0) { - struct achievement* (*postHookFunc) (struct achievement* retVal___, struct map_session_data *sd, const struct achievement_data *ad); + struct achievement * (*postHookFunc) (struct achievement * retVal___, struct map_session_data *sd, const struct achievement_data *ad); for (hIndex = 0; hIndex < HPMHooks.count.HP_achievement_ensure_post; hIndex++) { postHookFunc = HPMHooks.list.HP_achievement_ensure_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, ad); @@ -1725,11 +1725,11 @@ void HP_atcommand_load_groups(GroupSettings **groups, struct config_setting_t ** } return; } -AtCommandInfo* HP_atcommand_exists(const char *name) { +AtCommandInfo * HP_atcommand_exists(const char *name) { int hIndex = 0; - AtCommandInfo* retVal___ = NULL; + AtCommandInfo * retVal___ = NULL; if (HPMHooks.count.HP_atcommand_exists_pre > 0) { - AtCommandInfo* (*preHookFunc) (const char **name); + AtCommandInfo * (*preHookFunc) (const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_exists_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_atcommand_exists_pre[hIndex].func; @@ -1744,7 +1744,7 @@ AtCommandInfo* HP_atcommand_exists(const char *name) { retVal___ = HPMHooks.source.atcommand.exists(name); } if (HPMHooks.count.HP_atcommand_exists_post > 0) { - AtCommandInfo* (*postHookFunc) (AtCommandInfo* retVal___, const char *name); + AtCommandInfo * (*postHookFunc) (AtCommandInfo * retVal___, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_exists_post; hIndex++) { postHookFunc = HPMHooks.list.HP_atcommand_exists_post[hIndex].func; retVal___ = postHookFunc(retVal___, name); @@ -1805,11 +1805,11 @@ void HP_atcommand_final_msg(void) { } return; } -struct atcmd_binding_data* HP_atcommand_get_bind_byname(const char *name) { +struct atcmd_binding_data * HP_atcommand_get_bind_byname(const char *name) { int hIndex = 0; - struct atcmd_binding_data* retVal___ = NULL; + struct atcmd_binding_data * retVal___ = NULL; if (HPMHooks.count.HP_atcommand_get_bind_byname_pre > 0) { - struct atcmd_binding_data* (*preHookFunc) (const char **name); + struct atcmd_binding_data * (*preHookFunc) (const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_get_bind_byname_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_atcommand_get_bind_byname_pre[hIndex].func; @@ -1824,7 +1824,7 @@ struct atcmd_binding_data* HP_atcommand_get_bind_byname(const char *name) { retVal___ = HPMHooks.source.atcommand.get_bind_byname(name); } if (HPMHooks.count.HP_atcommand_get_bind_byname_post > 0) { - struct atcmd_binding_data* (*postHookFunc) (struct atcmd_binding_data* retVal___, const char *name); + struct atcmd_binding_data * (*postHookFunc) (struct atcmd_binding_data * retVal___, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_get_bind_byname_post; hIndex++) { postHookFunc = HPMHooks.list.HP_atcommand_get_bind_byname_post[hIndex].func; retVal___ = postHookFunc(retVal___, name); @@ -1832,11 +1832,11 @@ struct atcmd_binding_data* HP_atcommand_get_bind_byname(const char *name) { } return retVal___; } -AtCommandInfo* HP_atcommand_get_info_byname(const char *name) { +AtCommandInfo * HP_atcommand_get_info_byname(const char *name) { int hIndex = 0; - AtCommandInfo* retVal___ = NULL; + AtCommandInfo * retVal___ = NULL; if (HPMHooks.count.HP_atcommand_get_info_byname_pre > 0) { - AtCommandInfo* (*preHookFunc) (const char **name); + AtCommandInfo * (*preHookFunc) (const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_get_info_byname_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_atcommand_get_info_byname_pre[hIndex].func; @@ -1851,7 +1851,7 @@ AtCommandInfo* HP_atcommand_get_info_byname(const char *name) { retVal___ = HPMHooks.source.atcommand.get_info_byname(name); } if (HPMHooks.count.HP_atcommand_get_info_byname_post > 0) { - AtCommandInfo* (*postHookFunc) (AtCommandInfo* retVal___, const char *name); + AtCommandInfo * (*postHookFunc) (AtCommandInfo * retVal___, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_get_info_byname_post; hIndex++) { postHookFunc = HPMHooks.list.HP_atcommand_get_info_byname_post[hIndex].func; retVal___ = postHookFunc(retVal___, name); @@ -1859,11 +1859,11 @@ AtCommandInfo* HP_atcommand_get_info_byname(const char *name) { } return retVal___; } -const char* HP_atcommand_check_alias(const char *aliasname) { +const char * HP_atcommand_check_alias(const char *aliasname) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_atcommand_check_alias_pre > 0) { - const char* (*preHookFunc) (const char **aliasname); + const char * (*preHookFunc) (const char **aliasname); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_check_alias_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_atcommand_check_alias_pre[hIndex].func; @@ -1878,7 +1878,7 @@ const char* HP_atcommand_check_alias(const char *aliasname) { retVal___ = HPMHooks.source.atcommand.check_alias(aliasname); } if (HPMHooks.count.HP_atcommand_check_alias_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *aliasname); + const char * (*postHookFunc) (const char * retVal___, const char *aliasname); for (hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_check_alias_post; hIndex++) { postHookFunc = HPMHooks.list.HP_atcommand_check_alias_post[hIndex].func; retVal___ = postHookFunc(retVal___, aliasname); @@ -2430,11 +2430,11 @@ bool HP_atcommand_add(char *name, AtCommandFunc func, bool replace) { } return retVal___; } -const char* HP_atcommand_msg(int msg_number) { +const char * HP_atcommand_msg(int msg_number) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_atcommand_msg_pre > 0) { - const char* (*preHookFunc) (int *msg_number); + const char * (*preHookFunc) (int *msg_number); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_msg_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_atcommand_msg_pre[hIndex].func; @@ -2449,7 +2449,7 @@ const char* HP_atcommand_msg(int msg_number) { retVal___ = HPMHooks.source.atcommand.msg(msg_number); } if (HPMHooks.count.HP_atcommand_msg_post > 0) { - const char* (*postHookFunc) (const char* retVal___, int msg_number); + const char * (*postHookFunc) (const char * retVal___, int msg_number); for (hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_msg_post; hIndex++) { postHookFunc = HPMHooks.list.HP_atcommand_msg_post[hIndex].func; retVal___ = postHookFunc(retVal___, msg_number); @@ -2483,11 +2483,11 @@ void HP_atcommand_expand_message_table(void) { } return; } -const char* HP_atcommand_msgfd(int fd, int msg_number) { +const char * HP_atcommand_msgfd(int fd, int msg_number) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_atcommand_msgfd_pre > 0) { - const char* (*preHookFunc) (int *fd, int *msg_number); + const char * (*preHookFunc) (int *fd, int *msg_number); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_msgfd_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_atcommand_msgfd_pre[hIndex].func; @@ -2502,7 +2502,7 @@ const char* HP_atcommand_msgfd(int fd, int msg_number) { retVal___ = HPMHooks.source.atcommand.msgfd(fd, msg_number); } if (HPMHooks.count.HP_atcommand_msgfd_post > 0) { - const char* (*postHookFunc) (const char* retVal___, int fd, int msg_number); + const char * (*postHookFunc) (const char * retVal___, int fd, int msg_number); for (hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_msgfd_post; hIndex++) { postHookFunc = HPMHooks.list.HP_atcommand_msgfd_post[hIndex].func; retVal___ = postHookFunc(retVal___, fd, msg_number); @@ -2510,11 +2510,11 @@ const char* HP_atcommand_msgfd(int fd, int msg_number) { } return retVal___; } -const char* HP_atcommand_msgsd(struct map_session_data *sd, int msg_number) { +const char * HP_atcommand_msgsd(struct map_session_data *sd, int msg_number) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_atcommand_msgsd_pre > 0) { - const char* (*preHookFunc) (struct map_session_data **sd, int *msg_number); + const char * (*preHookFunc) (struct map_session_data **sd, int *msg_number); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_msgsd_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_atcommand_msgsd_pre[hIndex].func; @@ -2529,7 +2529,7 @@ const char* HP_atcommand_msgsd(struct map_session_data *sd, int msg_number) { retVal___ = HPMHooks.source.atcommand.msgsd(sd, msg_number); } if (HPMHooks.count.HP_atcommand_msgsd_post > 0) { - const char* (*postHookFunc) (const char* retVal___, struct map_session_data *sd, int msg_number); + const char * (*postHookFunc) (const char * retVal___, struct map_session_data *sd, int msg_number); for (hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_msgsd_post; hIndex++) { postHookFunc = HPMHooks.list.HP_atcommand_msgsd_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, msg_number); @@ -3263,11 +3263,11 @@ int64 HP_battle_calc_defense(int attack_type, struct block_list *src, struct blo } return retVal___; } -struct block_list* HP_battle_get_master(struct block_list *src) { +struct block_list * HP_battle_get_master(struct block_list *src) { int hIndex = 0; - struct block_list* retVal___ = NULL; + struct block_list * retVal___ = NULL; if (HPMHooks.count.HP_battle_get_master_pre > 0) { - struct block_list* (*preHookFunc) (struct block_list **src); + struct block_list * (*preHookFunc) (struct block_list **src); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_battle_get_master_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_battle_get_master_pre[hIndex].func; @@ -3282,7 +3282,7 @@ struct block_list* HP_battle_get_master(struct block_list *src) { retVal___ = HPMHooks.source.battle.get_master(src); } if (HPMHooks.count.HP_battle_get_master_post > 0) { - struct block_list* (*postHookFunc) (struct block_list* retVal___, struct block_list *src); + struct block_list * (*postHookFunc) (struct block_list * retVal___, struct block_list *src); for (hIndex = 0; hIndex < HPMHooks.count.HP_battle_get_master_post; hIndex++) { postHookFunc = HPMHooks.list.HP_battle_get_master_post[hIndex].func; retVal___ = postHookFunc(retVal___, src); @@ -3290,11 +3290,11 @@ struct block_list* HP_battle_get_master(struct block_list *src) { } return retVal___; } -struct block_list* HP_battle_get_targeted(struct block_list *target) { +struct block_list * HP_battle_get_targeted(struct block_list *target) { int hIndex = 0; - struct block_list* retVal___ = NULL; + struct block_list * retVal___ = NULL; if (HPMHooks.count.HP_battle_get_targeted_pre > 0) { - struct block_list* (*preHookFunc) (struct block_list **target); + struct block_list * (*preHookFunc) (struct block_list **target); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_battle_get_targeted_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_battle_get_targeted_pre[hIndex].func; @@ -3309,7 +3309,7 @@ struct block_list* HP_battle_get_targeted(struct block_list *target) { retVal___ = HPMHooks.source.battle.get_targeted(target); } if (HPMHooks.count.HP_battle_get_targeted_post > 0) { - struct block_list* (*postHookFunc) (struct block_list* retVal___, struct block_list *target); + struct block_list * (*postHookFunc) (struct block_list * retVal___, struct block_list *target); for (hIndex = 0; hIndex < HPMHooks.count.HP_battle_get_targeted_post; hIndex++) { postHookFunc = HPMHooks.list.HP_battle_get_targeted_post[hIndex].func; retVal___ = postHookFunc(retVal___, target); @@ -3317,11 +3317,11 @@ struct block_list* HP_battle_get_targeted(struct block_list *target) { } return retVal___; } -struct block_list* HP_battle_get_enemy(struct block_list *target, int type, int range) { +struct block_list * HP_battle_get_enemy(struct block_list *target, int type, int range) { int hIndex = 0; - struct block_list* retVal___ = NULL; + struct block_list * retVal___ = NULL; if (HPMHooks.count.HP_battle_get_enemy_pre > 0) { - struct block_list* (*preHookFunc) (struct block_list **target, int *type, int *range); + struct block_list * (*preHookFunc) (struct block_list **target, int *type, int *range); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_battle_get_enemy_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_battle_get_enemy_pre[hIndex].func; @@ -3336,7 +3336,7 @@ struct block_list* HP_battle_get_enemy(struct block_list *target, int type, int retVal___ = HPMHooks.source.battle.get_enemy(target, type, range); } if (HPMHooks.count.HP_battle_get_enemy_post > 0) { - struct block_list* (*postHookFunc) (struct block_list* retVal___, struct block_list *target, int type, int range); + struct block_list * (*postHookFunc) (struct block_list * retVal___, struct block_list *target, int type, int range); for (hIndex = 0; hIndex < HPMHooks.count.HP_battle_get_enemy_post; hIndex++) { postHookFunc = HPMHooks.list.HP_battle_get_enemy_post[hIndex].func; retVal___ = postHookFunc(retVal___, target, type, range); @@ -4060,11 +4060,11 @@ void HP_battle_config_adjust(void) { } return; } -struct block_list* HP_battle_get_enemy_area(struct block_list *src, int x, int y, int range, int type, int ignore_id) { +struct block_list * HP_battle_get_enemy_area(struct block_list *src, int x, int y, int range, int type, int ignore_id) { int hIndex = 0; - struct block_list* retVal___ = NULL; + struct block_list * retVal___ = NULL; if (HPMHooks.count.HP_battle_get_enemy_area_pre > 0) { - struct block_list* (*preHookFunc) (struct block_list **src, int *x, int *y, int *range, int *type, int *ignore_id); + struct block_list * (*preHookFunc) (struct block_list **src, int *x, int *y, int *range, int *type, int *ignore_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_battle_get_enemy_area_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_battle_get_enemy_area_pre[hIndex].func; @@ -4079,7 +4079,7 @@ struct block_list* HP_battle_get_enemy_area(struct block_list *src, int x, int y retVal___ = HPMHooks.source.battle.get_enemy_area(src, x, y, range, type, ignore_id); } if (HPMHooks.count.HP_battle_get_enemy_area_post > 0) { - struct block_list* (*postHookFunc) (struct block_list* retVal___, struct block_list *src, int x, int y, int range, int type, int ignore_id); + struct block_list * (*postHookFunc) (struct block_list * retVal___, struct block_list *src, int x, int y, int range, int type, int ignore_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_battle_get_enemy_area_post; hIndex++) { postHookFunc = HPMHooks.list.HP_battle_get_enemy_area_post[hIndex].func; retVal___ = postHookFunc(retVal___, src, x, y, range, type, ignore_id); @@ -4277,11 +4277,11 @@ void HP_bg_final(void) { } return; } -struct bg_arena* HP_bg_name2arena(const char *name) { +struct bg_arena * HP_bg_name2arena(const char *name) { int hIndex = 0; - struct bg_arena* retVal___ = NULL; + struct bg_arena * retVal___ = NULL; if (HPMHooks.count.HP_bg_name2arena_pre > 0) { - struct bg_arena* (*preHookFunc) (const char **name); + struct bg_arena * (*preHookFunc) (const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_bg_name2arena_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_bg_name2arena_pre[hIndex].func; @@ -4296,7 +4296,7 @@ struct bg_arena* HP_bg_name2arena(const char *name) { retVal___ = HPMHooks.source.bg.name2arena(name); } if (HPMHooks.count.HP_bg_name2arena_post > 0) { - struct bg_arena* (*postHookFunc) (struct bg_arena* retVal___, const char *name); + struct bg_arena * (*postHookFunc) (struct bg_arena * retVal___, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_bg_name2arena_post; hIndex++) { postHookFunc = HPMHooks.list.HP_bg_name2arena_post[hIndex].func; retVal___ = postHookFunc(retVal___, name); @@ -4594,11 +4594,11 @@ void HP_bg_queue_check(struct bg_arena *arena) { } return; } -struct battleground_data* HP_bg_team_search(int bg_id) { +struct battleground_data * HP_bg_team_search(int bg_id) { int hIndex = 0; - struct battleground_data* retVal___ = NULL; + struct battleground_data * retVal___ = NULL; if (HPMHooks.count.HP_bg_team_search_pre > 0) { - struct battleground_data* (*preHookFunc) (int *bg_id); + struct battleground_data * (*preHookFunc) (int *bg_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_bg_team_search_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_bg_team_search_pre[hIndex].func; @@ -4613,7 +4613,7 @@ struct battleground_data* HP_bg_team_search(int bg_id) { retVal___ = HPMHooks.source.bg.team_search(bg_id); } if (HPMHooks.count.HP_bg_team_search_post > 0) { - struct battleground_data* (*postHookFunc) (struct battleground_data* retVal___, int bg_id); + struct battleground_data * (*postHookFunc) (struct battleground_data * retVal___, int bg_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_bg_team_search_post; hIndex++) { postHookFunc = HPMHooks.list.HP_bg_team_search_post[hIndex].func; retVal___ = postHookFunc(retVal___, bg_id); @@ -4621,11 +4621,11 @@ struct battleground_data* HP_bg_team_search(int bg_id) { } return retVal___; } -struct map_session_data* HP_bg_getavailablesd(struct battleground_data *bgd) { +struct map_session_data * HP_bg_getavailablesd(struct battleground_data *bgd) { int hIndex = 0; - struct map_session_data* retVal___ = NULL; + struct map_session_data * retVal___ = NULL; if (HPMHooks.count.HP_bg_getavailablesd_pre > 0) { - struct map_session_data* (*preHookFunc) (struct battleground_data **bgd); + struct map_session_data * (*preHookFunc) (struct battleground_data **bgd); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_bg_getavailablesd_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_bg_getavailablesd_pre[hIndex].func; @@ -4640,7 +4640,7 @@ struct map_session_data* HP_bg_getavailablesd(struct battleground_data *bgd) { retVal___ = HPMHooks.source.bg.getavailablesd(bgd); } if (HPMHooks.count.HP_bg_getavailablesd_post > 0) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, struct battleground_data *bgd); + struct map_session_data * (*postHookFunc) (struct map_session_data * retVal___, struct battleground_data *bgd); for (hIndex = 0; hIndex < HPMHooks.count.HP_bg_getavailablesd_post; hIndex++) { postHookFunc = HPMHooks.list.HP_bg_getavailablesd_post[hIndex].func; retVal___ = postHookFunc(retVal___, bgd); @@ -5330,11 +5330,11 @@ void HP_channel_final(void) { } return; } -struct channel_data* HP_channel_search(const char *name, struct map_session_data *sd) { +struct channel_data * HP_channel_search(const char *name, struct map_session_data *sd) { int hIndex = 0; - struct channel_data* retVal___ = NULL; + struct channel_data * retVal___ = NULL; if (HPMHooks.count.HP_channel_search_pre > 0) { - struct channel_data* (*preHookFunc) (const char **name, struct map_session_data **sd); + struct channel_data * (*preHookFunc) (const char **name, struct map_session_data **sd); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_channel_search_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_channel_search_pre[hIndex].func; @@ -5349,7 +5349,7 @@ struct channel_data* HP_channel_search(const char *name, struct map_session_data retVal___ = HPMHooks.source.channel.search(name, sd); } if (HPMHooks.count.HP_channel_search_post > 0) { - struct channel_data* (*postHookFunc) (struct channel_data* retVal___, const char *name, struct map_session_data *sd); + struct channel_data * (*postHookFunc) (struct channel_data * retVal___, const char *name, struct map_session_data *sd); for (hIndex = 0; hIndex < HPMHooks.count.HP_channel_search_post; hIndex++) { postHookFunc = HPMHooks.list.HP_channel_search_post[hIndex].func; retVal___ = postHookFunc(retVal___, name, sd); @@ -5357,11 +5357,11 @@ struct channel_data* HP_channel_search(const char *name, struct map_session_data } return retVal___; } -struct channel_data* HP_channel_create(enum channel_types type, const char *name, unsigned char color) { +struct channel_data * HP_channel_create(enum channel_types type, const char *name, unsigned char color) { int hIndex = 0; - struct channel_data* retVal___ = NULL; + struct channel_data * retVal___ = NULL; if (HPMHooks.count.HP_channel_create_pre > 0) { - struct channel_data* (*preHookFunc) (enum channel_types *type, const char **name, unsigned char *color); + struct channel_data * (*preHookFunc) (enum channel_types *type, const char **name, unsigned char *color); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_channel_create_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_channel_create_pre[hIndex].func; @@ -5376,7 +5376,7 @@ struct channel_data* HP_channel_create(enum channel_types type, const char *name retVal___ = HPMHooks.source.channel.create(type, name, color); } if (HPMHooks.count.HP_channel_create_post > 0) { - struct channel_data* (*postHookFunc) (struct channel_data* retVal___, enum channel_types type, const char *name, unsigned char color); + struct channel_data * (*postHookFunc) (struct channel_data * retVal___, enum channel_types type, const char *name, unsigned char color); for (hIndex = 0; hIndex < HPMHooks.count.HP_channel_create_post; hIndex++) { postHookFunc = HPMHooks.list.HP_channel_create_post[hIndex].func; retVal___ = postHookFunc(retVal___, type, name, color); @@ -6154,11 +6154,11 @@ bool HP_chat_trigger_event(struct chat_data *cd) { } return retVal___; } -struct chat_data* HP_chat_create(struct block_list *bl, const char *title, const char *pass, int limit, bool pub, int trigger, const char *ev, int zeny, int min_level, int max_level) { +struct chat_data * HP_chat_create(struct block_list *bl, const char *title, const char *pass, int limit, bool pub, int trigger, const char *ev, int zeny, int min_level, int max_level) { int hIndex = 0; - struct chat_data* retVal___ = NULL; + struct chat_data * retVal___ = NULL; if (HPMHooks.count.HP_chat_create_pre > 0) { - struct chat_data* (*preHookFunc) (struct block_list **bl, const char **title, const char **pass, int *limit, bool *pub, int *trigger, const char **ev, int *zeny, int *min_level, int *max_level); + struct chat_data * (*preHookFunc) (struct block_list **bl, const char **title, const char **pass, int *limit, bool *pub, int *trigger, const char **ev, int *zeny, int *min_level, int *max_level); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_chat_create_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_chat_create_pre[hIndex].func; @@ -6173,7 +6173,7 @@ struct chat_data* HP_chat_create(struct block_list *bl, const char *title, const retVal___ = HPMHooks.source.chat.create(bl, title, pass, limit, pub, trigger, ev, zeny, min_level, max_level); } if (HPMHooks.count.HP_chat_create_post > 0) { - struct chat_data* (*postHookFunc) (struct chat_data* retVal___, struct block_list *bl, const char *title, const char *pass, int limit, bool pub, int trigger, const char *ev, int zeny, int min_level, int max_level); + struct chat_data * (*postHookFunc) (struct chat_data * retVal___, struct block_list *bl, const char *title, const char *pass, int limit, bool pub, int trigger, const char *ev, int zeny, int min_level, int max_level); for (hIndex = 0; hIndex < HPMHooks.count.HP_chat_create_post; hIndex++) { postHookFunc = HPMHooks.list.HP_chat_create_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl, title, pass, limit, pub, trigger, ev, zeny, min_level, max_level); @@ -6418,11 +6418,11 @@ void HP_chrif_check_shutdown(void) { } return; } -struct auth_node* HP_chrif_search(int account_id) { +struct auth_node * HP_chrif_search(int account_id) { int hIndex = 0; - struct auth_node* retVal___ = NULL; + struct auth_node * retVal___ = NULL; if (HPMHooks.count.HP_chrif_search_pre > 0) { - struct auth_node* (*preHookFunc) (int *account_id); + struct auth_node * (*preHookFunc) (int *account_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_chrif_search_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_chrif_search_pre[hIndex].func; @@ -6437,7 +6437,7 @@ struct auth_node* HP_chrif_search(int account_id) { retVal___ = HPMHooks.source.chrif.search(account_id); } if (HPMHooks.count.HP_chrif_search_post > 0) { - struct auth_node* (*postHookFunc) (struct auth_node* retVal___, int account_id); + struct auth_node * (*postHookFunc) (struct auth_node * retVal___, int account_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_chrif_search_post; hIndex++) { postHookFunc = HPMHooks.list.HP_chrif_search_post[hIndex].func; retVal___ = postHookFunc(retVal___, account_id); @@ -6445,11 +6445,11 @@ struct auth_node* HP_chrif_search(int account_id) { } return retVal___; } -struct auth_node* HP_chrif_auth_check(int account_id, int char_id, enum sd_state state) { +struct auth_node * HP_chrif_auth_check(int account_id, int char_id, enum sd_state state) { int hIndex = 0; - struct auth_node* retVal___ = NULL; + struct auth_node * retVal___ = NULL; if (HPMHooks.count.HP_chrif_auth_check_pre > 0) { - struct auth_node* (*preHookFunc) (int *account_id, int *char_id, enum sd_state *state); + struct auth_node * (*preHookFunc) (int *account_id, int *char_id, enum sd_state *state); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_chrif_auth_check_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_chrif_auth_check_pre[hIndex].func; @@ -6464,7 +6464,7 @@ struct auth_node* HP_chrif_auth_check(int account_id, int char_id, enum sd_state retVal___ = HPMHooks.source.chrif.auth_check(account_id, char_id, state); } if (HPMHooks.count.HP_chrif_auth_check_post > 0) { - struct auth_node* (*postHookFunc) (struct auth_node* retVal___, int account_id, int char_id, enum sd_state state); + struct auth_node * (*postHookFunc) (struct auth_node * retVal___, int account_id, int char_id, enum sd_state state); for (hIndex = 0; hIndex < HPMHooks.count.HP_chrif_auth_check_post; hIndex++) { postHookFunc = HPMHooks.list.HP_chrif_auth_check_post[hIndex].func; retVal___ = postHookFunc(retVal___, account_id, char_id, state); @@ -8139,11 +8139,11 @@ void HP_clan_read_buffs(struct clan *c, struct config_setting_t *buff, const cha } return; } -struct clan* HP_clan_search(int clan_id) { +struct clan * HP_clan_search(int clan_id) { int hIndex = 0; - struct clan* retVal___ = NULL; + struct clan * retVal___ = NULL; if (HPMHooks.count.HP_clan_search_pre > 0) { - struct clan* (*preHookFunc) (int *clan_id); + struct clan * (*preHookFunc) (int *clan_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_clan_search_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_clan_search_pre[hIndex].func; @@ -8158,7 +8158,7 @@ struct clan* HP_clan_search(int clan_id) { retVal___ = HPMHooks.source.clan.search(clan_id); } if (HPMHooks.count.HP_clan_search_post > 0) { - struct clan* (*postHookFunc) (struct clan* retVal___, int clan_id); + struct clan * (*postHookFunc) (struct clan * retVal___, int clan_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_clan_search_post; hIndex++) { postHookFunc = HPMHooks.list.HP_clan_search_post[hIndex].func; retVal___ = postHookFunc(retVal___, clan_id); @@ -8166,11 +8166,11 @@ struct clan* HP_clan_search(int clan_id) { } return retVal___; } -struct clan* HP_clan_searchname(const char *name) { +struct clan * HP_clan_searchname(const char *name) { int hIndex = 0; - struct clan* retVal___ = NULL; + struct clan * retVal___ = NULL; if (HPMHooks.count.HP_clan_searchname_pre > 0) { - struct clan* (*preHookFunc) (const char **name); + struct clan * (*preHookFunc) (const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_clan_searchname_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_clan_searchname_pre[hIndex].func; @@ -8185,7 +8185,7 @@ struct clan* HP_clan_searchname(const char *name) { retVal___ = HPMHooks.source.clan.searchname(name); } if (HPMHooks.count.HP_clan_searchname_post > 0) { - struct clan* (*postHookFunc) (struct clan* retVal___, const char *name); + struct clan * (*postHookFunc) (struct clan * retVal___, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_clan_searchname_post; hIndex++) { postHookFunc = HPMHooks.list.HP_clan_searchname_post[hIndex].func; retVal___ = postHookFunc(retVal___, name); @@ -8193,11 +8193,11 @@ struct clan* HP_clan_searchname(const char *name) { } return retVal___; } -struct map_session_data* HP_clan_getonlinesd(struct clan *c) { +struct map_session_data * HP_clan_getonlinesd(struct clan *c) { int hIndex = 0; - struct map_session_data* retVal___ = NULL; + struct map_session_data * retVal___ = NULL; if (HPMHooks.count.HP_clan_getonlinesd_pre > 0) { - struct map_session_data* (*preHookFunc) (struct clan **c); + struct map_session_data * (*preHookFunc) (struct clan **c); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_clan_getonlinesd_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_clan_getonlinesd_pre[hIndex].func; @@ -8212,7 +8212,7 @@ struct map_session_data* HP_clan_getonlinesd(struct clan *c) { retVal___ = HPMHooks.source.clan.getonlinesd(c); } if (HPMHooks.count.HP_clan_getonlinesd_post > 0) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, struct clan *c); + struct map_session_data * (*postHookFunc) (struct map_session_data * retVal___, struct clan *c); for (hIndex = 0; hIndex < HPMHooks.count.HP_clan_getonlinesd_post; hIndex++) { postHookFunc = HPMHooks.list.HP_clan_getonlinesd_post[hIndex].func; retVal___ = postHookFunc(retVal___, c); @@ -8926,11 +8926,11 @@ int HP_clif_parse(int fd) { } return retVal___; } -const struct s_packet_db* HP_clif_packet(int packet_id) { +const struct s_packet_db * HP_clif_packet(int packet_id) { int hIndex = 0; - const struct s_packet_db* retVal___ = NULL; + const struct s_packet_db * retVal___ = NULL; if (HPMHooks.count.HP_clif_packet_pre > 0) { - const struct s_packet_db* (*preHookFunc) (int *packet_id); + const struct s_packet_db * (*preHookFunc) (int *packet_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_packet_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_clif_packet_pre[hIndex].func; @@ -8945,7 +8945,7 @@ const struct s_packet_db* HP_clif_packet(int packet_id) { retVal___ = HPMHooks.source.clif.packet(packet_id); } if (HPMHooks.count.HP_clif_packet_post > 0) { - const struct s_packet_db* (*postHookFunc) (const struct s_packet_db* retVal___, int packet_id); + const struct s_packet_db * (*postHookFunc) (const struct s_packet_db * retVal___, int packet_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_packet_post; hIndex++) { postHookFunc = HPMHooks.list.HP_clif_packet_post[hIndex].func; retVal___ = postHookFunc(retVal___, packet_id); @@ -16538,11 +16538,11 @@ void HP_clif_messageln(const int fd, const char *mes) { } return; } -const char* HP_clif_process_chat_message(struct map_session_data *sd, const struct packet_chat_message *packet, char *out_buf, int out_buflen) { +const char * HP_clif_process_chat_message(struct map_session_data *sd, const struct packet_chat_message *packet, char *out_buf, int out_buflen) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_clif_process_chat_message_pre > 0) { - const char* (*preHookFunc) (struct map_session_data **sd, const struct packet_chat_message **packet, char **out_buf, int *out_buflen); + const char * (*preHookFunc) (struct map_session_data **sd, const struct packet_chat_message **packet, char **out_buf, int *out_buflen); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_process_chat_message_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_clif_process_chat_message_pre[hIndex].func; @@ -16557,7 +16557,7 @@ const char* HP_clif_process_chat_message(struct map_session_data *sd, const stru retVal___ = HPMHooks.source.clif.process_chat_message(sd, packet, out_buf, out_buflen); } if (HPMHooks.count.HP_clif_process_chat_message_post > 0) { - const char* (*postHookFunc) (const char* retVal___, struct map_session_data *sd, const struct packet_chat_message *packet, char *out_buf, int out_buflen); + const char * (*postHookFunc) (const char * retVal___, struct map_session_data *sd, const struct packet_chat_message *packet, char *out_buf, int out_buflen); for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_process_chat_message_post; hIndex++) { postHookFunc = HPMHooks.list.HP_clif_process_chat_message_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, packet, out_buf, out_buflen); @@ -17164,14 +17164,14 @@ void HP_clif_guildStorageList(struct map_session_data *sd, struct item *items, i } return; } -void HP_clif_storageItems(struct map_session_data *sd, enum inventory_type type, struct item *items, int items_length) { +void HP_clif_storageItems(struct map_session_data *sd, enum inventory_type type, struct item *items, int items_length, const char *name) { int hIndex = 0; if (HPMHooks.count.HP_clif_storageItems_pre > 0) { - void (*preHookFunc) (struct map_session_data **sd, enum inventory_type *type, struct item **items, int *items_length); + void (*preHookFunc) (struct map_session_data **sd, enum inventory_type *type, struct item **items, int *items_length, const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_storageItems_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_clif_storageItems_pre[hIndex].func; - preHookFunc(&sd, &type, &items, &items_length); + preHookFunc(&sd, &type, &items, &items_length, &name); } if (*HPMforce_return) { *HPMforce_return = false; @@ -17179,13 +17179,13 @@ void HP_clif_storageItems(struct map_session_data *sd, enum inventory_type type, } } { - HPMHooks.source.clif.storageItems(sd, type, items, items_length); + HPMHooks.source.clif.storageItems(sd, type, items, items_length, name); } if (HPMHooks.count.HP_clif_storageItems_post > 0) { - void (*postHookFunc) (struct map_session_data *sd, enum inventory_type type, struct item *items, int items_length); + void (*postHookFunc) (struct map_session_data *sd, enum inventory_type type, struct item *items, int items_length, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_storageItems_post; hIndex++) { postHookFunc = HPMHooks.list.HP_clif_storageItems_post[hIndex].func; - postHookFunc(sd, type, items, items_length); + postHookFunc(sd, type, items, items_length, name); } } return; @@ -29038,11 +29038,11 @@ void HP_clif_pSelectCart(int fd, struct map_session_data *sd) { } return; } -const char* HP_clif_get_bl_name(const struct block_list *bl) { +const char * HP_clif_get_bl_name(const struct block_list *bl) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_clif_get_bl_name_pre > 0) { - const char* (*preHookFunc) (const struct block_list **bl); + const char * (*preHookFunc) (const struct block_list **bl); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_get_bl_name_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_clif_get_bl_name_pre[hIndex].func; @@ -29057,7 +29057,7 @@ const char* HP_clif_get_bl_name(const struct block_list *bl) { retVal___ = HPMHooks.source.clif.get_bl_name(bl); } if (HPMHooks.count.HP_clif_get_bl_name_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const struct block_list *bl); + const char * (*postHookFunc) (const char * retVal___, const struct block_list *bl); for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_get_bl_name_post; hIndex++) { postHookFunc = HPMHooks.list.HP_clif_get_bl_name_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl); @@ -33174,11 +33174,11 @@ bool HP_cmdline_arg_next_value(const char *name, int current_arg, int argc) { } return retVal___; } -const char* HP_cmdline_arg_source(struct CmdlineArgData *arg) { +const char * HP_cmdline_arg_source(struct CmdlineArgData *arg) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_cmdline_arg_source_pre > 0) { - const char* (*preHookFunc) (struct CmdlineArgData **arg); + const char * (*preHookFunc) (struct CmdlineArgData **arg); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_source_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_cmdline_arg_source_pre[hIndex].func; @@ -33193,7 +33193,7 @@ const char* HP_cmdline_arg_source(struct CmdlineArgData *arg) { retVal___ = HPMHooks.source.cmdline.arg_source(arg); } if (HPMHooks.count.HP_cmdline_arg_source_post > 0) { - const char* (*postHookFunc) (const char* retVal___, struct CmdlineArgData *arg); + const char * (*postHookFunc) (const char * retVal___, struct CmdlineArgData *arg); for (hIndex = 0; hIndex < HPMHooks.count.HP_cmdline_arg_source_post; hIndex++) { postHookFunc = HPMHooks.list.HP_cmdline_arg_source_post[hIndex].func; retVal___ = postHookFunc(retVal___, arg); @@ -33469,11 +33469,11 @@ DBReleaser HP_DB_custom_release(enum DBReleaseOption which) { } return retVal___; } -struct DBMap* HP_DB_alloc(const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen) { +struct DBMap * HP_DB_alloc(const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen) { int hIndex = 0; - struct DBMap* retVal___ = NULL; + struct DBMap * retVal___ = NULL; if (HPMHooks.count.HP_DB_alloc_pre > 0) { - struct DBMap* (*preHookFunc) (const char **file, const char **func, int *line, enum DBType *type, enum DBOptions *options, unsigned short *maxlen); + struct DBMap * (*preHookFunc) (const char **file, const char **func, int *line, enum DBType *type, enum DBOptions *options, unsigned short *maxlen); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_DB_alloc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_DB_alloc_pre[hIndex].func; @@ -33488,7 +33488,7 @@ struct DBMap* HP_DB_alloc(const char *file, const char *func, int line, enum DBT retVal___ = HPMHooks.source.DB.alloc(file, func, line, type, options, maxlen); } if (HPMHooks.count.HP_DB_alloc_post > 0) { - struct DBMap* (*postHookFunc) (struct DBMap* retVal___, const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen); + struct DBMap * (*postHookFunc) (struct DBMap * retVal___, const char *file, const char *func, int line, enum DBType type, enum DBOptions options, unsigned short maxlen); for (hIndex = 0; hIndex < HPMHooks.count.HP_DB_alloc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_DB_alloc_post[hIndex].func; retVal___ = postHookFunc(retVal___, file, func, line, type, options, maxlen); @@ -33766,11 +33766,11 @@ unsigned int HP_DB_data2ui(struct DBData *data) { } return retVal___; } -void* HP_DB_data2ptr(struct DBData *data) { +void * HP_DB_data2ptr(struct DBData *data) { int hIndex = 0; - void* retVal___ = NULL; + void * retVal___ = NULL; if (HPMHooks.count.HP_DB_data2ptr_pre > 0) { - void* (*preHookFunc) (struct DBData **data); + void * (*preHookFunc) (struct DBData **data); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ptr_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_DB_data2ptr_pre[hIndex].func; @@ -33785,7 +33785,7 @@ void* HP_DB_data2ptr(struct DBData *data) { retVal___ = HPMHooks.source.DB.data2ptr(data); } if (HPMHooks.count.HP_DB_data2ptr_post > 0) { - void* (*postHookFunc) (void* retVal___, struct DBData *data); + void * (*postHookFunc) (void * retVal___, struct DBData *data); for (hIndex = 0; hIndex < HPMHooks.count.HP_DB_data2ptr_post; hIndex++) { postHookFunc = HPMHooks.list.HP_DB_data2ptr_post[hIndex].func; retVal___ = postHookFunc(retVal___, data); @@ -34216,11 +34216,11 @@ bool HP_elemental_class(int class_) { } return retVal___; } -struct view_data* HP_elemental_get_viewdata(int class_) { +struct view_data * HP_elemental_get_viewdata(int class_) { int hIndex = 0; - struct view_data* retVal___ = NULL; + struct view_data * retVal___ = NULL; if (HPMHooks.count.HP_elemental_get_viewdata_pre > 0) { - struct view_data* (*preHookFunc) (int *class_); + struct view_data * (*preHookFunc) (int *class_); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_elemental_get_viewdata_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_elemental_get_viewdata_pre[hIndex].func; @@ -34235,7 +34235,7 @@ struct view_data* HP_elemental_get_viewdata(int class_) { retVal___ = HPMHooks.source.elemental.get_viewdata(class_); } if (HPMHooks.count.HP_elemental_get_viewdata_post > 0) { - struct view_data* (*postHookFunc) (struct view_data* retVal___, int class_); + struct view_data * (*postHookFunc) (struct view_data * retVal___, int class_); for (hIndex = 0; hIndex < HPMHooks.count.HP_elemental_get_viewdata_post; hIndex++) { postHookFunc = HPMHooks.list.HP_elemental_get_viewdata_post[hIndex].func; retVal___ = postHookFunc(retVal___, class_); @@ -35093,11 +35093,11 @@ int HP_enchantui_db_final_sub(union DBKey key, struct DBData *data, va_list ap) } return retVal___; } -struct enchant_info* HP_enchantui_exists(int64 id) { +struct enchant_info * HP_enchantui_exists(int64 id) { int hIndex = 0; - struct enchant_info* retVal___ = NULL; + struct enchant_info * retVal___ = NULL; if (HPMHooks.count.HP_enchantui_exists_pre > 0) { - struct enchant_info* (*preHookFunc) (int64 *id); + struct enchant_info * (*preHookFunc) (int64 *id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_enchantui_exists_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_enchantui_exists_pre[hIndex].func; @@ -35112,7 +35112,7 @@ struct enchant_info* HP_enchantui_exists(int64 id) { retVal___ = HPMHooks.source.enchantui.exists(id); } if (HPMHooks.count.HP_enchantui_exists_post > 0) { - struct enchant_info* (*postHookFunc) (struct enchant_info* retVal___, int64 id); + struct enchant_info * (*postHookFunc) (struct enchant_info * retVal___, int64 id); for (hIndex = 0; hIndex < HPMHooks.count.HP_enchantui_exists_post; hIndex++) { postHookFunc = HPMHooks.list.HP_enchantui_exists_post[hIndex].func; retVal___ = postHookFunc(retVal___, id); @@ -35470,11 +35470,11 @@ bool HP_enchantui_read_db_libconfig_itemrate_list(const struct config_setting_t } return retVal___; } -const struct enchant_info* HP_enchantui_validate_targetitem(struct map_session_data *sd, int64 enchant_group, int index) { +const struct enchant_info * HP_enchantui_validate_targetitem(struct map_session_data *sd, int64 enchant_group, int index) { int hIndex = 0; - const struct enchant_info* retVal___ = NULL; + const struct enchant_info * retVal___ = NULL; if (HPMHooks.count.HP_enchantui_validate_targetitem_pre > 0) { - const struct enchant_info* (*preHookFunc) (struct map_session_data **sd, int64 *enchant_group, int *index); + const struct enchant_info * (*preHookFunc) (struct map_session_data **sd, int64 *enchant_group, int *index); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_enchantui_validate_targetitem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_enchantui_validate_targetitem_pre[hIndex].func; @@ -35489,7 +35489,7 @@ const struct enchant_info* HP_enchantui_validate_targetitem(struct map_session_d retVal___ = HPMHooks.source.enchantui.validate_targetitem(sd, enchant_group, index); } if (HPMHooks.count.HP_enchantui_validate_targetitem_post > 0) { - const struct enchant_info* (*postHookFunc) (const struct enchant_info* retVal___, struct map_session_data *sd, int64 enchant_group, int index); + const struct enchant_info * (*postHookFunc) (const struct enchant_info * retVal___, struct map_session_data *sd, int64 enchant_group, int index); for (hIndex = 0; hIndex < HPMHooks.count.HP_enchantui_validate_targetitem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_enchantui_validate_targetitem_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, enchant_group, index); @@ -35978,11 +35978,11 @@ void HP_goldpc_final(void) { } return; } -struct goldpc_mode* HP_goldpc_exists(int id) { +struct goldpc_mode * HP_goldpc_exists(int id) { int hIndex = 0; - struct goldpc_mode* retVal___ = NULL; + struct goldpc_mode * retVal___ = NULL; if (HPMHooks.count.HP_goldpc_exists_pre > 0) { - struct goldpc_mode* (*preHookFunc) (int *id); + struct goldpc_mode * (*preHookFunc) (int *id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_goldpc_exists_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_goldpc_exists_pre[hIndex].func; @@ -35997,7 +35997,7 @@ struct goldpc_mode* HP_goldpc_exists(int id) { retVal___ = HPMHooks.source.goldpc.exists(id); } if (HPMHooks.count.HP_goldpc_exists_post > 0) { - struct goldpc_mode* (*postHookFunc) (struct goldpc_mode* retVal___, int id); + struct goldpc_mode * (*postHookFunc) (struct goldpc_mode * retVal___, int id); for (hIndex = 0; hIndex < HPMHooks.count.HP_goldpc_exists_post; hIndex++) { postHookFunc = HPMHooks.list.HP_goldpc_exists_post[hIndex].func; retVal___ = postHookFunc(retVal___, id); @@ -36485,11 +36485,11 @@ bool HP_grader_announce_behavior_string2enum(const char *str, enum grade_announc } return retVal___; } -const struct s_grade_info* HP_grader_get_grade_info(int grade) { +const struct s_grade_info * HP_grader_get_grade_info(int grade) { int hIndex = 0; - const struct s_grade_info* retVal___ = NULL; + const struct s_grade_info * retVal___ = NULL; if (HPMHooks.count.HP_grader_get_grade_info_pre > 0) { - const struct s_grade_info* (*preHookFunc) (int *grade); + const struct s_grade_info * (*preHookFunc) (int *grade); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_grader_get_grade_info_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_grader_get_grade_info_pre[hIndex].func; @@ -36504,7 +36504,7 @@ const struct s_grade_info* HP_grader_get_grade_info(int grade) { retVal___ = HPMHooks.source.grader.get_grade_info(grade); } if (HPMHooks.count.HP_grader_get_grade_info_post > 0) { - const struct s_grade_info* (*postHookFunc) (const struct s_grade_info* retVal___, int grade); + const struct s_grade_info * (*postHookFunc) (const struct s_grade_info * retVal___, int grade); for (hIndex = 0; hIndex < HPMHooks.count.HP_grader_get_grade_info_post; hIndex++) { postHookFunc = HPMHooks.list.HP_grader_get_grade_info_post[hIndex].func; retVal___ = postHookFunc(retVal___, grade); @@ -36617,11 +36617,11 @@ void HP_grfio_final(void) { } return; } -void* HP_grfio_reads(const char *fname, int *size) { +void * HP_grfio_reads(const char *fname, int *size) { int hIndex = 0; - void* retVal___ = NULL; + void * retVal___ = NULL; if (HPMHooks.count.HP_grfio_reads_pre > 0) { - void* (*preHookFunc) (const char **fname, int **size); + void * (*preHookFunc) (const char **fname, int **size); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_grfio_reads_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_grfio_reads_pre[hIndex].func; @@ -36636,7 +36636,7 @@ void* HP_grfio_reads(const char *fname, int *size) { retVal___ = HPMHooks.source.grfio.reads(fname, size); } if (HPMHooks.count.HP_grfio_reads_post > 0) { - void* (*postHookFunc) (void* retVal___, const char *fname, int *size); + void * (*postHookFunc) (void * retVal___, const char *fname, int *size); for (hIndex = 0; hIndex < HPMHooks.count.HP_grfio_reads_post; hIndex++) { postHookFunc = HPMHooks.list.HP_grfio_reads_post[hIndex].func; retVal___ = postHookFunc(retVal___, fname, size); @@ -36644,11 +36644,11 @@ void* HP_grfio_reads(const char *fname, int *size) { } return retVal___; } -const char* HP_grfio_find_file(const char *fname) { +const char * HP_grfio_find_file(const char *fname) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_grfio_find_file_pre > 0) { - const char* (*preHookFunc) (const char **fname); + const char * (*preHookFunc) (const char **fname); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_grfio_find_file_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_grfio_find_file_pre[hIndex].func; @@ -36663,7 +36663,7 @@ const char* HP_grfio_find_file(const char *fname) { retVal___ = HPMHooks.source.grfio.find_file(fname); } if (HPMHooks.count.HP_grfio_find_file_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *fname); + const char * (*postHookFunc) (const char * retVal___, const char *fname); for (hIndex = 0; hIndex < HPMHooks.count.HP_grfio_find_file_post; hIndex++) { postHookFunc = HPMHooks.list.HP_grfio_find_file_post[hIndex].func; retVal___ = postHookFunc(retVal___, fname); @@ -36778,11 +36778,11 @@ void HP_grfio_report_error(int err) { } return; } -char* HP_grfio_decode_filename(unsigned char *buf, int len) { +char * HP_grfio_decode_filename(unsigned char *buf, int len) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_grfio_decode_filename_pre > 0) { - char* (*preHookFunc) (unsigned char **buf, int *len); + char * (*preHookFunc) (unsigned char **buf, int *len); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_grfio_decode_filename_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_grfio_decode_filename_pre[hIndex].func; @@ -36797,7 +36797,7 @@ char* HP_grfio_decode_filename(unsigned char *buf, int len) { retVal___ = HPMHooks.source.grfio.decode_filename(buf, len); } if (HPMHooks.count.HP_grfio_decode_filename_post > 0) { - char* (*postHookFunc) (char* retVal___, unsigned char *buf, int len); + char * (*postHookFunc) (char * retVal___, unsigned char *buf, int len); for (hIndex = 0; hIndex < HPMHooks.count.HP_grfio_decode_filename_post; hIndex++) { postHookFunc = HPMHooks.list.HP_grfio_decode_filename_post[hIndex].func; retVal___ = postHookFunc(retVal___, buf, len); @@ -36993,11 +36993,11 @@ bool HP_guild_isallied(int guild_id, int guild_id2) { } return retVal___; } -struct guild* HP_guild_search(int guild_id) { +struct guild * HP_guild_search(int guild_id) { int hIndex = 0; - struct guild* retVal___ = NULL; + struct guild * retVal___ = NULL; if (HPMHooks.count.HP_guild_search_pre > 0) { - struct guild* (*preHookFunc) (int *guild_id); + struct guild * (*preHookFunc) (int *guild_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_search_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_guild_search_pre[hIndex].func; @@ -37012,7 +37012,7 @@ struct guild* HP_guild_search(int guild_id) { retVal___ = HPMHooks.source.guild.search(guild_id); } if (HPMHooks.count.HP_guild_search_post > 0) { - struct guild* (*postHookFunc) (struct guild* retVal___, int guild_id); + struct guild * (*postHookFunc) (struct guild * retVal___, int guild_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_search_post; hIndex++) { postHookFunc = HPMHooks.list.HP_guild_search_post[hIndex].func; retVal___ = postHookFunc(retVal___, guild_id); @@ -37020,11 +37020,11 @@ struct guild* HP_guild_search(int guild_id) { } return retVal___; } -struct guild* HP_guild_searchname(const char *str) { +struct guild * HP_guild_searchname(const char *str) { int hIndex = 0; - struct guild* retVal___ = NULL; + struct guild * retVal___ = NULL; if (HPMHooks.count.HP_guild_searchname_pre > 0) { - struct guild* (*preHookFunc) (const char **str); + struct guild * (*preHookFunc) (const char **str); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_searchname_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_guild_searchname_pre[hIndex].func; @@ -37039,7 +37039,7 @@ struct guild* HP_guild_searchname(const char *str) { retVal___ = HPMHooks.source.guild.searchname(str); } if (HPMHooks.count.HP_guild_searchname_post > 0) { - struct guild* (*postHookFunc) (struct guild* retVal___, const char *str); + struct guild * (*postHookFunc) (struct guild * retVal___, const char *str); for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_searchname_post; hIndex++) { postHookFunc = HPMHooks.list.HP_guild_searchname_post[hIndex].func; retVal___ = postHookFunc(retVal___, str); @@ -37047,11 +37047,11 @@ struct guild* HP_guild_searchname(const char *str) { } return retVal___; } -struct guild_castle* HP_guild_castle_search(int gcid) { +struct guild_castle * HP_guild_castle_search(int gcid) { int hIndex = 0; - struct guild_castle* retVal___ = NULL; + struct guild_castle * retVal___ = NULL; if (HPMHooks.count.HP_guild_castle_search_pre > 0) { - struct guild_castle* (*preHookFunc) (int *gcid); + struct guild_castle * (*preHookFunc) (int *gcid); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_castle_search_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_guild_castle_search_pre[hIndex].func; @@ -37066,7 +37066,7 @@ struct guild_castle* HP_guild_castle_search(int gcid) { retVal___ = HPMHooks.source.guild.castle_search(gcid); } if (HPMHooks.count.HP_guild_castle_search_post > 0) { - struct guild_castle* (*postHookFunc) (struct guild_castle* retVal___, int gcid); + struct guild_castle * (*postHookFunc) (struct guild_castle * retVal___, int gcid); for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_castle_search_post; hIndex++) { postHookFunc = HPMHooks.list.HP_guild_castle_search_post[hIndex].func; retVal___ = postHookFunc(retVal___, gcid); @@ -37074,11 +37074,11 @@ struct guild_castle* HP_guild_castle_search(int gcid) { } return retVal___; } -struct guild_castle* HP_guild_mapname2gc(const char *mapname) { +struct guild_castle * HP_guild_mapname2gc(const char *mapname) { int hIndex = 0; - struct guild_castle* retVal___ = NULL; + struct guild_castle * retVal___ = NULL; if (HPMHooks.count.HP_guild_mapname2gc_pre > 0) { - struct guild_castle* (*preHookFunc) (const char **mapname); + struct guild_castle * (*preHookFunc) (const char **mapname); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_mapname2gc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_guild_mapname2gc_pre[hIndex].func; @@ -37093,7 +37093,7 @@ struct guild_castle* HP_guild_mapname2gc(const char *mapname) { retVal___ = HPMHooks.source.guild.mapname2gc(mapname); } if (HPMHooks.count.HP_guild_mapname2gc_post > 0) { - struct guild_castle* (*postHookFunc) (struct guild_castle* retVal___, const char *mapname); + struct guild_castle * (*postHookFunc) (struct guild_castle * retVal___, const char *mapname); for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_mapname2gc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_guild_mapname2gc_post[hIndex].func; retVal___ = postHookFunc(retVal___, mapname); @@ -37101,11 +37101,11 @@ struct guild_castle* HP_guild_mapname2gc(const char *mapname) { } return retVal___; } -struct guild_castle* HP_guild_mapindex2gc(short map_index) { +struct guild_castle * HP_guild_mapindex2gc(short map_index) { int hIndex = 0; - struct guild_castle* retVal___ = NULL; + struct guild_castle * retVal___ = NULL; if (HPMHooks.count.HP_guild_mapindex2gc_pre > 0) { - struct guild_castle* (*preHookFunc) (short *map_index); + struct guild_castle * (*preHookFunc) (short *map_index); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_mapindex2gc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_guild_mapindex2gc_pre[hIndex].func; @@ -37120,7 +37120,7 @@ struct guild_castle* HP_guild_mapindex2gc(short map_index) { retVal___ = HPMHooks.source.guild.mapindex2gc(map_index); } if (HPMHooks.count.HP_guild_mapindex2gc_post > 0) { - struct guild_castle* (*postHookFunc) (struct guild_castle* retVal___, short map_index); + struct guild_castle * (*postHookFunc) (struct guild_castle * retVal___, short map_index); for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_mapindex2gc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_guild_mapindex2gc_post[hIndex].func; retVal___ = postHookFunc(retVal___, map_index); @@ -37128,11 +37128,11 @@ struct guild_castle* HP_guild_mapindex2gc(short map_index) { } return retVal___; } -struct map_session_data* HP_guild_getavailablesd(struct guild *g) { +struct map_session_data * HP_guild_getavailablesd(struct guild *g) { int hIndex = 0; - struct map_session_data* retVal___ = NULL; + struct map_session_data * retVal___ = NULL; if (HPMHooks.count.HP_guild_getavailablesd_pre > 0) { - struct map_session_data* (*preHookFunc) (struct guild **g); + struct map_session_data * (*preHookFunc) (struct guild **g); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_getavailablesd_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_guild_getavailablesd_pre[hIndex].func; @@ -37147,7 +37147,7 @@ struct map_session_data* HP_guild_getavailablesd(struct guild *g) { retVal___ = HPMHooks.source.guild.getavailablesd(g); } if (HPMHooks.count.HP_guild_getavailablesd_post > 0) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, struct guild *g); + struct map_session_data * (*postHookFunc) (struct map_session_data * retVal___, struct guild *g); for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_getavailablesd_post; hIndex++) { postHookFunc = HPMHooks.list.HP_guild_getavailablesd_post[hIndex].func; retVal___ = postHookFunc(retVal___, g); @@ -38654,11 +38654,11 @@ int HP_guild_payexp_timer(int tid, int64 tick, int id, intptr_t data) { } return retVal___; } -struct map_session_data* HP_guild_sd_check(int guild_id, int account_id, int char_id) { +struct map_session_data * HP_guild_sd_check(int guild_id, int account_id, int char_id) { int hIndex = 0; - struct map_session_data* retVal___ = NULL; + struct map_session_data * retVal___ = NULL; if (HPMHooks.count.HP_guild_sd_check_pre > 0) { - struct map_session_data* (*preHookFunc) (int *guild_id, int *account_id, int *char_id); + struct map_session_data * (*preHookFunc) (int *guild_id, int *account_id, int *char_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_sd_check_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_guild_sd_check_pre[hIndex].func; @@ -38673,7 +38673,7 @@ struct map_session_data* HP_guild_sd_check(int guild_id, int account_id, int cha retVal___ = HPMHooks.source.guild.sd_check(guild_id, account_id, char_id); } if (HPMHooks.count.HP_guild_sd_check_post > 0) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, int guild_id, int account_id, int char_id); + struct map_session_data * (*postHookFunc) (struct map_session_data * retVal___, int guild_id, int account_id, int char_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_sd_check_post; hIndex++) { postHookFunc = HPMHooks.list.HP_guild_sd_check_post[hIndex].func; retVal___ = postHookFunc(retVal___, guild_id, account_id, char_id); @@ -39259,11 +39259,11 @@ int HP_guild_castle_owner_change_foreach(struct map_session_data *sd, va_list ap return retVal___; } /* guild_storage_interface */ -struct guild_storage* HP_gstorage_ensure(int guild_id) { +struct guild_storage * HP_gstorage_ensure(int guild_id) { int hIndex = 0; - struct guild_storage* retVal___ = NULL; + struct guild_storage * retVal___ = NULL; if (HPMHooks.count.HP_gstorage_ensure_pre > 0) { - struct guild_storage* (*preHookFunc) (int *guild_id); + struct guild_storage * (*preHookFunc) (int *guild_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_ensure_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_gstorage_ensure_pre[hIndex].func; @@ -39278,7 +39278,7 @@ struct guild_storage* HP_gstorage_ensure(int guild_id) { retVal___ = HPMHooks.source.gstorage.ensure(guild_id); } if (HPMHooks.count.HP_gstorage_ensure_post > 0) { - struct guild_storage* (*postHookFunc) (struct guild_storage* retVal___, int guild_id); + struct guild_storage * (*postHookFunc) (struct guild_storage * retVal___, int guild_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_gstorage_ensure_post; hIndex++) { postHookFunc = HPMHooks.list.HP_gstorage_ensure_post[hIndex].func; retVal___ = postHookFunc(retVal___, guild_id); @@ -39832,11 +39832,11 @@ void HP_homun_reload_skill(void) { } return; } -struct view_data* HP_homun_get_viewdata(int class_) { +struct view_data * HP_homun_get_viewdata(int class_) { int hIndex = 0; - struct view_data* retVal___ = NULL; + struct view_data * retVal___ = NULL; if (HPMHooks.count.HP_homun_get_viewdata_pre > 0) { - struct view_data* (*preHookFunc) (int *class_); + struct view_data * (*preHookFunc) (int *class_); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_homun_get_viewdata_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_homun_get_viewdata_pre[hIndex].func; @@ -39851,7 +39851,7 @@ struct view_data* HP_homun_get_viewdata(int class_) { retVal___ = HPMHooks.source.homun.get_viewdata(class_); } if (HPMHooks.count.HP_homun_get_viewdata_post > 0) { - struct view_data* (*postHookFunc) (struct view_data* retVal___, int class_); + struct view_data * (*postHookFunc) (struct view_data * retVal___, int class_); for (hIndex = 0; hIndex < HPMHooks.count.HP_homun_get_viewdata_post; hIndex++) { postHookFunc = HPMHooks.list.HP_homun_get_viewdata_post[hIndex].func; retVal___ = postHookFunc(retVal___, class_); @@ -41820,14 +41820,14 @@ int HP_intif_request_registry(struct map_session_data *sd, int flag) { } return retVal___; } -void HP_intif_request_account_storage(const struct map_session_data *sd) { +void HP_intif_request_account_storage(const struct map_session_data *sd, int storage_id) { int hIndex = 0; if (HPMHooks.count.HP_intif_request_account_storage_pre > 0) { - void (*preHookFunc) (const struct map_session_data **sd); + void (*preHookFunc) (const struct map_session_data **sd, int *storage_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_request_account_storage_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_intif_request_account_storage_pre[hIndex].func; - preHookFunc(&sd); + preHookFunc(&sd, &storage_id); } if (*HPMforce_return) { *HPMforce_return = false; @@ -41835,25 +41835,25 @@ void HP_intif_request_account_storage(const struct map_session_data *sd) { } } { - HPMHooks.source.intif.request_account_storage(sd); + HPMHooks.source.intif.request_account_storage(sd, storage_id); } if (HPMHooks.count.HP_intif_request_account_storage_post > 0) { - void (*postHookFunc) (const struct map_session_data *sd); + void (*postHookFunc) (const struct map_session_data *sd, int storage_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_request_account_storage_post; hIndex++) { postHookFunc = HPMHooks.list.HP_intif_request_account_storage_post[hIndex].func; - postHookFunc(sd); + postHookFunc(sd, storage_id); } } return; } -void HP_intif_send_account_storage(struct map_session_data *sd) { +void HP_intif_send_account_storage(struct map_session_data *sd, int storage_id) { int hIndex = 0; if (HPMHooks.count.HP_intif_send_account_storage_pre > 0) { - void (*preHookFunc) (struct map_session_data **sd); + void (*preHookFunc) (struct map_session_data **sd, int *storage_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_send_account_storage_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_intif_send_account_storage_pre[hIndex].func; - preHookFunc(&sd); + preHookFunc(&sd, &storage_id); } if (*HPMforce_return) { *HPMforce_return = false; @@ -41861,13 +41861,13 @@ void HP_intif_send_account_storage(struct map_session_data *sd) { } } { - HPMHooks.source.intif.send_account_storage(sd); + HPMHooks.source.intif.send_account_storage(sd, storage_id); } if (HPMHooks.count.HP_intif_send_account_storage_post > 0) { - void (*postHookFunc) (struct map_session_data *sd); + void (*postHookFunc) (struct map_session_data *sd, int storage_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_send_account_storage_post; hIndex++) { postHookFunc = HPMHooks.list.HP_intif_send_account_storage_post[hIndex].func; - postHookFunc(sd); + postHookFunc(sd, storage_id); } } return; @@ -45602,11 +45602,11 @@ void HP_ircbot_parse_source(char *source, char *nick, char *ident, char *host) { } return; } -struct irc_func* HP_ircbot_func_search(char *function_name) { +struct irc_func * HP_ircbot_func_search(char *function_name) { int hIndex = 0; - struct irc_func* retVal___ = NULL; + struct irc_func * retVal___ = NULL; if (HPMHooks.count.HP_ircbot_func_search_pre > 0) { - struct irc_func* (*preHookFunc) (char **function_name); + struct irc_func * (*preHookFunc) (char **function_name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_func_search_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_ircbot_func_search_pre[hIndex].func; @@ -45621,7 +45621,7 @@ struct irc_func* HP_ircbot_func_search(char *function_name) { retVal___ = HPMHooks.source.ircbot.func_search(function_name); } if (HPMHooks.count.HP_ircbot_func_search_post > 0) { - struct irc_func* (*postHookFunc) (struct irc_func* retVal___, char *function_name); + struct irc_func * (*postHookFunc) (struct irc_func * retVal___, char *function_name); for (hIndex = 0; hIndex < HPMHooks.count.HP_ircbot_func_search_post; hIndex++) { postHookFunc = HPMHooks.list.HP_ircbot_func_search_post[hIndex].func; retVal___ = postHookFunc(retVal___, function_name); @@ -46233,11 +46233,11 @@ bool HP_itemdb_read_cached_packages(const char *config_filename) { } return retVal___; } -struct item_data* HP_itemdb_name2id(const char *str) { +struct item_data * HP_itemdb_name2id(const char *str) { int hIndex = 0; - struct item_data* retVal___ = NULL; + struct item_data * retVal___ = NULL; if (HPMHooks.count.HP_itemdb_name2id_pre > 0) { - struct item_data* (*preHookFunc) (const char **str); + struct item_data * (*preHookFunc) (const char **str); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_name2id_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_itemdb_name2id_pre[hIndex].func; @@ -46252,7 +46252,7 @@ struct item_data* HP_itemdb_name2id(const char *str) { retVal___ = HPMHooks.source.itemdb.name2id(str); } if (HPMHooks.count.HP_itemdb_name2id_post > 0) { - struct item_data* (*postHookFunc) (struct item_data* retVal___, const char *str); + struct item_data * (*postHookFunc) (struct item_data * retVal___, const char *str); for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_name2id_post; hIndex++) { postHookFunc = HPMHooks.list.HP_itemdb_name2id_post[hIndex].func; retVal___ = postHookFunc(retVal___, str); @@ -46260,11 +46260,11 @@ struct item_data* HP_itemdb_name2id(const char *str) { } return retVal___; } -struct item_data* HP_itemdb_search_name(const char *name) { +struct item_data * HP_itemdb_search_name(const char *name) { int hIndex = 0; - struct item_data* retVal___ = NULL; + struct item_data * retVal___ = NULL; if (HPMHooks.count.HP_itemdb_search_name_pre > 0) { - struct item_data* (*preHookFunc) (const char **name); + struct item_data * (*preHookFunc) (const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_search_name_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_itemdb_search_name_pre[hIndex].func; @@ -46279,7 +46279,7 @@ struct item_data* HP_itemdb_search_name(const char *name) { retVal___ = HPMHooks.source.itemdb.search_name(name); } if (HPMHooks.count.HP_itemdb_search_name_post > 0) { - struct item_data* (*postHookFunc) (struct item_data* retVal___, const char *name); + struct item_data * (*postHookFunc) (struct item_data * retVal___, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_search_name_post; hIndex++) { postHookFunc = HPMHooks.list.HP_itemdb_search_name_post[hIndex].func; retVal___ = postHookFunc(retVal___, name); @@ -46314,11 +46314,11 @@ int HP_itemdb_search_name_array(struct item_data **data, const int size, const c } return retVal___; } -struct item_data* HP_itemdb_load(int nameid) { +struct item_data * HP_itemdb_load(int nameid) { int hIndex = 0; - struct item_data* retVal___ = NULL; + struct item_data * retVal___ = NULL; if (HPMHooks.count.HP_itemdb_load_pre > 0) { - struct item_data* (*preHookFunc) (int *nameid); + struct item_data * (*preHookFunc) (int *nameid); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_load_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_itemdb_load_pre[hIndex].func; @@ -46333,7 +46333,7 @@ struct item_data* HP_itemdb_load(int nameid) { retVal___ = HPMHooks.source.itemdb.load(nameid); } if (HPMHooks.count.HP_itemdb_load_post > 0) { - struct item_data* (*postHookFunc) (struct item_data* retVal___, int nameid); + struct item_data * (*postHookFunc) (struct item_data * retVal___, int nameid); for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_load_post; hIndex++) { postHookFunc = HPMHooks.list.HP_itemdb_load_post[hIndex].func; retVal___ = postHookFunc(retVal___, nameid); @@ -46341,11 +46341,11 @@ struct item_data* HP_itemdb_load(int nameid) { } return retVal___; } -struct item_data* HP_itemdb_search(int nameid) { +struct item_data * HP_itemdb_search(int nameid) { int hIndex = 0; - struct item_data* retVal___ = NULL; + struct item_data * retVal___ = NULL; if (HPMHooks.count.HP_itemdb_search_pre > 0) { - struct item_data* (*preHookFunc) (int *nameid); + struct item_data * (*preHookFunc) (int *nameid); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_search_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_itemdb_search_pre[hIndex].func; @@ -46360,7 +46360,7 @@ struct item_data* HP_itemdb_search(int nameid) { retVal___ = HPMHooks.source.itemdb.search(nameid); } if (HPMHooks.count.HP_itemdb_search_post > 0) { - struct item_data* (*postHookFunc) (struct item_data* retVal___, int nameid); + struct item_data * (*postHookFunc) (struct item_data * retVal___, int nameid); for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_search_post; hIndex++) { postHookFunc = HPMHooks.list.HP_itemdb_search_post[hIndex].func; retVal___ = postHookFunc(retVal___, nameid); @@ -46368,11 +46368,11 @@ struct item_data* HP_itemdb_search(int nameid) { } return retVal___; } -struct item_data* HP_itemdb_exists(int nameid) { +struct item_data * HP_itemdb_exists(int nameid) { int hIndex = 0; - struct item_data* retVal___ = NULL; + struct item_data * retVal___ = NULL; if (HPMHooks.count.HP_itemdb_exists_pre > 0) { - struct item_data* (*preHookFunc) (int *nameid); + struct item_data * (*preHookFunc) (int *nameid); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_exists_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_itemdb_exists_pre[hIndex].func; @@ -46387,7 +46387,7 @@ struct item_data* HP_itemdb_exists(int nameid) { retVal___ = HPMHooks.source.itemdb.exists(nameid); } if (HPMHooks.count.HP_itemdb_exists_post > 0) { - struct item_data* (*postHookFunc) (struct item_data* retVal___, int nameid); + struct item_data * (*postHookFunc) (struct item_data * retVal___, int nameid); for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_exists_post; hIndex++) { postHookFunc = HPMHooks.list.HP_itemdb_exists_post[hIndex].func; retVal___ = postHookFunc(retVal___, nameid); @@ -46395,11 +46395,11 @@ struct item_data* HP_itemdb_exists(int nameid) { } return retVal___; } -struct itemdb_option* HP_itemdb_option_exists(int idx) { +struct itemdb_option * HP_itemdb_option_exists(int idx) { int hIndex = 0; - struct itemdb_option* retVal___ = NULL; + struct itemdb_option * retVal___ = NULL; if (HPMHooks.count.HP_itemdb_option_exists_pre > 0) { - struct itemdb_option* (*preHookFunc) (int *idx); + struct itemdb_option * (*preHookFunc) (int *idx); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_option_exists_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_itemdb_option_exists_pre[hIndex].func; @@ -46414,7 +46414,7 @@ struct itemdb_option* HP_itemdb_option_exists(int idx) { retVal___ = HPMHooks.source.itemdb.option_exists(idx); } if (HPMHooks.count.HP_itemdb_option_exists_post > 0) { - struct itemdb_option* (*postHookFunc) (struct itemdb_option* retVal___, int idx); + struct itemdb_option * (*postHookFunc) (struct itemdb_option * retVal___, int idx); for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_option_exists_post; hIndex++) { postHookFunc = HPMHooks.list.HP_itemdb_option_exists_post[hIndex].func; retVal___ = postHookFunc(retVal___, idx); @@ -46422,11 +46422,11 @@ struct itemdb_option* HP_itemdb_option_exists(int idx) { } return retVal___; } -struct item_reform* HP_itemdb_reform_exists(int idx) { +struct item_reform * HP_itemdb_reform_exists(int idx) { int hIndex = 0; - struct item_reform* retVal___ = NULL; + struct item_reform * retVal___ = NULL; if (HPMHooks.count.HP_itemdb_reform_exists_pre > 0) { - struct item_reform* (*preHookFunc) (int *idx); + struct item_reform * (*preHookFunc) (int *idx); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_reform_exists_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_itemdb_reform_exists_pre[hIndex].func; @@ -46441,7 +46441,7 @@ struct item_reform* HP_itemdb_reform_exists(int idx) { retVal___ = HPMHooks.source.itemdb.reform_exists(idx); } if (HPMHooks.count.HP_itemdb_reform_exists_post > 0) { - struct item_reform* (*postHookFunc) (struct item_reform* retVal___, int idx); + struct item_reform * (*postHookFunc) (struct item_reform * retVal___, int idx); for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_reform_exists_post; hIndex++) { postHookFunc = HPMHooks.list.HP_itemdb_reform_exists_post[hIndex].func; retVal___ = postHookFunc(retVal___, idx); @@ -46476,11 +46476,11 @@ bool HP_itemdb_in_group(struct item_group *group, int nameid) { } return retVal___; } -const struct item_group* HP_itemdb_search_group(int nameid) { +const struct item_group * HP_itemdb_search_group(int nameid) { int hIndex = 0; - const struct item_group* retVal___ = NULL; + const struct item_group * retVal___ = NULL; if (HPMHooks.count.HP_itemdb_search_group_pre > 0) { - const struct item_group* (*preHookFunc) (int *nameid); + const struct item_group * (*preHookFunc) (int *nameid); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_search_group_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_itemdb_search_group_pre[hIndex].func; @@ -46495,7 +46495,7 @@ const struct item_group* HP_itemdb_search_group(int nameid) { retVal___ = HPMHooks.source.itemdb.search_group(nameid); } if (HPMHooks.count.HP_itemdb_search_group_post > 0) { - const struct item_group* (*postHookFunc) (const struct item_group* retVal___, int nameid); + const struct item_group * (*postHookFunc) (const struct item_group * retVal___, int nameid); for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_search_group_post; hIndex++) { postHookFunc = HPMHooks.list.HP_itemdb_search_group_post[hIndex].func; retVal___ = postHookFunc(retVal___, nameid); @@ -46676,11 +46676,11 @@ int HP_itemdb_searchrandomid(struct item_group *group) { } return retVal___; } -const char* HP_itemdb_typename(enum item_types type) { +const char * HP_itemdb_typename(enum item_types type) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_itemdb_typename_pre > 0) { - const char* (*preHookFunc) (enum item_types *type); + const char * (*preHookFunc) (enum item_types *type); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_typename_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_itemdb_typename_pre[hIndex].func; @@ -46695,7 +46695,7 @@ const char* HP_itemdb_typename(enum item_types type) { retVal___ = HPMHooks.source.itemdb.typename(type); } if (HPMHooks.count.HP_itemdb_typename_post > 0) { - const char* (*postHookFunc) (const char* retVal___, enum item_types type); + const char * (*postHookFunc) (const char * retVal___, enum item_types type); for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_typename_post; hIndex++) { postHookFunc = HPMHooks.list.HP_itemdb_typename_post[hIndex].func; retVal___ = postHookFunc(retVal___, type); @@ -46781,11 +46781,11 @@ void HP_itemdb_create_dummy_data(void) { } return; } -struct item_data* HP_itemdb_create_item_data(int nameid) { +struct item_data * HP_itemdb_create_item_data(int nameid) { int hIndex = 0; - struct item_data* retVal___ = NULL; + struct item_data * retVal___ = NULL; if (HPMHooks.count.HP_itemdb_create_item_data_pre > 0) { - struct item_data* (*preHookFunc) (int *nameid); + struct item_data * (*preHookFunc) (int *nameid); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_create_item_data_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_itemdb_create_item_data_pre[hIndex].func; @@ -46800,7 +46800,7 @@ struct item_data* HP_itemdb_create_item_data(int nameid) { retVal___ = HPMHooks.source.itemdb.create_item_data(nameid); } if (HPMHooks.count.HP_itemdb_create_item_data_post > 0) { - struct item_data* (*postHookFunc) (struct item_data* retVal___, int nameid); + struct item_data * (*postHookFunc) (struct item_data * retVal___, int nameid); for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_create_item_data_post; hIndex++) { postHookFunc = HPMHooks.list.HP_itemdb_create_item_data_post[hIndex].func; retVal___ = postHookFunc(retVal___, nameid); @@ -47684,11 +47684,11 @@ void HP_itemdb_clear(bool total) { } return; } -struct item_combo* HP_itemdb_id2combo(int id) { +struct item_combo * HP_itemdb_id2combo(int id) { int hIndex = 0; - struct item_combo* retVal___ = NULL; + struct item_combo * retVal___ = NULL; if (HPMHooks.count.HP_itemdb_id2combo_pre > 0) { - struct item_combo* (*preHookFunc) (int *id); + struct item_combo * (*preHookFunc) (int *id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_id2combo_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_itemdb_id2combo_pre[hIndex].func; @@ -47703,7 +47703,7 @@ struct item_combo* HP_itemdb_id2combo(int id) { retVal___ = HPMHooks.source.itemdb.id2combo(id); } if (HPMHooks.count.HP_itemdb_id2combo_post > 0) { - struct item_combo* (*postHookFunc) (struct item_combo* retVal___, int id); + struct item_combo * (*postHookFunc) (struct item_combo * retVal___, int id); for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_id2combo_post; hIndex++) { postHookFunc = HPMHooks.list.HP_itemdb_id2combo_post[hIndex].func; retVal___ = postHookFunc(retVal___, id); @@ -48148,11 +48148,11 @@ void HP_itemdb_item_reform(struct map_session_data *sd, const struct item_reform } return; } -const struct item_reform* HP_itemdb_search_reform_baseitem(const struct item_data *itd, int nameid) { +const struct item_reform * HP_itemdb_search_reform_baseitem(const struct item_data *itd, int nameid) { int hIndex = 0; - const struct item_reform* retVal___ = NULL; + const struct item_reform * retVal___ = NULL; if (HPMHooks.count.HP_itemdb_search_reform_baseitem_pre > 0) { - const struct item_reform* (*preHookFunc) (const struct item_data **itd, int *nameid); + const struct item_reform * (*preHookFunc) (const struct item_data **itd, int *nameid); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_search_reform_baseitem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_itemdb_search_reform_baseitem_pre[hIndex].func; @@ -48167,7 +48167,7 @@ const struct item_reform* HP_itemdb_search_reform_baseitem(const struct item_dat retVal___ = HPMHooks.source.itemdb.search_reform_baseitem(itd, nameid); } if (HPMHooks.count.HP_itemdb_search_reform_baseitem_post > 0) { - const struct item_reform* (*postHookFunc) (const struct item_reform* retVal___, const struct item_data *itd, int nameid); + const struct item_reform * (*postHookFunc) (const struct item_reform * retVal___, const struct item_data *itd, int nameid); for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_search_reform_baseitem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_itemdb_search_reform_baseitem_post[hIndex].func; retVal___ = postHookFunc(retVal___, itd, nameid); @@ -48627,11 +48627,11 @@ int HP_libconfig_setting_get_bool(const struct config_setting_t *setting) { } return retVal___; } -const char* HP_libconfig_setting_get_string(const struct config_setting_t *setting) { +const char * HP_libconfig_setting_get_string(const struct config_setting_t *setting) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_get_string_pre > 0) { - const char* (*preHookFunc) (const struct config_setting_t **setting); + const char * (*preHookFunc) (const struct config_setting_t **setting); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_pre[hIndex].func; @@ -48646,7 +48646,7 @@ const char* HP_libconfig_setting_get_string(const struct config_setting_t *setti retVal___ = HPMHooks.source.libconfig.setting_get_string(setting); } if (HPMHooks.count.HP_libconfig_setting_get_string_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting); + const char * (*postHookFunc) (const char * retVal___, const struct config_setting_t *setting); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -48654,11 +48654,11 @@ const char* HP_libconfig_setting_get_string(const struct config_setting_t *setti } return retVal___; } -struct config_setting_t* HP_libconfig_setting_lookup(struct config_setting_t *setting, const char *name) { +struct config_setting_t * HP_libconfig_setting_lookup(struct config_setting_t *setting, const char *name) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_lookup_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, const char **name); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_pre[hIndex].func; @@ -48673,7 +48673,7 @@ struct config_setting_t* HP_libconfig_setting_lookup(struct config_setting_t *se retVal___ = HPMHooks.source.libconfig.setting_lookup(setting, name); } if (HPMHooks.count.HP_libconfig_setting_lookup_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, const char *name); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name); @@ -49113,11 +49113,11 @@ int HP_libconfig_setting_get_bool_elem(const struct config_setting_t *setting, i } return retVal___; } -const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t *setting, int idx) { +const char * HP_libconfig_setting_get_string_elem(const struct config_setting_t *setting, int idx) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_get_string_elem_pre > 0) { - const char* (*preHookFunc) (const struct config_setting_t **setting, int *idx); + const char * (*preHookFunc) (const struct config_setting_t **setting, int *idx); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_pre[hIndex].func; @@ -49132,7 +49132,7 @@ const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t * retVal___ = HPMHooks.source.libconfig.setting_get_string_elem(setting, idx); } if (HPMHooks.count.HP_libconfig_setting_get_string_elem_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting, int idx); + const char * (*postHookFunc) (const char * retVal___, const struct config_setting_t *setting, int idx); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx); @@ -49140,11 +49140,11 @@ const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t * } return retVal___; } -struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting_t *setting, int idx, int value) { +struct config_setting_t * HP_libconfig_setting_set_int_elem(struct config_setting_t *setting, int idx, int value) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_set_int_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_pre[hIndex].func; @@ -49159,7 +49159,7 @@ struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting retVal___ = HPMHooks.source.libconfig.setting_set_int_elem(setting, idx, value); } if (HPMHooks.count.HP_libconfig_setting_set_int_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int value); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, int value); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx, value); @@ -49167,11 +49167,11 @@ struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting } return retVal___; } -struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setting_t *setting, int idx, int64 value) { +struct config_setting_t * HP_libconfig_setting_set_int64_elem(struct config_setting_t *setting, int idx, int64 value) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, int64 *value); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, int *idx, int64 *value); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_pre[hIndex].func; @@ -49186,7 +49186,7 @@ struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setti retVal___ = HPMHooks.source.libconfig.setting_set_int64_elem(setting, idx, value); } if (HPMHooks.count.HP_libconfig_setting_set_int64_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int64 value); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, int64 value); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx, value); @@ -49194,11 +49194,11 @@ struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setti } return retVal___; } -struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setting_t *setting, int idx, double value) { +struct config_setting_t * HP_libconfig_setting_set_float_elem(struct config_setting_t *setting, int idx, double value) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_set_float_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, double *value); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, int *idx, double *value); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_pre[hIndex].func; @@ -49213,7 +49213,7 @@ struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setti retVal___ = HPMHooks.source.libconfig.setting_set_float_elem(setting, idx, value); } if (HPMHooks.count.HP_libconfig_setting_set_float_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, double value); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, double value); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx, value); @@ -49221,11 +49221,11 @@ struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setti } return retVal___; } -struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_setting_t *setting, int idx, int value) { +struct config_setting_t * HP_libconfig_setting_set_bool_elem(struct config_setting_t *setting, int idx, int value) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, int *idx, int *value); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_pre[hIndex].func; @@ -49240,7 +49240,7 @@ struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_settin retVal___ = HPMHooks.source.libconfig.setting_set_bool_elem(setting, idx, value); } if (HPMHooks.count.HP_libconfig_setting_set_bool_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, int value); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, int value); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx, value); @@ -49248,11 +49248,11 @@ struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_settin } return retVal___; } -struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_setting_t *setting, int idx, const char *value) { +struct config_setting_t * HP_libconfig_setting_set_string_elem(struct config_setting_t *setting, int idx, const char *value) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_set_string_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **setting, int *idx, const char **value); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **setting, int *idx, const char **value); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_pre[hIndex].func; @@ -49267,7 +49267,7 @@ struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_sett retVal___ = HPMHooks.source.libconfig.setting_set_string_elem(setting, idx, value); } if (HPMHooks.count.HP_libconfig_setting_set_string_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int idx, const char *value); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *setting, int idx, const char *value); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx, value); @@ -49329,11 +49329,11 @@ int HP_libconfig_setting_length(const struct config_setting_t *setting) { } return retVal___; } -struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setting_t *setting, unsigned int idx) { +struct config_setting_t * HP_libconfig_setting_get_elem(const struct config_setting_t *setting, unsigned int idx) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_get_elem_pre > 0) { - struct config_setting_t* (*preHookFunc) (const struct config_setting_t **setting, unsigned int *idx); + struct config_setting_t * (*preHookFunc) (const struct config_setting_t **setting, unsigned int *idx); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_pre[hIndex].func; @@ -49348,7 +49348,7 @@ struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setti retVal___ = HPMHooks.source.libconfig.setting_get_elem(setting, idx); } if (HPMHooks.count.HP_libconfig_setting_get_elem_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int idx); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, const struct config_setting_t *setting, unsigned int idx); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, idx); @@ -49356,11 +49356,11 @@ struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setti } return retVal___; } -struct config_setting_t* HP_libconfig_setting_get_member(const struct config_setting_t *setting, const char *name) { +struct config_setting_t * HP_libconfig_setting_get_member(const struct config_setting_t *setting, const char *name) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_get_member_pre > 0) { - struct config_setting_t* (*preHookFunc) (const struct config_setting_t **setting, const char **name); + struct config_setting_t * (*preHookFunc) (const struct config_setting_t **setting, const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_pre[hIndex].func; @@ -49375,7 +49375,7 @@ struct config_setting_t* HP_libconfig_setting_get_member(const struct config_set retVal___ = HPMHooks.source.libconfig.setting_get_member(setting, name); } if (HPMHooks.count.HP_libconfig_setting_get_member_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, const char *name); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, const struct config_setting_t *setting, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name); @@ -49383,11 +49383,11 @@ struct config_setting_t* HP_libconfig_setting_get_member(const struct config_set } return retVal___; } -struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *parent, const char *name, int type) { +struct config_setting_t * HP_libconfig_setting_add(struct config_setting_t *parent, const char *name, int type) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_setting_add_pre > 0) { - struct config_setting_t* (*preHookFunc) (struct config_setting_t **parent, const char **name, int *type); + struct config_setting_t * (*preHookFunc) (struct config_setting_t **parent, const char **name, int *type); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_setting_add_pre[hIndex].func; @@ -49402,7 +49402,7 @@ struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *paren retVal___ = HPMHooks.source.libconfig.setting_add(parent, name, type); } if (HPMHooks.count.HP_libconfig_setting_add_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int type); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, struct config_setting_t *parent, const char *name, int type); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_setting_add_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, name, type); @@ -49490,11 +49490,11 @@ void HP_libconfig_setting_set_hook(struct config_setting_t *setting, void *hook) } return; } -struct config_setting_t* HP_libconfig_lookup(const struct config_t *config, const char *filepath) { +struct config_setting_t * HP_libconfig_lookup(const struct config_t *config, const char *filepath) { int hIndex = 0; - struct config_setting_t* retVal___ = NULL; + struct config_setting_t * retVal___ = NULL; if (HPMHooks.count.HP_libconfig_lookup_pre > 0) { - struct config_setting_t* (*preHookFunc) (const struct config_t **config, const char **filepath); + struct config_setting_t * (*preHookFunc) (const struct config_t **config, const char **filepath); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_pre[hIndex].func; @@ -49509,7 +49509,7 @@ struct config_setting_t* HP_libconfig_lookup(const struct config_t *config, cons retVal___ = HPMHooks.source.libconfig.lookup(config, filepath); } if (HPMHooks.count.HP_libconfig_lookup_post > 0) { - struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_t *config, const char *filepath); + struct config_setting_t * (*postHookFunc) (struct config_setting_t * retVal___, const struct config_t *config, const char *filepath); for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath); @@ -51806,11 +51806,11 @@ int HP_map_count_oncell(int16 m, int16 x, int16 y, int type, int flag) { } return retVal___; } -struct skill_unit* HP_map_find_skill_unit_oncell(struct block_list *target, int16 x, int16 y, uint16 skill_id, struct skill_unit *out_unit, int flag) { +struct skill_unit * HP_map_find_skill_unit_oncell(struct block_list *target, int16 x, int16 y, uint16 skill_id, struct skill_unit *out_unit, int flag) { int hIndex = 0; - struct skill_unit* retVal___ = NULL; + struct skill_unit * retVal___ = NULL; if (HPMHooks.count.HP_map_find_skill_unit_oncell_pre > 0) { - struct skill_unit* (*preHookFunc) (struct block_list **target, int16 *x, int16 *y, uint16 *skill_id, struct skill_unit **out_unit, int *flag); + struct skill_unit * (*preHookFunc) (struct block_list **target, int16 *x, int16 *y, uint16 *skill_id, struct skill_unit **out_unit, int *flag); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_map_find_skill_unit_oncell_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_map_find_skill_unit_oncell_pre[hIndex].func; @@ -51825,7 +51825,7 @@ struct skill_unit* HP_map_find_skill_unit_oncell(struct block_list *target, int1 retVal___ = HPMHooks.source.map.find_skill_unit_oncell(target, x, y, skill_id, out_unit, flag); } if (HPMHooks.count.HP_map_find_skill_unit_oncell_post > 0) { - struct skill_unit* (*postHookFunc) (struct skill_unit* retVal___, struct block_list *target, int16 x, int16 y, uint16 skill_id, struct skill_unit *out_unit, int flag); + struct skill_unit * (*postHookFunc) (struct skill_unit * retVal___, struct block_list *target, int16 x, int16 y, uint16 skill_id, struct skill_unit *out_unit, int flag); for (hIndex = 0; hIndex < HPMHooks.count.HP_map_find_skill_unit_oncell_post; hIndex++) { postHookFunc = HPMHooks.list.HP_map_find_skill_unit_oncell_post[hIndex].func; retVal___ = postHookFunc(retVal___, target, x, y, skill_id, out_unit, flag); @@ -52153,11 +52153,11 @@ void HP_map_reqnickdb(struct map_session_data *sd, int charid) { } return; } -const char* HP_map_charid2nick(int charid) { +const char * HP_map_charid2nick(int charid) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_map_charid2nick_pre > 0) { - const char* (*preHookFunc) (int *charid); + const char * (*preHookFunc) (int *charid); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_map_charid2nick_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_map_charid2nick_pre[hIndex].func; @@ -52172,7 +52172,7 @@ const char* HP_map_charid2nick(int charid) { retVal___ = HPMHooks.source.map.charid2nick(charid); } if (HPMHooks.count.HP_map_charid2nick_post > 0) { - const char* (*postHookFunc) (const char* retVal___, int charid); + const char * (*postHookFunc) (const char * retVal___, int charid); for (hIndex = 0; hIndex < HPMHooks.count.HP_map_charid2nick_post; hIndex++) { postHookFunc = HPMHooks.list.HP_map_charid2nick_post[hIndex].func; retVal___ = postHookFunc(retVal___, charid); @@ -52180,11 +52180,11 @@ const char* HP_map_charid2nick(int charid) { } return retVal___; } -struct map_session_data* HP_map_charid2sd(int charid) { +struct map_session_data * HP_map_charid2sd(int charid) { int hIndex = 0; - struct map_session_data* retVal___ = NULL; + struct map_session_data * retVal___ = NULL; if (HPMHooks.count.HP_map_charid2sd_pre > 0) { - struct map_session_data* (*preHookFunc) (int *charid); + struct map_session_data * (*preHookFunc) (int *charid); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_map_charid2sd_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_map_charid2sd_pre[hIndex].func; @@ -52199,7 +52199,7 @@ struct map_session_data* HP_map_charid2sd(int charid) { retVal___ = HPMHooks.source.map.charid2sd(charid); } if (HPMHooks.count.HP_map_charid2sd_post > 0) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, int charid); + struct map_session_data * (*postHookFunc) (struct map_session_data * retVal___, int charid); for (hIndex = 0; hIndex < HPMHooks.count.HP_map_charid2sd_post; hIndex++) { postHookFunc = HPMHooks.list.HP_map_charid2sd_post[hIndex].func; retVal___ = postHookFunc(retVal___, charid); @@ -52697,11 +52697,11 @@ int HP_map_vforeachininstance(int ( *func ) (struct block_list *, va_list), int1 } return retVal___; } -struct map_session_data* HP_map_id2sd(int id) { +struct map_session_data * HP_map_id2sd(int id) { int hIndex = 0; - struct map_session_data* retVal___ = NULL; + struct map_session_data * retVal___ = NULL; if (HPMHooks.count.HP_map_id2sd_pre > 0) { - struct map_session_data* (*preHookFunc) (int *id); + struct map_session_data * (*preHookFunc) (int *id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2sd_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_map_id2sd_pre[hIndex].func; @@ -52716,7 +52716,7 @@ struct map_session_data* HP_map_id2sd(int id) { retVal___ = HPMHooks.source.map.id2sd(id); } if (HPMHooks.count.HP_map_id2sd_post > 0) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, int id); + struct map_session_data * (*postHookFunc) (struct map_session_data * retVal___, int id); for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2sd_post; hIndex++) { postHookFunc = HPMHooks.list.HP_map_id2sd_post[hIndex].func; retVal___ = postHookFunc(retVal___, id); @@ -52724,11 +52724,11 @@ struct map_session_data* HP_map_id2sd(int id) { } return retVal___; } -struct npc_data* HP_map_id2nd(int id) { +struct npc_data * HP_map_id2nd(int id) { int hIndex = 0; - struct npc_data* retVal___ = NULL; + struct npc_data * retVal___ = NULL; if (HPMHooks.count.HP_map_id2nd_pre > 0) { - struct npc_data* (*preHookFunc) (int *id); + struct npc_data * (*preHookFunc) (int *id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2nd_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_map_id2nd_pre[hIndex].func; @@ -52743,7 +52743,7 @@ struct npc_data* HP_map_id2nd(int id) { retVal___ = HPMHooks.source.map.id2nd(id); } if (HPMHooks.count.HP_map_id2nd_post > 0) { - struct npc_data* (*postHookFunc) (struct npc_data* retVal___, int id); + struct npc_data * (*postHookFunc) (struct npc_data * retVal___, int id); for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2nd_post; hIndex++) { postHookFunc = HPMHooks.list.HP_map_id2nd_post[hIndex].func; retVal___ = postHookFunc(retVal___, id); @@ -52751,11 +52751,11 @@ struct npc_data* HP_map_id2nd(int id) { } return retVal___; } -struct mob_data* HP_map_id2md(int id) { +struct mob_data * HP_map_id2md(int id) { int hIndex = 0; - struct mob_data* retVal___ = NULL; + struct mob_data * retVal___ = NULL; if (HPMHooks.count.HP_map_id2md_pre > 0) { - struct mob_data* (*preHookFunc) (int *id); + struct mob_data * (*preHookFunc) (int *id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2md_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_map_id2md_pre[hIndex].func; @@ -52770,7 +52770,7 @@ struct mob_data* HP_map_id2md(int id) { retVal___ = HPMHooks.source.map.id2md(id); } if (HPMHooks.count.HP_map_id2md_post > 0) { - struct mob_data* (*postHookFunc) (struct mob_data* retVal___, int id); + struct mob_data * (*postHookFunc) (struct mob_data * retVal___, int id); for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2md_post; hIndex++) { postHookFunc = HPMHooks.list.HP_map_id2md_post[hIndex].func; retVal___ = postHookFunc(retVal___, id); @@ -52778,11 +52778,11 @@ struct mob_data* HP_map_id2md(int id) { } return retVal___; } -struct flooritem_data* HP_map_id2fi(int id) { +struct flooritem_data * HP_map_id2fi(int id) { int hIndex = 0; - struct flooritem_data* retVal___ = NULL; + struct flooritem_data * retVal___ = NULL; if (HPMHooks.count.HP_map_id2fi_pre > 0) { - struct flooritem_data* (*preHookFunc) (int *id); + struct flooritem_data * (*preHookFunc) (int *id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2fi_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_map_id2fi_pre[hIndex].func; @@ -52797,7 +52797,7 @@ struct flooritem_data* HP_map_id2fi(int id) { retVal___ = HPMHooks.source.map.id2fi(id); } if (HPMHooks.count.HP_map_id2fi_post > 0) { - struct flooritem_data* (*postHookFunc) (struct flooritem_data* retVal___, int id); + struct flooritem_data * (*postHookFunc) (struct flooritem_data * retVal___, int id); for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2fi_post; hIndex++) { postHookFunc = HPMHooks.list.HP_map_id2fi_post[hIndex].func; retVal___ = postHookFunc(retVal___, id); @@ -52805,11 +52805,11 @@ struct flooritem_data* HP_map_id2fi(int id) { } return retVal___; } -struct chat_data* HP_map_id2cd(int id) { +struct chat_data * HP_map_id2cd(int id) { int hIndex = 0; - struct chat_data* retVal___ = NULL; + struct chat_data * retVal___ = NULL; if (HPMHooks.count.HP_map_id2cd_pre > 0) { - struct chat_data* (*preHookFunc) (int *id); + struct chat_data * (*preHookFunc) (int *id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2cd_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_map_id2cd_pre[hIndex].func; @@ -52824,7 +52824,7 @@ struct chat_data* HP_map_id2cd(int id) { retVal___ = HPMHooks.source.map.id2cd(id); } if (HPMHooks.count.HP_map_id2cd_post > 0) { - struct chat_data* (*postHookFunc) (struct chat_data* retVal___, int id); + struct chat_data * (*postHookFunc) (struct chat_data * retVal___, int id); for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2cd_post; hIndex++) { postHookFunc = HPMHooks.list.HP_map_id2cd_post[hIndex].func; retVal___ = postHookFunc(retVal___, id); @@ -52832,11 +52832,11 @@ struct chat_data* HP_map_id2cd(int id) { } return retVal___; } -struct skill_unit* HP_map_id2su(int id) { +struct skill_unit * HP_map_id2su(int id) { int hIndex = 0; - struct skill_unit* retVal___ = NULL; + struct skill_unit * retVal___ = NULL; if (HPMHooks.count.HP_map_id2su_pre > 0) { - struct skill_unit* (*preHookFunc) (int *id); + struct skill_unit * (*preHookFunc) (int *id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2su_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_map_id2su_pre[hIndex].func; @@ -52851,7 +52851,7 @@ struct skill_unit* HP_map_id2su(int id) { retVal___ = HPMHooks.source.map.id2su(id); } if (HPMHooks.count.HP_map_id2su_post > 0) { - struct skill_unit* (*postHookFunc) (struct skill_unit* retVal___, int id); + struct skill_unit * (*postHookFunc) (struct skill_unit * retVal___, int id); for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2su_post; hIndex++) { postHookFunc = HPMHooks.list.HP_map_id2su_post[hIndex].func; retVal___ = postHookFunc(retVal___, id); @@ -52859,11 +52859,11 @@ struct skill_unit* HP_map_id2su(int id) { } return retVal___; } -struct pet_data* HP_map_id2pd(int id) { +struct pet_data * HP_map_id2pd(int id) { int hIndex = 0; - struct pet_data* retVal___ = NULL; + struct pet_data * retVal___ = NULL; if (HPMHooks.count.HP_map_id2pd_pre > 0) { - struct pet_data* (*preHookFunc) (int *id); + struct pet_data * (*preHookFunc) (int *id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2pd_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_map_id2pd_pre[hIndex].func; @@ -52878,7 +52878,7 @@ struct pet_data* HP_map_id2pd(int id) { retVal___ = HPMHooks.source.map.id2pd(id); } if (HPMHooks.count.HP_map_id2pd_post > 0) { - struct pet_data* (*postHookFunc) (struct pet_data* retVal___, int id); + struct pet_data * (*postHookFunc) (struct pet_data * retVal___, int id); for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2pd_post; hIndex++) { postHookFunc = HPMHooks.list.HP_map_id2pd_post[hIndex].func; retVal___ = postHookFunc(retVal___, id); @@ -52886,11 +52886,11 @@ struct pet_data* HP_map_id2pd(int id) { } return retVal___; } -struct homun_data* HP_map_id2hd(int id) { +struct homun_data * HP_map_id2hd(int id) { int hIndex = 0; - struct homun_data* retVal___ = NULL; + struct homun_data * retVal___ = NULL; if (HPMHooks.count.HP_map_id2hd_pre > 0) { - struct homun_data* (*preHookFunc) (int *id); + struct homun_data * (*preHookFunc) (int *id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2hd_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_map_id2hd_pre[hIndex].func; @@ -52905,7 +52905,7 @@ struct homun_data* HP_map_id2hd(int id) { retVal___ = HPMHooks.source.map.id2hd(id); } if (HPMHooks.count.HP_map_id2hd_post > 0) { - struct homun_data* (*postHookFunc) (struct homun_data* retVal___, int id); + struct homun_data * (*postHookFunc) (struct homun_data * retVal___, int id); for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2hd_post; hIndex++) { postHookFunc = HPMHooks.list.HP_map_id2hd_post[hIndex].func; retVal___ = postHookFunc(retVal___, id); @@ -52913,11 +52913,11 @@ struct homun_data* HP_map_id2hd(int id) { } return retVal___; } -struct mercenary_data* HP_map_id2mc(int id) { +struct mercenary_data * HP_map_id2mc(int id) { int hIndex = 0; - struct mercenary_data* retVal___ = NULL; + struct mercenary_data * retVal___ = NULL; if (HPMHooks.count.HP_map_id2mc_pre > 0) { - struct mercenary_data* (*preHookFunc) (int *id); + struct mercenary_data * (*preHookFunc) (int *id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2mc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_map_id2mc_pre[hIndex].func; @@ -52932,7 +52932,7 @@ struct mercenary_data* HP_map_id2mc(int id) { retVal___ = HPMHooks.source.map.id2mc(id); } if (HPMHooks.count.HP_map_id2mc_post > 0) { - struct mercenary_data* (*postHookFunc) (struct mercenary_data* retVal___, int id); + struct mercenary_data * (*postHookFunc) (struct mercenary_data * retVal___, int id); for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2mc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_map_id2mc_post[hIndex].func; retVal___ = postHookFunc(retVal___, id); @@ -52940,11 +52940,11 @@ struct mercenary_data* HP_map_id2mc(int id) { } return retVal___; } -struct elemental_data* HP_map_id2ed(int id) { +struct elemental_data * HP_map_id2ed(int id) { int hIndex = 0; - struct elemental_data* retVal___ = NULL; + struct elemental_data * retVal___ = NULL; if (HPMHooks.count.HP_map_id2ed_pre > 0) { - struct elemental_data* (*preHookFunc) (int *id); + struct elemental_data * (*preHookFunc) (int *id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2ed_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_map_id2ed_pre[hIndex].func; @@ -52959,7 +52959,7 @@ struct elemental_data* HP_map_id2ed(int id) { retVal___ = HPMHooks.source.map.id2ed(id); } if (HPMHooks.count.HP_map_id2ed_post > 0) { - struct elemental_data* (*postHookFunc) (struct elemental_data* retVal___, int id); + struct elemental_data * (*postHookFunc) (struct elemental_data * retVal___, int id); for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2ed_post; hIndex++) { postHookFunc = HPMHooks.list.HP_map_id2ed_post[hIndex].func; retVal___ = postHookFunc(retVal___, id); @@ -52967,11 +52967,11 @@ struct elemental_data* HP_map_id2ed(int id) { } return retVal___; } -struct block_list* HP_map_id2bl(int id) { +struct block_list * HP_map_id2bl(int id) { int hIndex = 0; - struct block_list* retVal___ = NULL; + struct block_list * retVal___ = NULL; if (HPMHooks.count.HP_map_id2bl_pre > 0) { - struct block_list* (*preHookFunc) (int *id); + struct block_list * (*preHookFunc) (int *id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2bl_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_map_id2bl_pre[hIndex].func; @@ -52986,7 +52986,7 @@ struct block_list* HP_map_id2bl(int id) { retVal___ = HPMHooks.source.map.id2bl(id); } if (HPMHooks.count.HP_map_id2bl_post > 0) { - struct block_list* (*postHookFunc) (struct block_list* retVal___, int id); + struct block_list * (*postHookFunc) (struct block_list * retVal___, int id); for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2bl_post; hIndex++) { postHookFunc = HPMHooks.list.HP_map_id2bl_post[hIndex].func; retVal___ = postHookFunc(retVal___, id); @@ -53127,11 +53127,11 @@ void HP_map_deliddb(struct block_list *bl) { } return; } -struct map_session_data* HP_map_nick2sd(const char *nick, bool allow_partial) { +struct map_session_data * HP_map_nick2sd(const char *nick, bool allow_partial) { int hIndex = 0; - struct map_session_data* retVal___ = NULL; + struct map_session_data * retVal___ = NULL; if (HPMHooks.count.HP_map_nick2sd_pre > 0) { - struct map_session_data* (*preHookFunc) (const char **nick, bool *allow_partial); + struct map_session_data * (*preHookFunc) (const char **nick, bool *allow_partial); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_map_nick2sd_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_map_nick2sd_pre[hIndex].func; @@ -53146,7 +53146,7 @@ struct map_session_data* HP_map_nick2sd(const char *nick, bool allow_partial) { retVal___ = HPMHooks.source.map.nick2sd(nick, allow_partial); } if (HPMHooks.count.HP_map_nick2sd_post > 0) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, const char *nick, bool allow_partial); + struct map_session_data * (*postHookFunc) (struct map_session_data * retVal___, const char *nick, bool allow_partial); for (hIndex = 0; hIndex < HPMHooks.count.HP_map_nick2sd_post; hIndex++) { postHookFunc = HPMHooks.list.HP_map_nick2sd_post[hIndex].func; retVal___ = postHookFunc(retVal___, nick, allow_partial); @@ -53154,11 +53154,11 @@ struct map_session_data* HP_map_nick2sd(const char *nick, bool allow_partial) { } return retVal___; } -struct mob_data* HP_map_getmob_boss(int16 m) { +struct mob_data * HP_map_getmob_boss(int16 m) { int hIndex = 0; - struct mob_data* retVal___ = NULL; + struct mob_data * retVal___ = NULL; if (HPMHooks.count.HP_map_getmob_boss_pre > 0) { - struct mob_data* (*preHookFunc) (int16 *m); + struct mob_data * (*preHookFunc) (int16 *m); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_map_getmob_boss_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_map_getmob_boss_pre[hIndex].func; @@ -53173,7 +53173,7 @@ struct mob_data* HP_map_getmob_boss(int16 m) { retVal___ = HPMHooks.source.map.getmob_boss(m); } if (HPMHooks.count.HP_map_getmob_boss_post > 0) { - struct mob_data* (*postHookFunc) (struct mob_data* retVal___, int16 m); + struct mob_data * (*postHookFunc) (struct mob_data * retVal___, int16 m); for (hIndex = 0; hIndex < HPMHooks.count.HP_map_getmob_boss_post; hIndex++) { postHookFunc = HPMHooks.list.HP_map_getmob_boss_post[hIndex].func; retVal___ = postHookFunc(retVal___, m); @@ -53181,11 +53181,11 @@ struct mob_data* HP_map_getmob_boss(int16 m) { } return retVal___; } -struct mob_data* HP_map_id2boss(int id) { +struct mob_data * HP_map_id2boss(int id) { int hIndex = 0; - struct mob_data* retVal___ = NULL; + struct mob_data * retVal___ = NULL; if (HPMHooks.count.HP_map_id2boss_pre > 0) { - struct mob_data* (*preHookFunc) (int *id); + struct mob_data * (*preHookFunc) (int *id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2boss_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_map_id2boss_pre[hIndex].func; @@ -53200,7 +53200,7 @@ struct mob_data* HP_map_id2boss(int id) { retVal___ = HPMHooks.source.map.id2boss(id); } if (HPMHooks.count.HP_map_id2boss_post > 0) { - struct mob_data* (*postHookFunc) (struct mob_data* retVal___, int id); + struct mob_data * (*postHookFunc) (struct mob_data * retVal___, int id); for (hIndex = 0; hIndex < HPMHooks.count.HP_map_id2boss_post; hIndex++) { postHookFunc = HPMHooks.list.HP_map_id2boss_post[hIndex].func; retVal___ = postHookFunc(retVal___, id); @@ -55042,11 +55042,11 @@ bool HP_map_remove_questinfo(int m, struct npc_data *nd) { } return retVal___; } -struct map_zone_data* HP_map_merge_zone(struct map_zone_data *main, struct map_zone_data *other) { +struct map_zone_data * HP_map_merge_zone(struct map_zone_data *main, struct map_zone_data *other) { int hIndex = 0; - struct map_zone_data* retVal___ = NULL; + struct map_zone_data * retVal___ = NULL; if (HPMHooks.count.HP_map_merge_zone_pre > 0) { - struct map_zone_data* (*preHookFunc) (struct map_zone_data **main, struct map_zone_data **other); + struct map_zone_data * (*preHookFunc) (struct map_zone_data **main, struct map_zone_data **other); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_map_merge_zone_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_map_merge_zone_pre[hIndex].func; @@ -55061,7 +55061,7 @@ struct map_zone_data* HP_map_merge_zone(struct map_zone_data *main, struct map_z retVal___ = HPMHooks.source.map.merge_zone(main, other); } if (HPMHooks.count.HP_map_merge_zone_post > 0) { - struct map_zone_data* (*postHookFunc) (struct map_zone_data* retVal___, struct map_zone_data *main, struct map_zone_data *other); + struct map_zone_data * (*postHookFunc) (struct map_zone_data * retVal___, struct map_zone_data *main, struct map_zone_data *other); for (hIndex = 0; hIndex < HPMHooks.count.HP_map_merge_zone_post; hIndex++) { postHookFunc = HPMHooks.list.HP_map_merge_zone_post[hIndex].func; retVal___ = postHookFunc(retVal___, main, other); @@ -55388,11 +55388,11 @@ void HP_mapindex_removemap(int index) { } return; } -const char* HP_mapindex_getmapname(const char *string, char *output) { +const char * HP_mapindex_getmapname(const char *string, char *output) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_mapindex_getmapname_pre > 0) { - const char* (*preHookFunc) (const char **string, char **output); + const char * (*preHookFunc) (const char **string, char **output); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_getmapname_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mapindex_getmapname_pre[hIndex].func; @@ -55407,7 +55407,7 @@ const char* HP_mapindex_getmapname(const char *string, char *output) { retVal___ = HPMHooks.source.mapindex.getmapname(string, output); } if (HPMHooks.count.HP_mapindex_getmapname_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *string, char *output); + const char * (*postHookFunc) (const char * retVal___, const char *string, char *output); for (hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_getmapname_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mapindex_getmapname_post[hIndex].func; retVal___ = postHookFunc(retVal___, string, output); @@ -55415,11 +55415,11 @@ const char* HP_mapindex_getmapname(const char *string, char *output) { } return retVal___; } -const char* HP_mapindex_getmapname_ext(const char *string, char *output) { +const char * HP_mapindex_getmapname_ext(const char *string, char *output) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_mapindex_getmapname_ext_pre > 0) { - const char* (*preHookFunc) (const char **string, char **output); + const char * (*preHookFunc) (const char **string, char **output); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_getmapname_ext_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mapindex_getmapname_ext_pre[hIndex].func; @@ -55434,7 +55434,7 @@ const char* HP_mapindex_getmapname_ext(const char *string, char *output) { retVal___ = HPMHooks.source.mapindex.getmapname_ext(string, output); } if (HPMHooks.count.HP_mapindex_getmapname_ext_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *string, char *output); + const char * (*postHookFunc) (const char * retVal___, const char *string, char *output); for (hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_getmapname_ext_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mapindex_getmapname_ext_post[hIndex].func; retVal___ = postHookFunc(retVal___, string, output); @@ -55469,11 +55469,11 @@ unsigned short HP_mapindex_name2id(const char *p1) { } return retVal___; } -const char* HP_mapindex_id2name(uint16 id, const char *file, int line, const char *func) { +const char * HP_mapindex_id2name(uint16 id, const char *file, int line, const char *func) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_mapindex_id2name_pre > 0) { - const char* (*preHookFunc) (uint16 *id, const char **file, int *line, const char **func); + const char * (*preHookFunc) (uint16 *id, const char **file, int *line, const char **func); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_id2name_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mapindex_id2name_pre[hIndex].func; @@ -55488,7 +55488,7 @@ const char* HP_mapindex_id2name(uint16 id, const char *file, int line, const cha retVal___ = HPMHooks.source.mapindex.id2name(id, file, line, func); } if (HPMHooks.count.HP_mapindex_id2name_post > 0) { - const char* (*postHookFunc) (const char* retVal___, uint16 id, const char *file, int line, const char *func); + const char * (*postHookFunc) (const char * retVal___, uint16 id, const char *file, int line, const char *func); for (hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_id2name_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mapindex_id2name_post[hIndex].func; retVal___ = postHookFunc(retVal___, id, file, line, func); @@ -55524,11 +55524,11 @@ bool HP_mapindex_check_default(void) { return retVal___; } /* mapit_interface */ -struct s_mapiterator* HP_mapit_alloc(enum e_mapitflags flags, enum bl_type types) { +struct s_mapiterator * HP_mapit_alloc(enum e_mapitflags flags, enum bl_type types) { int hIndex = 0; - struct s_mapiterator* retVal___ = NULL; + struct s_mapiterator * retVal___ = NULL; if (HPMHooks.count.HP_mapit_alloc_pre > 0) { - struct s_mapiterator* (*preHookFunc) (enum e_mapitflags *flags, enum bl_type *types); + struct s_mapiterator * (*preHookFunc) (enum e_mapitflags *flags, enum bl_type *types); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mapit_alloc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mapit_alloc_pre[hIndex].func; @@ -55543,7 +55543,7 @@ struct s_mapiterator* HP_mapit_alloc(enum e_mapitflags flags, enum bl_type types retVal___ = HPMHooks.source.mapit.alloc(flags, types); } if (HPMHooks.count.HP_mapit_alloc_post > 0) { - struct s_mapiterator* (*postHookFunc) (struct s_mapiterator* retVal___, enum e_mapitflags flags, enum bl_type types); + struct s_mapiterator * (*postHookFunc) (struct s_mapiterator * retVal___, enum e_mapitflags flags, enum bl_type types); for (hIndex = 0; hIndex < HPMHooks.count.HP_mapit_alloc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mapit_alloc_post[hIndex].func; retVal___ = postHookFunc(retVal___, flags, types); @@ -55577,11 +55577,11 @@ void HP_mapit_free(struct s_mapiterator *iter) { } return; } -struct block_list* HP_mapit_first(struct s_mapiterator *iter) { +struct block_list * HP_mapit_first(struct s_mapiterator *iter) { int hIndex = 0; - struct block_list* retVal___ = NULL; + struct block_list * retVal___ = NULL; if (HPMHooks.count.HP_mapit_first_pre > 0) { - struct block_list* (*preHookFunc) (struct s_mapiterator **iter); + struct block_list * (*preHookFunc) (struct s_mapiterator **iter); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mapit_first_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mapit_first_pre[hIndex].func; @@ -55596,7 +55596,7 @@ struct block_list* HP_mapit_first(struct s_mapiterator *iter) { retVal___ = HPMHooks.source.mapit.first(iter); } if (HPMHooks.count.HP_mapit_first_post > 0) { - struct block_list* (*postHookFunc) (struct block_list* retVal___, struct s_mapiterator *iter); + struct block_list * (*postHookFunc) (struct block_list * retVal___, struct s_mapiterator *iter); for (hIndex = 0; hIndex < HPMHooks.count.HP_mapit_first_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mapit_first_post[hIndex].func; retVal___ = postHookFunc(retVal___, iter); @@ -55604,11 +55604,11 @@ struct block_list* HP_mapit_first(struct s_mapiterator *iter) { } return retVal___; } -struct block_list* HP_mapit_last(struct s_mapiterator *iter) { +struct block_list * HP_mapit_last(struct s_mapiterator *iter) { int hIndex = 0; - struct block_list* retVal___ = NULL; + struct block_list * retVal___ = NULL; if (HPMHooks.count.HP_mapit_last_pre > 0) { - struct block_list* (*preHookFunc) (struct s_mapiterator **iter); + struct block_list * (*preHookFunc) (struct s_mapiterator **iter); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mapit_last_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mapit_last_pre[hIndex].func; @@ -55623,7 +55623,7 @@ struct block_list* HP_mapit_last(struct s_mapiterator *iter) { retVal___ = HPMHooks.source.mapit.last(iter); } if (HPMHooks.count.HP_mapit_last_post > 0) { - struct block_list* (*postHookFunc) (struct block_list* retVal___, struct s_mapiterator *iter); + struct block_list * (*postHookFunc) (struct block_list * retVal___, struct s_mapiterator *iter); for (hIndex = 0; hIndex < HPMHooks.count.HP_mapit_last_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mapit_last_post[hIndex].func; retVal___ = postHookFunc(retVal___, iter); @@ -55631,11 +55631,11 @@ struct block_list* HP_mapit_last(struct s_mapiterator *iter) { } return retVal___; } -struct block_list* HP_mapit_next(struct s_mapiterator *iter) { +struct block_list * HP_mapit_next(struct s_mapiterator *iter) { int hIndex = 0; - struct block_list* retVal___ = NULL; + struct block_list * retVal___ = NULL; if (HPMHooks.count.HP_mapit_next_pre > 0) { - struct block_list* (*preHookFunc) (struct s_mapiterator **iter); + struct block_list * (*preHookFunc) (struct s_mapiterator **iter); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mapit_next_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mapit_next_pre[hIndex].func; @@ -55650,7 +55650,7 @@ struct block_list* HP_mapit_next(struct s_mapiterator *iter) { retVal___ = HPMHooks.source.mapit.next(iter); } if (HPMHooks.count.HP_mapit_next_post > 0) { - struct block_list* (*postHookFunc) (struct block_list* retVal___, struct s_mapiterator *iter); + struct block_list * (*postHookFunc) (struct block_list * retVal___, struct s_mapiterator *iter); for (hIndex = 0; hIndex < HPMHooks.count.HP_mapit_next_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mapit_next_post[hIndex].func; retVal___ = postHookFunc(retVal___, iter); @@ -55658,11 +55658,11 @@ struct block_list* HP_mapit_next(struct s_mapiterator *iter) { } return retVal___; } -struct block_list* HP_mapit_prev(struct s_mapiterator *iter) { +struct block_list * HP_mapit_prev(struct s_mapiterator *iter) { int hIndex = 0; - struct block_list* retVal___ = NULL; + struct block_list * retVal___ = NULL; if (HPMHooks.count.HP_mapit_prev_pre > 0) { - struct block_list* (*preHookFunc) (struct s_mapiterator **iter); + struct block_list * (*preHookFunc) (struct s_mapiterator **iter); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mapit_prev_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mapit_prev_pre[hIndex].func; @@ -55677,7 +55677,7 @@ struct block_list* HP_mapit_prev(struct s_mapiterator *iter) { retVal___ = HPMHooks.source.mapit.prev(iter); } if (HPMHooks.count.HP_mapit_prev_post > 0) { - struct block_list* (*postHookFunc) (struct block_list* retVal___, struct s_mapiterator *iter); + struct block_list * (*postHookFunc) (struct block_list * retVal___, struct s_mapiterator *iter); for (hIndex = 0; hIndex < HPMHooks.count.HP_mapit_prev_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mapit_prev_post[hIndex].func; retVal___ = postHookFunc(retVal___, iter); @@ -55740,11 +55740,11 @@ int HP_mapreg_readreg(int64 uid) { } return retVal___; } -char* HP_mapreg_readregstr(int64 uid) { +char * HP_mapreg_readregstr(int64 uid) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_mapreg_readregstr_pre > 0) { - char* (*preHookFunc) (int64 *uid); + char * (*preHookFunc) (int64 *uid); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mapreg_readregstr_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mapreg_readregstr_pre[hIndex].func; @@ -55759,7 +55759,7 @@ char* HP_mapreg_readregstr(int64 uid) { retVal___ = HPMHooks.source.mapreg.readregstr(uid); } if (HPMHooks.count.HP_mapreg_readregstr_post > 0) { - char* (*postHookFunc) (char* retVal___, int64 uid); + char * (*postHookFunc) (char * retVal___, int64 uid); for (hIndex = 0; hIndex < HPMHooks.count.HP_mapreg_readregstr_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mapreg_readregstr_post[hIndex].func; retVal___ = postHookFunc(retVal___, uid); @@ -56383,11 +56383,11 @@ bool HP_mercenary_class(int class_) { } return retVal___; } -struct view_data* HP_mercenary_get_viewdata(int class_) { +struct view_data * HP_mercenary_get_viewdata(int class_) { int hIndex = 0; - struct view_data* retVal___ = NULL; + struct view_data * retVal___ = NULL; if (HPMHooks.count.HP_mercenary_get_viewdata_pre > 0) { - struct view_data* (*preHookFunc) (int *class_); + struct view_data * (*preHookFunc) (int *class_); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_get_viewdata_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mercenary_get_viewdata_pre[hIndex].func; @@ -56402,7 +56402,7 @@ struct view_data* HP_mercenary_get_viewdata(int class_) { retVal___ = HPMHooks.source.mercenary.get_viewdata(class_); } if (HPMHooks.count.HP_mercenary_get_viewdata_post > 0) { - struct view_data* (*postHookFunc) (struct view_data* retVal___, int class_); + struct view_data * (*postHookFunc) (struct view_data * retVal___, int class_); for (hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_get_viewdata_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mercenary_get_viewdata_post[hIndex].func; retVal___ = postHookFunc(retVal___, class_); @@ -57115,11 +57115,11 @@ int HP_mob_reload_sub_mob(struct mob_data *md, va_list args) { } return retVal___; } -struct mob_db* HP_mob_db(int index) { +struct mob_db * HP_mob_db(int index) { int hIndex = 0; - struct mob_db* retVal___ = NULL; + struct mob_db * retVal___ = NULL; if (HPMHooks.count.HP_mob_db_pre > 0) { - struct mob_db* (*preHookFunc) (int *index); + struct mob_db * (*preHookFunc) (int *index); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_db_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mob_db_pre[hIndex].func; @@ -57134,7 +57134,7 @@ struct mob_db* HP_mob_db(int index) { retVal___ = HPMHooks.source.mob.db(index); } if (HPMHooks.count.HP_mob_db_post > 0) { - struct mob_db* (*postHookFunc) (struct mob_db* retVal___, int index); + struct mob_db * (*postHookFunc) (struct mob_db * retVal___, int index); for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_db_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mob_db_post[hIndex].func; retVal___ = postHookFunc(retVal___, index); @@ -57142,11 +57142,11 @@ struct mob_db* HP_mob_db(int index) { } return retVal___; } -struct mob_chat* HP_mob_chat(short id) { +struct mob_chat * HP_mob_chat(short id) { int hIndex = 0; - struct mob_chat* retVal___ = NULL; + struct mob_chat * retVal___ = NULL; if (HPMHooks.count.HP_mob_chat_pre > 0) { - struct mob_chat* (*preHookFunc) (short *id); + struct mob_chat * (*preHookFunc) (short *id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_chat_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mob_chat_pre[hIndex].func; @@ -57161,7 +57161,7 @@ struct mob_chat* HP_mob_chat(short id) { retVal___ = HPMHooks.source.mob.chat(id); } if (HPMHooks.count.HP_mob_chat_post > 0) { - struct mob_chat* (*postHookFunc) (struct mob_chat* retVal___, short id); + struct mob_chat * (*postHookFunc) (struct mob_chat * retVal___, short id); for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_chat_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mob_chat_post[hIndex].func; retVal___ = postHookFunc(retVal___, id); @@ -57463,11 +57463,11 @@ int HP_mob_db_checkid(const int id) { } return retVal___; } -struct view_data* HP_mob_get_viewdata(int class_) { +struct view_data * HP_mob_get_viewdata(int class_) { int hIndex = 0; - struct view_data* retVal___ = NULL; + struct view_data * retVal___ = NULL; if (HPMHooks.count.HP_mob_get_viewdata_pre > 0) { - struct view_data* (*preHookFunc) (int *class_); + struct view_data * (*preHookFunc) (int *class_); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_get_viewdata_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mob_get_viewdata_pre[hIndex].func; @@ -57482,7 +57482,7 @@ struct view_data* HP_mob_get_viewdata(int class_) { retVal___ = HPMHooks.source.mob.get_viewdata(class_); } if (HPMHooks.count.HP_mob_get_viewdata_post > 0) { - struct view_data* (*postHookFunc) (struct view_data* retVal___, int class_); + struct view_data * (*postHookFunc) (struct view_data * retVal___, int class_); for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_get_viewdata_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mob_get_viewdata_post[hIndex].func; retVal___ = postHookFunc(retVal___, class_); @@ -57569,11 +57569,11 @@ int HP_mob_parse_dataset(struct spawn_data *data) { } return retVal___; } -struct mob_data* HP_mob_spawn_dataset(struct spawn_data *data, int npc_id) { +struct mob_data * HP_mob_spawn_dataset(struct spawn_data *data, int npc_id) { int hIndex = 0; - struct mob_data* retVal___ = NULL; + struct mob_data * retVal___ = NULL; if (HPMHooks.count.HP_mob_spawn_dataset_pre > 0) { - struct mob_data* (*preHookFunc) (struct spawn_data **data, int *npc_id); + struct mob_data * (*preHookFunc) (struct spawn_data **data, int *npc_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_spawn_dataset_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mob_spawn_dataset_pre[hIndex].func; @@ -57588,7 +57588,7 @@ struct mob_data* HP_mob_spawn_dataset(struct spawn_data *data, int npc_id) { retVal___ = HPMHooks.source.mob.spawn_dataset(data, npc_id); } if (HPMHooks.count.HP_mob_spawn_dataset_post > 0) { - struct mob_data* (*postHookFunc) (struct mob_data* retVal___, struct spawn_data *data, int npc_id); + struct mob_data * (*postHookFunc) (struct mob_data * retVal___, struct spawn_data *data, int npc_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_spawn_dataset_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mob_spawn_dataset_post[hIndex].func; retVal___ = postHookFunc(retVal___, data, npc_id); @@ -57650,11 +57650,11 @@ bool HP_mob_ksprotected(struct block_list *src, struct block_list *target) { } return retVal___; } -struct mob_data* HP_mob_once_spawn_sub(struct block_list *bl, int16 m, int16 x, int16 y, const char *mobname, int class_, const char *event, unsigned int size, unsigned int ai, int npc_id) { +struct mob_data * HP_mob_once_spawn_sub(struct block_list *bl, int16 m, int16 x, int16 y, const char *mobname, int class_, const char *event, unsigned int size, unsigned int ai, int npc_id) { int hIndex = 0; - struct mob_data* retVal___ = NULL; + struct mob_data * retVal___ = NULL; if (HPMHooks.count.HP_mob_once_spawn_sub_pre > 0) { - struct mob_data* (*preHookFunc) (struct block_list **bl, int16 *m, int16 *x, int16 *y, const char **mobname, int *class_, const char **event, unsigned int *size, unsigned int *ai, int *npc_id); + struct mob_data * (*preHookFunc) (struct block_list **bl, int16 *m, int16 *x, int16 *y, const char **mobname, int *class_, const char **event, unsigned int *size, unsigned int *ai, int *npc_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_once_spawn_sub_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mob_once_spawn_sub_pre[hIndex].func; @@ -57669,7 +57669,7 @@ struct mob_data* HP_mob_once_spawn_sub(struct block_list *bl, int16 m, int16 x, retVal___ = HPMHooks.source.mob.once_spawn_sub(bl, m, x, y, mobname, class_, event, size, ai, npc_id); } if (HPMHooks.count.HP_mob_once_spawn_sub_post > 0) { - struct mob_data* (*postHookFunc) (struct mob_data* retVal___, struct block_list *bl, int16 m, int16 x, int16 y, const char *mobname, int class_, const char *event, unsigned int size, unsigned int ai, int npc_id); + struct mob_data * (*postHookFunc) (struct mob_data * retVal___, struct block_list *bl, int16 m, int16 x, int16 y, const char *mobname, int class_, const char *event, unsigned int size, unsigned int ai, int npc_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_once_spawn_sub_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mob_once_spawn_sub_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl, m, x, y, mobname, class_, event, size, ai, npc_id); @@ -58519,11 +58519,11 @@ void HP_mob_setdropitem_options(struct item *item, struct optdrop_group *options } return; } -struct item_drop* HP_mob_setdropitem(int nameid, struct optdrop_group *options, int qty, struct item_data *data) { +struct item_drop * HP_mob_setdropitem(int nameid, struct optdrop_group *options, int qty, struct item_data *data) { int hIndex = 0; - struct item_drop* retVal___ = NULL; + struct item_drop * retVal___ = NULL; if (HPMHooks.count.HP_mob_setdropitem_pre > 0) { - struct item_drop* (*preHookFunc) (int *nameid, struct optdrop_group **options, int *qty, struct item_data **data); + struct item_drop * (*preHookFunc) (int *nameid, struct optdrop_group **options, int *qty, struct item_data **data); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_setdropitem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mob_setdropitem_pre[hIndex].func; @@ -58538,7 +58538,7 @@ struct item_drop* HP_mob_setdropitem(int nameid, struct optdrop_group *options, retVal___ = HPMHooks.source.mob.setdropitem(nameid, options, qty, data); } if (HPMHooks.count.HP_mob_setdropitem_post > 0) { - struct item_drop* (*postHookFunc) (struct item_drop* retVal___, int nameid, struct optdrop_group *options, int qty, struct item_data *data); + struct item_drop * (*postHookFunc) (struct item_drop * retVal___, int nameid, struct optdrop_group *options, int qty, struct item_data *data); for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_setdropitem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mob_setdropitem_post[hIndex].func; retVal___ = postHookFunc(retVal___, nameid, options, qty, data); @@ -58546,11 +58546,11 @@ struct item_drop* HP_mob_setdropitem(int nameid, struct optdrop_group *options, } return retVal___; } -struct item_drop* HP_mob_setlootitem(struct item *item) { +struct item_drop * HP_mob_setlootitem(struct item *item) { int hIndex = 0; - struct item_drop* retVal___ = NULL; + struct item_drop * retVal___ = NULL; if (HPMHooks.count.HP_mob_setlootitem_pre > 0) { - struct item_drop* (*preHookFunc) (struct item **item); + struct item_drop * (*preHookFunc) (struct item **item); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_setlootitem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mob_setlootitem_pre[hIndex].func; @@ -58565,7 +58565,7 @@ struct item_drop* HP_mob_setlootitem(struct item *item) { retVal___ = HPMHooks.source.mob.setlootitem(item); } if (HPMHooks.count.HP_mob_setlootitem_post > 0) { - struct item_drop* (*postHookFunc) (struct item_drop* retVal___, struct item *item); + struct item_drop * (*postHookFunc) (struct item_drop * retVal___, struct item *item); for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_setlootitem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mob_setlootitem_post[hIndex].func; retVal___ = postHookFunc(retVal___, item); @@ -59132,11 +59132,11 @@ int HP_mob_getfriendhprate_sub(struct block_list *bl, va_list ap) { } return retVal___; } -struct block_list* HP_mob_getfriendhprate(struct mob_data *md, int min_rate, int max_rate) { +struct block_list * HP_mob_getfriendhprate(struct mob_data *md, int min_rate, int max_rate) { int hIndex = 0; - struct block_list* retVal___ = NULL; + struct block_list * retVal___ = NULL; if (HPMHooks.count.HP_mob_getfriendhprate_pre > 0) { - struct block_list* (*preHookFunc) (struct mob_data **md, int *min_rate, int *max_rate); + struct block_list * (*preHookFunc) (struct mob_data **md, int *min_rate, int *max_rate); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_getfriendhprate_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mob_getfriendhprate_pre[hIndex].func; @@ -59151,7 +59151,7 @@ struct block_list* HP_mob_getfriendhprate(struct mob_data *md, int min_rate, int retVal___ = HPMHooks.source.mob.getfriendhprate(md, min_rate, max_rate); } if (HPMHooks.count.HP_mob_getfriendhprate_post > 0) { - struct block_list* (*postHookFunc) (struct block_list* retVal___, struct mob_data *md, int min_rate, int max_rate); + struct block_list * (*postHookFunc) (struct block_list * retVal___, struct mob_data *md, int min_rate, int max_rate); for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_getfriendhprate_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mob_getfriendhprate_post[hIndex].func; retVal___ = postHookFunc(retVal___, md, min_rate, max_rate); @@ -59159,11 +59159,11 @@ struct block_list* HP_mob_getfriendhprate(struct mob_data *md, int min_rate, int } return retVal___; } -struct block_list* HP_mob_getmasterhpltmaxrate(struct mob_data *md, int rate) { +struct block_list * HP_mob_getmasterhpltmaxrate(struct mob_data *md, int rate) { int hIndex = 0; - struct block_list* retVal___ = NULL; + struct block_list * retVal___ = NULL; if (HPMHooks.count.HP_mob_getmasterhpltmaxrate_pre > 0) { - struct block_list* (*preHookFunc) (struct mob_data **md, int *rate); + struct block_list * (*preHookFunc) (struct mob_data **md, int *rate); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_getmasterhpltmaxrate_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mob_getmasterhpltmaxrate_pre[hIndex].func; @@ -59178,7 +59178,7 @@ struct block_list* HP_mob_getmasterhpltmaxrate(struct mob_data *md, int rate) { retVal___ = HPMHooks.source.mob.getmasterhpltmaxrate(md, rate); } if (HPMHooks.count.HP_mob_getmasterhpltmaxrate_post > 0) { - struct block_list* (*postHookFunc) (struct block_list* retVal___, struct mob_data *md, int rate); + struct block_list * (*postHookFunc) (struct block_list * retVal___, struct mob_data *md, int rate); for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_getmasterhpltmaxrate_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mob_getmasterhpltmaxrate_post[hIndex].func; retVal___ = postHookFunc(retVal___, md, rate); @@ -59219,11 +59219,11 @@ int HP_mob_getfriendstatus_sub(struct block_list *bl, va_list ap) { } return retVal___; } -struct block_list* HP_mob_getfriendstatus(struct mob_data *md, int cond1, int cond2) { +struct block_list * HP_mob_getfriendstatus(struct mob_data *md, int cond1, int cond2) { int hIndex = 0; - struct block_list* retVal___ = NULL; + struct block_list * retVal___ = NULL; if (HPMHooks.count.HP_mob_getfriendstatus_pre > 0) { - struct block_list* (*preHookFunc) (struct mob_data **md, int *cond1, int *cond2); + struct block_list * (*preHookFunc) (struct mob_data **md, int *cond1, int *cond2); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_getfriendstatus_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mob_getfriendstatus_pre[hIndex].func; @@ -59238,7 +59238,7 @@ struct block_list* HP_mob_getfriendstatus(struct mob_data *md, int cond1, int co retVal___ = HPMHooks.source.mob.getfriendstatus(md, cond1, cond2); } if (HPMHooks.count.HP_mob_getfriendstatus_post > 0) { - struct block_list* (*postHookFunc) (struct block_list* retVal___, struct mob_data *md, int cond1, int cond2); + struct block_list * (*postHookFunc) (struct block_list * retVal___, struct mob_data *md, int cond1, int cond2); for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_getfriendstatus_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mob_getfriendstatus_post[hIndex].func; retVal___ = postHookFunc(retVal___, md, cond1, cond2); @@ -59781,11 +59781,11 @@ uint32 HP_mob_read_db_mode_sub(struct mob_db *entry, struct config_setting_t *t) } return retVal___; } -struct optdrop_group* HP_mob_read_db_drops_option(struct mob_db *entry, const char *item_name, struct config_setting_t *drop, int *drop_rate) { +struct optdrop_group * HP_mob_read_db_drops_option(struct mob_db *entry, const char *item_name, struct config_setting_t *drop, int *drop_rate) { int hIndex = 0; - struct optdrop_group* retVal___ = NULL; + struct optdrop_group * retVal___ = NULL; if (HPMHooks.count.HP_mob_read_db_drops_option_pre > 0) { - struct optdrop_group* (*preHookFunc) (struct mob_db **entry, const char **item_name, struct config_setting_t **drop, int **drop_rate); + struct optdrop_group * (*preHookFunc) (struct mob_db **entry, const char **item_name, struct config_setting_t **drop, int **drop_rate); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_drops_option_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mob_read_db_drops_option_pre[hIndex].func; @@ -59800,7 +59800,7 @@ struct optdrop_group* HP_mob_read_db_drops_option(struct mob_db *entry, const ch retVal___ = HPMHooks.source.mob.read_db_drops_option(entry, item_name, drop, drop_rate); } if (HPMHooks.count.HP_mob_read_db_drops_option_post > 0) { - struct optdrop_group* (*postHookFunc) (struct optdrop_group* retVal___, struct mob_db *entry, const char *item_name, struct config_setting_t *drop, int *drop_rate); + struct optdrop_group * (*postHookFunc) (struct optdrop_group * retVal___, struct mob_db *entry, const char *item_name, struct config_setting_t *drop, int *drop_rate); for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_drops_option_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mob_read_db_drops_option_post[hIndex].func; retVal___ = postHookFunc(retVal___, entry, item_name, drop, drop_rate); @@ -60097,11 +60097,11 @@ void HP_mob_clear_spawninfo(void) { } return; } -struct item_drop_ratio* HP_mob_get_item_drop_ratio(int nameid) { +struct item_drop_ratio * HP_mob_get_item_drop_ratio(int nameid) { int hIndex = 0; - struct item_drop_ratio* retVal___ = NULL; + struct item_drop_ratio * retVal___ = NULL; if (HPMHooks.count.HP_mob_get_item_drop_ratio_pre > 0) { - struct item_drop_ratio* (*preHookFunc) (int *nameid); + struct item_drop_ratio * (*preHookFunc) (int *nameid); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_get_item_drop_ratio_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mob_get_item_drop_ratio_pre[hIndex].func; @@ -60116,7 +60116,7 @@ struct item_drop_ratio* HP_mob_get_item_drop_ratio(int nameid) { retVal___ = HPMHooks.source.mob.get_item_drop_ratio(nameid); } if (HPMHooks.count.HP_mob_get_item_drop_ratio_post > 0) { - struct item_drop_ratio* (*postHookFunc) (struct item_drop_ratio* retVal___, int nameid); + struct item_drop_ratio * (*postHookFunc) (struct item_drop_ratio * retVal___, int nameid); for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_get_item_drop_ratio_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mob_get_item_drop_ratio_post[hIndex].func; retVal___ = postHookFunc(retVal___, nameid); @@ -60424,11 +60424,11 @@ bool HP_mob_read_group_db_libconfig_sub_group(struct config_setting_t *it, enum return retVal___; } /* mutex_interface */ -struct mutex_data* HP_mutex_create(void) { +struct mutex_data * HP_mutex_create(void) { int hIndex = 0; - struct mutex_data* retVal___ = NULL; + struct mutex_data * retVal___ = NULL; if (HPMHooks.count.HP_mutex_create_pre > 0) { - struct mutex_data* (*preHookFunc) (void); + struct mutex_data * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mutex_create_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mutex_create_pre[hIndex].func; @@ -60443,7 +60443,7 @@ struct mutex_data* HP_mutex_create(void) { retVal___ = HPMHooks.source.mutex.create(); } if (HPMHooks.count.HP_mutex_create_post > 0) { - struct mutex_data* (*postHookFunc) (struct mutex_data* retVal___); + struct mutex_data * (*postHookFunc) (struct mutex_data * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_mutex_create_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mutex_create_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -60556,11 +60556,11 @@ void HP_mutex_unlock(struct mutex_data *m) { } return; } -struct cond_data* HP_mutex_cond_create(void) { +struct cond_data * HP_mutex_cond_create(void) { int hIndex = 0; - struct cond_data* retVal___ = NULL; + struct cond_data * retVal___ = NULL; if (HPMHooks.count.HP_mutex_cond_create_pre > 0) { - struct cond_data* (*preHookFunc) (void); + struct cond_data * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_mutex_cond_create_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_mutex_cond_create_pre[hIndex].func; @@ -60575,7 +60575,7 @@ struct cond_data* HP_mutex_cond_create(void) { retVal___ = HPMHooks.source.mutex.cond_create(); } if (HPMHooks.count.HP_mutex_cond_create_post > 0) { - struct cond_data* (*postHookFunc) (struct cond_data* retVal___); + struct cond_data * (*postHookFunc) (struct cond_data * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_mutex_cond_create_post; hIndex++) { postHookFunc = HPMHooks.list.HP_mutex_cond_create_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -60773,11 +60773,11 @@ void HP_npc_chat_def_pattern(struct npc_data *nd, int setid, const char *pattern } return; } -struct pcrematch_entry* HP_npc_chat_create_pcrematch_entry(struct pcrematch_set *set) { +struct pcrematch_entry * HP_npc_chat_create_pcrematch_entry(struct pcrematch_set *set) { int hIndex = 0; - struct pcrematch_entry* retVal___ = NULL; + struct pcrematch_entry * retVal___ = NULL; if (HPMHooks.count.HP_npc_chat_create_pcrematch_entry_pre > 0) { - struct pcrematch_entry* (*preHookFunc) (struct pcrematch_set **set); + struct pcrematch_entry * (*preHookFunc) (struct pcrematch_set **set); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_chat_create_pcrematch_entry_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_npc_chat_create_pcrematch_entry_pre[hIndex].func; @@ -60792,7 +60792,7 @@ struct pcrematch_entry* HP_npc_chat_create_pcrematch_entry(struct pcrematch_set retVal___ = HPMHooks.source.npc_chat.create_pcrematch_entry(set); } if (HPMHooks.count.HP_npc_chat_create_pcrematch_entry_post > 0) { - struct pcrematch_entry* (*postHookFunc) (struct pcrematch_entry* retVal___, struct pcrematch_set *set); + struct pcrematch_entry * (*postHookFunc) (struct pcrematch_entry * retVal___, struct pcrematch_set *set); for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_chat_create_pcrematch_entry_post; hIndex++) { postHookFunc = HPMHooks.list.HP_npc_chat_create_pcrematch_entry_post[hIndex].func; retVal___ = postHookFunc(retVal___, set); @@ -60878,11 +60878,11 @@ void HP_npc_chat_activate_pcreset(struct npc_data *nd, int setid) { } return; } -struct pcrematch_set* HP_npc_chat_lookup_pcreset(struct npc_data *nd, int setid) { +struct pcrematch_set * HP_npc_chat_lookup_pcreset(struct npc_data *nd, int setid) { int hIndex = 0; - struct pcrematch_set* retVal___ = NULL; + struct pcrematch_set * retVal___ = NULL; if (HPMHooks.count.HP_npc_chat_lookup_pcreset_pre > 0) { - struct pcrematch_set* (*preHookFunc) (struct npc_data **nd, int *setid); + struct pcrematch_set * (*preHookFunc) (struct npc_data **nd, int *setid); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_chat_lookup_pcreset_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_npc_chat_lookup_pcreset_pre[hIndex].func; @@ -60897,7 +60897,7 @@ struct pcrematch_set* HP_npc_chat_lookup_pcreset(struct npc_data *nd, int setid) retVal___ = HPMHooks.source.npc_chat.lookup_pcreset(nd, setid); } if (HPMHooks.count.HP_npc_chat_lookup_pcreset_post > 0) { - struct pcrematch_set* (*postHookFunc) (struct pcrematch_set* retVal___, struct npc_data *nd, int setid); + struct pcrematch_set * (*postHookFunc) (struct pcrematch_set * retVal___, struct npc_data *nd, int setid); for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_chat_lookup_pcreset_post; hIndex++) { postHookFunc = HPMHooks.list.HP_npc_chat_lookup_pcreset_post[hIndex].func; retVal___ = postHookFunc(retVal___, nd, setid); @@ -61013,11 +61013,11 @@ int HP_npc_get_new_npc_id(void) { } return retVal___; } -struct view_data* HP_npc_get_viewdata(int class_) { +struct view_data * HP_npc_get_viewdata(int class_) { int hIndex = 0; - struct view_data* retVal___ = NULL; + struct view_data * retVal___ = NULL; if (HPMHooks.count.HP_npc_get_viewdata_pre > 0) { - struct view_data* (*preHookFunc) (int *class_); + struct view_data * (*preHookFunc) (int *class_); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_get_viewdata_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_npc_get_viewdata_pre[hIndex].func; @@ -61032,7 +61032,7 @@ struct view_data* HP_npc_get_viewdata(int class_) { retVal___ = HPMHooks.source.npc.get_viewdata(class_); } if (HPMHooks.count.HP_npc_get_viewdata_post > 0) { - struct view_data* (*postHookFunc) (struct view_data* retVal___, int class_); + struct view_data * (*postHookFunc) (struct view_data * retVal___, int class_); for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_get_viewdata_post; hIndex++) { postHookFunc = HPMHooks.list.HP_npc_get_viewdata_post[hIndex].func; retVal___ = postHookFunc(retVal___, class_); @@ -61241,11 +61241,11 @@ int HP_npc_enable(const char *name, int flag) { } return retVal___; } -struct npc_data* HP_npc_name2id(const char *name) { +struct npc_data * HP_npc_name2id(const char *name) { int hIndex = 0; - struct npc_data* retVal___ = NULL; + struct npc_data * retVal___ = NULL; if (HPMHooks.count.HP_npc_name2id_pre > 0) { - struct npc_data* (*preHookFunc) (const char **name); + struct npc_data * (*preHookFunc) (const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_name2id_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_npc_name2id_pre[hIndex].func; @@ -61260,7 +61260,7 @@ struct npc_data* HP_npc_name2id(const char *name) { retVal___ = HPMHooks.source.npc.name2id(name); } if (HPMHooks.count.HP_npc_name2id_post > 0) { - struct npc_data* (*postHookFunc) (struct npc_data* retVal___, const char *name); + struct npc_data * (*postHookFunc) (struct npc_data * retVal___, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_name2id_post; hIndex++) { postHookFunc = HPMHooks.list.HP_npc_name2id_post[hIndex].func; retVal___ = postHookFunc(retVal___, name); @@ -61958,11 +61958,11 @@ int HP_npc_check_areanpc(int flag, int16 m, int16 x, int16 y, int16 range) { } return retVal___; } -struct npc_data* HP_npc_checknear(struct map_session_data *sd, struct block_list *bl) { +struct npc_data * HP_npc_checknear(struct map_session_data *sd, struct block_list *bl) { int hIndex = 0; - struct npc_data* retVal___ = NULL; + struct npc_data * retVal___ = NULL; if (HPMHooks.count.HP_npc_checknear_pre > 0) { - struct npc_data* (*preHookFunc) (struct map_session_data **sd, struct block_list **bl); + struct npc_data * (*preHookFunc) (struct map_session_data **sd, struct block_list **bl); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_checknear_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_npc_checknear_pre[hIndex].func; @@ -61977,7 +61977,7 @@ struct npc_data* HP_npc_checknear(struct map_session_data *sd, struct block_list retVal___ = HPMHooks.source.npc.checknear(sd, bl); } if (HPMHooks.count.HP_npc_checknear_post > 0) { - struct npc_data* (*postHookFunc) (struct npc_data* retVal___, struct map_session_data *sd, struct block_list *bl); + struct npc_data * (*postHookFunc) (struct npc_data * retVal___, struct map_session_data *sd, struct block_list *bl); for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_checknear_post; hIndex++) { postHookFunc = HPMHooks.list.HP_npc_checknear_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, bl); @@ -62571,11 +62571,11 @@ void HP_npc_delsrcfile(const char *name) { } return; } -const char* HP_npc_retainpathreference(const char *filepath) { +const char * HP_npc_retainpathreference(const char *filepath) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_npc_retainpathreference_pre > 0) { - const char* (*preHookFunc) (const char **filepath); + const char * (*preHookFunc) (const char **filepath); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_retainpathreference_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_npc_retainpathreference_pre[hIndex].func; @@ -62590,7 +62590,7 @@ const char* HP_npc_retainpathreference(const char *filepath) { retVal___ = HPMHooks.source.npc.retainpathreference(filepath); } if (HPMHooks.count.HP_npc_retainpathreference_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *filepath); + const char * (*postHookFunc) (const char * retVal___, const char *filepath); for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_retainpathreference_post; hIndex++) { postHookFunc = HPMHooks.list.HP_npc_retainpathreference_post[hIndex].func; retVal___ = postHookFunc(retVal___, filepath); @@ -62704,11 +62704,11 @@ bool HP_npc_viewisid(const char *viewid) { } return retVal___; } -struct npc_data* HP_npc_create_npc(enum npc_subtype subtype, int m, int x, int y, enum unit_dir dir, int class_) { +struct npc_data * HP_npc_create_npc(enum npc_subtype subtype, int m, int x, int y, enum unit_dir dir, int class_) { int hIndex = 0; - struct npc_data* retVal___ = NULL; + struct npc_data * retVal___ = NULL; if (HPMHooks.count.HP_npc_create_npc_pre > 0) { - struct npc_data* (*preHookFunc) (enum npc_subtype *subtype, int *m, int *x, int *y, enum unit_dir *dir, int *class_); + struct npc_data * (*preHookFunc) (enum npc_subtype *subtype, int *m, int *x, int *y, enum unit_dir *dir, int *class_); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_create_npc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_npc_create_npc_pre[hIndex].func; @@ -62723,7 +62723,7 @@ struct npc_data* HP_npc_create_npc(enum npc_subtype subtype, int m, int x, int y retVal___ = HPMHooks.source.npc.create_npc(subtype, m, x, y, dir, class_); } if (HPMHooks.count.HP_npc_create_npc_post > 0) { - struct npc_data* (*postHookFunc) (struct npc_data* retVal___, enum npc_subtype subtype, int m, int x, int y, enum unit_dir dir, int class_); + struct npc_data * (*postHookFunc) (struct npc_data * retVal___, enum npc_subtype subtype, int m, int x, int y, enum unit_dir dir, int class_); for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_create_npc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_npc_create_npc_post[hIndex].func; retVal___ = postHookFunc(retVal___, subtype, m, x, y, dir, class_); @@ -62731,11 +62731,11 @@ struct npc_data* HP_npc_create_npc(enum npc_subtype subtype, int m, int x, int y } return retVal___; } -struct npc_data* HP_npc_add_warp(char *name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y) { +struct npc_data * HP_npc_add_warp(char *name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y) { int hIndex = 0; - struct npc_data* retVal___ = NULL; + struct npc_data * retVal___ = NULL; if (HPMHooks.count.HP_npc_add_warp_pre > 0) { - struct npc_data* (*preHookFunc) (char **name, short *from_mapid, short *from_x, short *from_y, short *xs, short *ys, unsigned short *to_mapindex, short *to_x, short *to_y); + struct npc_data * (*preHookFunc) (char **name, short *from_mapid, short *from_x, short *from_y, short *xs, short *ys, unsigned short *to_mapindex, short *to_x, short *to_y); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_add_warp_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_npc_add_warp_pre[hIndex].func; @@ -62750,7 +62750,7 @@ struct npc_data* HP_npc_add_warp(char *name, short from_mapid, short from_x, sho retVal___ = HPMHooks.source.npc.add_warp(name, from_mapid, from_x, from_y, xs, ys, to_mapindex, to_x, to_y); } if (HPMHooks.count.HP_npc_add_warp_post > 0) { - struct npc_data* (*postHookFunc) (struct npc_data* retVal___, char *name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y); + struct npc_data * (*postHookFunc) (struct npc_data * retVal___, char *name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y); for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_add_warp_post; hIndex++) { postHookFunc = HPMHooks.list.HP_npc_add_warp_post[hIndex].func; retVal___ = postHookFunc(retVal___, name, from_mapid, from_x, from_y, xs, ys, to_mapindex, to_x, to_y); @@ -62758,11 +62758,11 @@ struct npc_data* HP_npc_add_warp(char *name, short from_mapid, short from_x, sho } return retVal___; } -const char* HP_npc_parse_warp(const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval) { +const char * HP_npc_parse_warp(const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_npc_parse_warp_pre > 0) { - const char* (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); + const char * (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_warp_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_npc_parse_warp_pre[hIndex].func; @@ -62777,7 +62777,7 @@ const char* HP_npc_parse_warp(const char *w1, const char *w2, const char *w3, co retVal___ = HPMHooks.source.npc.parse_warp(w1, w2, w3, w4, start, buffer, filepath, retval); } if (HPMHooks.count.HP_npc_parse_warp_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); + const char * (*postHookFunc) (const char * retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_warp_post; hIndex++) { postHookFunc = HPMHooks.list.HP_npc_parse_warp_post[hIndex].func; retVal___ = postHookFunc(retVal___, w1, w2, w3, w4, start, buffer, filepath, retval); @@ -62785,11 +62785,11 @@ const char* HP_npc_parse_warp(const char *w1, const char *w2, const char *w3, co } return retVal___; } -const char* HP_npc_parse_shop(const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval) { +const char * HP_npc_parse_shop(const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_npc_parse_shop_pre > 0) { - const char* (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); + const char * (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_shop_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_npc_parse_shop_pre[hIndex].func; @@ -62804,7 +62804,7 @@ const char* HP_npc_parse_shop(const char *w1, const char *w2, const char *w3, co retVal___ = HPMHooks.source.npc.parse_shop(w1, w2, w3, w4, start, buffer, filepath, retval); } if (HPMHooks.count.HP_npc_parse_shop_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); + const char * (*postHookFunc) (const char * retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_shop_post; hIndex++) { postHookFunc = HPMHooks.list.HP_npc_parse_shop_post[hIndex].func; retVal___ = postHookFunc(retVal___, w1, w2, w3, w4, start, buffer, filepath, retval); @@ -62812,11 +62812,11 @@ const char* HP_npc_parse_shop(const char *w1, const char *w2, const char *w3, co } return retVal___; } -const char* HP_npc_parse_unknown_object(const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval) { +const char * HP_npc_parse_unknown_object(const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_npc_parse_unknown_object_pre > 0) { - const char* (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); + const char * (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_unknown_object_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_npc_parse_unknown_object_pre[hIndex].func; @@ -62831,7 +62831,7 @@ const char* HP_npc_parse_unknown_object(const char *w1, const char *w2, const ch retVal___ = HPMHooks.source.npc.parse_unknown_object(w1, w2, w3, w4, start, buffer, filepath, retval); } if (HPMHooks.count.HP_npc_parse_unknown_object_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); + const char * (*postHookFunc) (const char * retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_unknown_object_post; hIndex++) { postHookFunc = HPMHooks.list.HP_npc_parse_unknown_object_post[hIndex].func; retVal___ = postHookFunc(retVal___, w1, w2, w3, w4, start, buffer, filepath, retval); @@ -62865,11 +62865,11 @@ void HP_npc_convertlabel_db(struct npc_label_list *label_list, const char *filep } return; } -const char* HP_npc_skip_script(const char *start, const char *buffer, const char *filepath, int *retval) { +const char * HP_npc_skip_script(const char *start, const char *buffer, const char *filepath, int *retval) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_npc_skip_script_pre > 0) { - const char* (*preHookFunc) (const char **start, const char **buffer, const char **filepath, int **retval); + const char * (*preHookFunc) (const char **start, const char **buffer, const char **filepath, int **retval); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_skip_script_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_npc_skip_script_pre[hIndex].func; @@ -62884,7 +62884,7 @@ const char* HP_npc_skip_script(const char *start, const char *buffer, const char retVal___ = HPMHooks.source.npc.skip_script(start, buffer, filepath, retval); } if (HPMHooks.count.HP_npc_skip_script_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *start, const char *buffer, const char *filepath, int *retval); + const char * (*postHookFunc) (const char * retVal___, const char *start, const char *buffer, const char *filepath, int *retval); for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_skip_script_post; hIndex++) { postHookFunc = HPMHooks.list.HP_npc_skip_script_post[hIndex].func; retVal___ = postHookFunc(retVal___, start, buffer, filepath, retval); @@ -62892,11 +62892,11 @@ const char* HP_npc_skip_script(const char *start, const char *buffer, const char } return retVal___; } -const char* HP_npc_parse_script(const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int options, int *retval) { +const char * HP_npc_parse_script(const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int options, int *retval) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_npc_parse_script_pre > 0) { - const char* (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int *options, int **retval); + const char * (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int *options, int **retval); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_script_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_npc_parse_script_pre[hIndex].func; @@ -62911,7 +62911,7 @@ const char* HP_npc_parse_script(const char *w1, const char *w2, const char *w3, retVal___ = HPMHooks.source.npc.parse_script(w1, w2, w3, w4, start, buffer, filepath, options, retval); } if (HPMHooks.count.HP_npc_parse_script_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int options, int *retval); + const char * (*postHookFunc) (const char * retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int options, int *retval); for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_script_post; hIndex++) { postHookFunc = HPMHooks.list.HP_npc_parse_script_post[hIndex].func; retVal___ = postHookFunc(retVal___, w1, w2, w3, w4, start, buffer, filepath, options, retval); @@ -63053,11 +63053,11 @@ bool HP_npc_duplicate_sub(struct npc_data *nd, const struct npc_data *snd, int x } return retVal___; } -const char* HP_npc_parse_duplicate(const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int options, int *retval) { +const char * HP_npc_parse_duplicate(const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int options, int *retval) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_npc_parse_duplicate_pre > 0) { - const char* (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int *options, int **retval); + const char * (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int *options, int **retval); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_duplicate_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_npc_parse_duplicate_pre[hIndex].func; @@ -63072,7 +63072,7 @@ const char* HP_npc_parse_duplicate(const char *w1, const char *w2, const char *w retVal___ = HPMHooks.source.npc.parse_duplicate(w1, w2, w3, w4, start, buffer, filepath, options, retval); } if (HPMHooks.count.HP_npc_parse_duplicate_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int options, int *retval); + const char * (*postHookFunc) (const char * retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int options, int *retval); for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_duplicate_post; hIndex++) { postHookFunc = HPMHooks.list.HP_npc_parse_duplicate_post[hIndex].func; retVal___ = postHookFunc(retVal___, w1, w2, w3, w4, start, buffer, filepath, options, retval); @@ -63297,11 +63297,11 @@ int HP_npc_do_atcmd_event(struct map_session_data *sd, const char *command, cons } return retVal___; } -const char* HP_npc_parse_function(const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval) { +const char * HP_npc_parse_function(const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_npc_parse_function_pre > 0) { - const char* (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); + const char * (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_function_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_npc_parse_function_pre[hIndex].func; @@ -63316,7 +63316,7 @@ const char* HP_npc_parse_function(const char *w1, const char *w2, const char *w3 retVal___ = HPMHooks.source.npc.parse_function(w1, w2, w3, w4, start, buffer, filepath, retval); } if (HPMHooks.count.HP_npc_parse_function_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); + const char * (*postHookFunc) (const char * retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_function_post; hIndex++) { postHookFunc = HPMHooks.list.HP_npc_parse_function_post[hIndex].func; retVal___ = postHookFunc(retVal___, w1, w2, w3, w4, start, buffer, filepath, retval); @@ -63350,11 +63350,11 @@ void HP_npc_parse_mob2(struct spawn_data *mobspawn) { } return; } -const char* HP_npc_parse_mob(const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval) { +const char * HP_npc_parse_mob(const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_npc_parse_mob_pre > 0) { - const char* (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); + const char * (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_mob_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_npc_parse_mob_pre[hIndex].func; @@ -63369,7 +63369,7 @@ const char* HP_npc_parse_mob(const char *w1, const char *w2, const char *w3, con retVal___ = HPMHooks.source.npc.parse_mob(w1, w2, w3, w4, start, buffer, filepath, retval); } if (HPMHooks.count.HP_npc_parse_mob_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); + const char * (*postHookFunc) (const char * retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_mob_post; hIndex++) { postHookFunc = HPMHooks.list.HP_npc_parse_mob_post[hIndex].func; retVal___ = postHookFunc(retVal___, w1, w2, w3, w4, start, buffer, filepath, retval); @@ -63377,11 +63377,11 @@ const char* HP_npc_parse_mob(const char *w1, const char *w2, const char *w3, con } return retVal___; } -const char* HP_npc_parse_mapflag(const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval) { +const char * HP_npc_parse_mapflag(const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_npc_parse_mapflag_pre > 0) { - const char* (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); + const char * (*preHookFunc) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_mapflag_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_npc_parse_mapflag_pre[hIndex].func; @@ -63396,7 +63396,7 @@ const char* HP_npc_parse_mapflag(const char *w1, const char *w2, const char *w3, retVal___ = HPMHooks.source.npc.parse_mapflag(w1, w2, w3, w4, start, buffer, filepath, retval); } if (HPMHooks.count.HP_npc_parse_mapflag_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); + const char * (*postHookFunc) (const char * retVal___, const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_mapflag_post; hIndex++) { postHookFunc = HPMHooks.list.HP_npc_parse_mapflag_post[hIndex].func; retVal___ = postHookFunc(retVal___, w1, w2, w3, w4, start, buffer, filepath, retval); @@ -64707,11 +64707,11 @@ void HP_party_final(void) { } return; } -struct party_data* HP_party_search(int party_id) { +struct party_data * HP_party_search(int party_id) { int hIndex = 0; - struct party_data* retVal___ = NULL; + struct party_data * retVal___ = NULL; if (HPMHooks.count.HP_party_search_pre > 0) { - struct party_data* (*preHookFunc) (int *party_id); + struct party_data * (*preHookFunc) (int *party_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_party_search_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_party_search_pre[hIndex].func; @@ -64726,7 +64726,7 @@ struct party_data* HP_party_search(int party_id) { retVal___ = HPMHooks.source.party.search(party_id); } if (HPMHooks.count.HP_party_search_post > 0) { - struct party_data* (*postHookFunc) (struct party_data* retVal___, int party_id); + struct party_data * (*postHookFunc) (struct party_data * retVal___, int party_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_party_search_post; hIndex++) { postHookFunc = HPMHooks.list.HP_party_search_post[hIndex].func; retVal___ = postHookFunc(retVal___, party_id); @@ -64734,11 +64734,11 @@ struct party_data* HP_party_search(int party_id) { } return retVal___; } -struct party_data* HP_party_searchname(const char *str) { +struct party_data * HP_party_searchname(const char *str) { int hIndex = 0; - struct party_data* retVal___ = NULL; + struct party_data * retVal___ = NULL; if (HPMHooks.count.HP_party_searchname_pre > 0) { - struct party_data* (*preHookFunc) (const char **str); + struct party_data * (*preHookFunc) (const char **str); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_party_searchname_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_party_searchname_pre[hIndex].func; @@ -64753,7 +64753,7 @@ struct party_data* HP_party_searchname(const char *str) { retVal___ = HPMHooks.source.party.searchname(str); } if (HPMHooks.count.HP_party_searchname_post > 0) { - struct party_data* (*postHookFunc) (struct party_data* retVal___, const char *str); + struct party_data * (*postHookFunc) (struct party_data * retVal___, const char *str); for (hIndex = 0; hIndex < HPMHooks.count.HP_party_searchname_post; hIndex++) { postHookFunc = HPMHooks.list.HP_party_searchname_post[hIndex].func; retVal___ = postHookFunc(retVal___, str); @@ -64788,11 +64788,11 @@ int HP_party_getmemberid(struct party_data *p, struct map_session_data *sd) { } return retVal___; } -struct map_session_data* HP_party_getavailablesd(struct party_data *p) { +struct map_session_data * HP_party_getavailablesd(struct party_data *p) { int hIndex = 0; - struct map_session_data* retVal___ = NULL; + struct map_session_data * retVal___ = NULL; if (HPMHooks.count.HP_party_getavailablesd_pre > 0) { - struct map_session_data* (*preHookFunc) (struct party_data **p); + struct map_session_data * (*preHookFunc) (struct party_data **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_party_getavailablesd_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_party_getavailablesd_pre[hIndex].func; @@ -64807,7 +64807,7 @@ struct map_session_data* HP_party_getavailablesd(struct party_data *p) { retVal___ = HPMHooks.source.party.getavailablesd(p); } if (HPMHooks.count.HP_party_getavailablesd_post > 0) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, struct party_data *p); + struct map_session_data * (*postHookFunc) (struct map_session_data * retVal___, struct party_data *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_party_getavailablesd_post; hIndex++) { postHookFunc = HPMHooks.list.HP_party_getavailablesd_post[hIndex].func; retVal___ = postHookFunc(retVal___, p); @@ -65847,11 +65847,11 @@ void HP_party_fill_member(struct party_member *member, struct map_session_data * } return; } -struct map_session_data* HP_party_sd_check(int party_id, int account_id, int char_id) { +struct map_session_data * HP_party_sd_check(int party_id, int account_id, int char_id) { int hIndex = 0; - struct map_session_data* retVal___ = NULL; + struct map_session_data * retVal___ = NULL; if (HPMHooks.count.HP_party_sd_check_pre > 0) { - struct map_session_data* (*preHookFunc) (int *party_id, int *account_id, int *char_id); + struct map_session_data * (*preHookFunc) (int *party_id, int *account_id, int *char_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_party_sd_check_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_party_sd_check_pre[hIndex].func; @@ -65866,7 +65866,7 @@ struct map_session_data* HP_party_sd_check(int party_id, int account_id, int cha retVal___ = HPMHooks.source.party.sd_check(party_id, account_id, char_id); } if (HPMHooks.count.HP_party_sd_check_post > 0) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, int party_id, int account_id, int char_id); + struct map_session_data * (*postHookFunc) (struct map_session_data * retVal___, int party_id, int account_id, int char_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_party_sd_check_post; hIndex++) { postHookFunc = HPMHooks.list.HP_party_sd_check_post[hIndex].func; retVal___ = postHookFunc(retVal___, party_id, account_id, char_id); @@ -65900,11 +65900,11 @@ void HP_party_check_state(struct party_data *p) { } return; } -struct party_booking_ad_info* HP_party_create_booking_data(void) { +struct party_booking_ad_info * HP_party_create_booking_data(void) { int hIndex = 0; - struct party_booking_ad_info* retVal___ = NULL; + struct party_booking_ad_info * retVal___ = NULL; if (HPMHooks.count.HP_party_create_booking_data_pre > 0) { - struct party_booking_ad_info* (*preHookFunc) (void); + struct party_booking_ad_info * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_party_create_booking_data_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_party_create_booking_data_pre[hIndex].func; @@ -65919,7 +65919,7 @@ struct party_booking_ad_info* HP_party_create_booking_data(void) { retVal___ = HPMHooks.source.party.create_booking_data(); } if (HPMHooks.count.HP_party_create_booking_data_post > 0) { - struct party_booking_ad_info* (*postHookFunc) (struct party_booking_ad_info* retVal___); + struct party_booking_ad_info * (*postHookFunc) (struct party_booking_ad_info * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_party_create_booking_data_post; hIndex++) { postHookFunc = HPMHooks.list.HP_party_create_booking_data_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -66282,11 +66282,11 @@ void HP_pcg_reload(void) { } return; } -GroupSettings* HP_pcg_get_dummy_group(void) { +GroupSettings * HP_pcg_get_dummy_group(void) { int hIndex = 0; - GroupSettings* retVal___ = NULL; + GroupSettings * retVal___ = NULL; if (HPMHooks.count.HP_pcg_get_dummy_group_pre > 0) { - GroupSettings* (*preHookFunc) (void); + GroupSettings * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_pcg_get_dummy_group_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_pcg_get_dummy_group_pre[hIndex].func; @@ -66301,7 +66301,7 @@ GroupSettings* HP_pcg_get_dummy_group(void) { retVal___ = HPMHooks.source.pcg.get_dummy_group(); } if (HPMHooks.count.HP_pcg_get_dummy_group_post > 0) { - GroupSettings* (*postHookFunc) (GroupSettings* retVal___); + GroupSettings * (*postHookFunc) (GroupSettings * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_pcg_get_dummy_group_post; hIndex++) { postHookFunc = HPMHooks.list.HP_pcg_get_dummy_group_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -66336,11 +66336,11 @@ bool HP_pcg_exists(int group_id) { } return retVal___; } -GroupSettings* HP_pcg_id2group(int group_id) { +GroupSettings * HP_pcg_id2group(int group_id) { int hIndex = 0; - GroupSettings* retVal___ = NULL; + GroupSettings * retVal___ = NULL; if (HPMHooks.count.HP_pcg_id2group_pre > 0) { - GroupSettings* (*preHookFunc) (int *group_id); + GroupSettings * (*preHookFunc) (int *group_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_pcg_id2group_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_pcg_id2group_pre[hIndex].func; @@ -66355,7 +66355,7 @@ GroupSettings* HP_pcg_id2group(int group_id) { retVal___ = HPMHooks.source.pcg.id2group(group_id); } if (HPMHooks.count.HP_pcg_id2group_post > 0) { - GroupSettings* (*postHookFunc) (GroupSettings* retVal___, int group_id); + GroupSettings * (*postHookFunc) (GroupSettings * retVal___, int group_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_pcg_id2group_post; hIndex++) { postHookFunc = HPMHooks.list.HP_pcg_id2group_post[hIndex].func; retVal___ = postHookFunc(retVal___, group_id); @@ -66417,11 +66417,11 @@ bool HP_pcg_should_log_commands(GroupSettings *group) { } return retVal___; } -const char* HP_pcg_get_name(GroupSettings *group) { +const char * HP_pcg_get_name(GroupSettings *group) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_pcg_get_name_pre > 0) { - const char* (*preHookFunc) (GroupSettings **group); + const char * (*preHookFunc) (GroupSettings **group); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_pcg_get_name_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_pcg_get_name_pre[hIndex].func; @@ -66436,7 +66436,7 @@ const char* HP_pcg_get_name(GroupSettings *group) { retVal___ = HPMHooks.source.pcg.get_name(group); } if (HPMHooks.count.HP_pcg_get_name_post > 0) { - const char* (*postHookFunc) (const char* retVal___, GroupSettings *group); + const char * (*postHookFunc) (const char * retVal___, GroupSettings *group); for (hIndex = 0; hIndex < HPMHooks.count.HP_pcg_get_name_post; hIndex++) { postHookFunc = HPMHooks.list.HP_pcg_get_name_post[hIndex].func; retVal___ = postHookFunc(retVal___, group); @@ -66551,11 +66551,11 @@ void HP_pc_final(void) { } return; } -struct map_session_data* HP_pc_get_dummy_sd(void) { +struct map_session_data * HP_pc_get_dummy_sd(void) { int hIndex = 0; - struct map_session_data* retVal___ = NULL; + struct map_session_data * retVal___ = NULL; if (HPMHooks.count.HP_pc_get_dummy_sd_pre > 0) { - struct map_session_data* (*preHookFunc) (void); + struct map_session_data * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_get_dummy_sd_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_pc_get_dummy_sd_pre[hIndex].func; @@ -66570,7 +66570,7 @@ struct map_session_data* HP_pc_get_dummy_sd(void) { retVal___ = HPMHooks.source.pc.get_dummy_sd(); } if (HPMHooks.count.HP_pc_get_dummy_sd_post > 0) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___); + struct map_session_data * (*postHookFunc) (struct map_session_data * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_get_dummy_sd_post; hIndex++) { postHookFunc = HPMHooks.list.HP_pc_get_dummy_sd_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -70091,11 +70091,11 @@ void HP_pc_setreg(struct map_session_data *sd, int64 reg, int val) { } return; } -char* HP_pc_readregstr(struct map_session_data *sd, int64 reg) { +char * HP_pc_readregstr(struct map_session_data *sd, int64 reg) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_pc_readregstr_pre > 0) { - char* (*preHookFunc) (struct map_session_data **sd, int64 *reg); + char * (*preHookFunc) (struct map_session_data **sd, int64 *reg); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_readregstr_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_pc_readregstr_pre[hIndex].func; @@ -70110,7 +70110,7 @@ char* HP_pc_readregstr(struct map_session_data *sd, int64 reg) { retVal___ = HPMHooks.source.pc.readregstr(sd, reg); } if (HPMHooks.count.HP_pc_readregstr_post > 0) { - char* (*postHookFunc) (char* retVal___, struct map_session_data *sd, int64 reg); + char * (*postHookFunc) (char * retVal___, struct map_session_data *sd, int64 reg); for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_readregstr_post; hIndex++) { postHookFunc = HPMHooks.list.HP_pc_readregstr_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, reg); @@ -70198,11 +70198,11 @@ int HP_pc_setregistry(struct map_session_data *sd, int64 reg, int val) { } return retVal___; } -char* HP_pc_readregistry_str(struct map_session_data *sd, int64 reg) { +char * HP_pc_readregistry_str(struct map_session_data *sd, int64 reg) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_pc_readregistry_str_pre > 0) { - char* (*preHookFunc) (struct map_session_data **sd, int64 *reg); + char * (*preHookFunc) (struct map_session_data **sd, int64 *reg); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_readregistry_str_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_pc_readregistry_str_pre[hIndex].func; @@ -70217,7 +70217,7 @@ char* HP_pc_readregistry_str(struct map_session_data *sd, int64 reg) { retVal___ = HPMHooks.source.pc.readregistry_str(sd, reg); } if (HPMHooks.count.HP_pc_readregistry_str_post > 0) { - char* (*postHookFunc) (char* retVal___, struct map_session_data *sd, int64 reg); + char * (*postHookFunc) (char * retVal___, struct map_session_data *sd, int64 reg); for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_readregistry_str_post; hIndex++) { postHookFunc = HPMHooks.list.HP_pc_readregistry_str_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, reg); @@ -70528,11 +70528,11 @@ int HP_pc_divorce(struct map_session_data *sd) { } return retVal___; } -struct map_session_data* HP_pc_get_partner(struct map_session_data *sd) { +struct map_session_data * HP_pc_get_partner(struct map_session_data *sd) { int hIndex = 0; - struct map_session_data* retVal___ = NULL; + struct map_session_data * retVal___ = NULL; if (HPMHooks.count.HP_pc_get_partner_pre > 0) { - struct map_session_data* (*preHookFunc) (struct map_session_data **sd); + struct map_session_data * (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_get_partner_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_pc_get_partner_pre[hIndex].func; @@ -70547,7 +70547,7 @@ struct map_session_data* HP_pc_get_partner(struct map_session_data *sd) { retVal___ = HPMHooks.source.pc.get_partner(sd); } if (HPMHooks.count.HP_pc_get_partner_post > 0) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, struct map_session_data *sd); + struct map_session_data * (*postHookFunc) (struct map_session_data * retVal___, struct map_session_data *sd); for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_get_partner_post; hIndex++) { postHookFunc = HPMHooks.list.HP_pc_get_partner_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd); @@ -70555,11 +70555,11 @@ struct map_session_data* HP_pc_get_partner(struct map_session_data *sd) { } return retVal___; } -struct map_session_data* HP_pc_get_father(struct map_session_data *sd) { +struct map_session_data * HP_pc_get_father(struct map_session_data *sd) { int hIndex = 0; - struct map_session_data* retVal___ = NULL; + struct map_session_data * retVal___ = NULL; if (HPMHooks.count.HP_pc_get_father_pre > 0) { - struct map_session_data* (*preHookFunc) (struct map_session_data **sd); + struct map_session_data * (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_get_father_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_pc_get_father_pre[hIndex].func; @@ -70574,7 +70574,7 @@ struct map_session_data* HP_pc_get_father(struct map_session_data *sd) { retVal___ = HPMHooks.source.pc.get_father(sd); } if (HPMHooks.count.HP_pc_get_father_post > 0) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, struct map_session_data *sd); + struct map_session_data * (*postHookFunc) (struct map_session_data * retVal___, struct map_session_data *sd); for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_get_father_post; hIndex++) { postHookFunc = HPMHooks.list.HP_pc_get_father_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd); @@ -70582,11 +70582,11 @@ struct map_session_data* HP_pc_get_father(struct map_session_data *sd) { } return retVal___; } -struct map_session_data* HP_pc_get_mother(struct map_session_data *sd) { +struct map_session_data * HP_pc_get_mother(struct map_session_data *sd) { int hIndex = 0; - struct map_session_data* retVal___ = NULL; + struct map_session_data * retVal___ = NULL; if (HPMHooks.count.HP_pc_get_mother_pre > 0) { - struct map_session_data* (*preHookFunc) (struct map_session_data **sd); + struct map_session_data * (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_get_mother_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_pc_get_mother_pre[hIndex].func; @@ -70601,7 +70601,7 @@ struct map_session_data* HP_pc_get_mother(struct map_session_data *sd) { retVal___ = HPMHooks.source.pc.get_mother(sd); } if (HPMHooks.count.HP_pc_get_mother_post > 0) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, struct map_session_data *sd); + struct map_session_data * (*postHookFunc) (struct map_session_data * retVal___, struct map_session_data *sd); for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_get_mother_post; hIndex++) { postHookFunc = HPMHooks.list.HP_pc_get_mother_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd); @@ -70609,11 +70609,11 @@ struct map_session_data* HP_pc_get_mother(struct map_session_data *sd) { } return retVal___; } -struct map_session_data* HP_pc_get_child(struct map_session_data *sd) { +struct map_session_data * HP_pc_get_child(struct map_session_data *sd) { int hIndex = 0; - struct map_session_data* retVal___ = NULL; + struct map_session_data * retVal___ = NULL; if (HPMHooks.count.HP_pc_get_child_pre > 0) { - struct map_session_data* (*preHookFunc) (struct map_session_data **sd); + struct map_session_data * (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_get_child_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_pc_get_child_pre[hIndex].func; @@ -70628,7 +70628,7 @@ struct map_session_data* HP_pc_get_child(struct map_session_data *sd) { retVal___ = HPMHooks.source.pc.get_child(sd); } if (HPMHooks.count.HP_pc_get_child_post > 0) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, struct map_session_data *sd); + struct map_session_data * (*postHookFunc) (struct map_session_data * retVal___, struct map_session_data *sd); for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_get_child_post; hIndex++) { postHookFunc = HPMHooks.list.HP_pc_get_child_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd); @@ -70795,11 +70795,11 @@ int HP_pc_mapid2jobid(unsigned int class_, int sex) { } return retVal___; } -const char* HP_pc_job_name(int class) { +const char * HP_pc_job_name(int class) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_pc_job_name_pre > 0) { - const char* (*preHookFunc) (int *class); + const char * (*preHookFunc) (int *class); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_job_name_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_pc_job_name_pre[hIndex].func; @@ -70814,7 +70814,7 @@ const char* HP_pc_job_name(int class) { retVal___ = HPMHooks.source.pc.job_name(class); } if (HPMHooks.count.HP_pc_job_name_post > 0) { - const char* (*postHookFunc) (const char* retVal___, int class); + const char * (*postHookFunc) (const char * retVal___, int class); for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_job_name_post; hIndex++) { postHookFunc = HPMHooks.list.HP_pc_job_name_post[hIndex].func; retVal___ = postHookFunc(retVal___, class); @@ -73577,11 +73577,11 @@ void HP_pc_clear_existing_reproduceskill(struct map_session_data *sd, bool clear return; } /* pcre_interface */ -pcre* HP_libpcre_compile(const char *pattern, int options, const char **errptr, int *erroffset, const unsigned char *tableptr) { +pcre * HP_libpcre_compile(const char *pattern, int options, const char **errptr, int *erroffset, const unsigned char *tableptr) { int hIndex = 0; - pcre* retVal___ = NULL; + pcre * retVal___ = NULL; if (HPMHooks.count.HP_libpcre_compile_pre > 0) { - pcre* (*preHookFunc) (const char **pattern, int *options, const char ***errptr, int **erroffset, const unsigned char **tableptr); + pcre * (*preHookFunc) (const char **pattern, int *options, const char ***errptr, int **erroffset, const unsigned char **tableptr); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libpcre_compile_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libpcre_compile_pre[hIndex].func; @@ -73596,7 +73596,7 @@ pcre* HP_libpcre_compile(const char *pattern, int options, const char **errptr, retVal___ = HPMHooks.source.libpcre.compile(pattern, options, errptr, erroffset, tableptr); } if (HPMHooks.count.HP_libpcre_compile_post > 0) { - pcre* (*postHookFunc) (pcre* retVal___, const char *pattern, int options, const char **errptr, int *erroffset, const unsigned char *tableptr); + pcre * (*postHookFunc) (pcre * retVal___, const char *pattern, int options, const char **errptr, int *erroffset, const unsigned char *tableptr); for (hIndex = 0; hIndex < HPMHooks.count.HP_libpcre_compile_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libpcre_compile_post[hIndex].func; retVal___ = postHookFunc(retVal___, pattern, options, errptr, erroffset, tableptr); @@ -73604,11 +73604,11 @@ pcre* HP_libpcre_compile(const char *pattern, int options, const char **errptr, } return retVal___; } -pcre_extra* HP_libpcre_study(const pcre *code, int options, const char **errptr) { +pcre_extra * HP_libpcre_study(const pcre *code, int options, const char **errptr) { int hIndex = 0; - pcre_extra* retVal___ = NULL; + pcre_extra * retVal___ = NULL; if (HPMHooks.count.HP_libpcre_study_pre > 0) { - pcre_extra* (*preHookFunc) (const pcre **code, int *options, const char ***errptr); + pcre_extra * (*preHookFunc) (const pcre **code, int *options, const char ***errptr); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_libpcre_study_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_libpcre_study_pre[hIndex].func; @@ -73623,7 +73623,7 @@ pcre_extra* HP_libpcre_study(const pcre *code, int options, const char **errptr) retVal___ = HPMHooks.source.libpcre.study(code, options, errptr); } if (HPMHooks.count.HP_libpcre_study_post > 0) { - pcre_extra* (*postHookFunc) (pcre_extra* retVal___, const pcre *code, int options, const char **errptr); + pcre_extra * (*postHookFunc) (pcre_extra * retVal___, const pcre *code, int options, const char **errptr); for (hIndex = 0; hIndex < HPMHooks.count.HP_libpcre_study_post; hIndex++) { postHookFunc = HPMHooks.list.HP_libpcre_study_post[hIndex].func; retVal___ = postHookFunc(retVal___, code, options, errptr); @@ -75121,11 +75121,11 @@ void HP_quest_reload(void) { } return; } -struct quest_db* HP_quest_db(int quest_id) { +struct quest_db * HP_quest_db(int quest_id) { int hIndex = 0; - struct quest_db* retVal___ = NULL; + struct quest_db * retVal___ = NULL; if (HPMHooks.count.HP_quest_db_pre > 0) { - struct quest_db* (*preHookFunc) (int *quest_id); + struct quest_db * (*preHookFunc) (int *quest_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_quest_db_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_quest_db_pre[hIndex].func; @@ -75140,7 +75140,7 @@ struct quest_db* HP_quest_db(int quest_id) { retVal___ = HPMHooks.source.quest.db(quest_id); } if (HPMHooks.count.HP_quest_db_post > 0) { - struct quest_db* (*postHookFunc) (struct quest_db* retVal___, int quest_id); + struct quest_db * (*postHookFunc) (struct quest_db * retVal___, int quest_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_quest_db_post; hIndex++) { postHookFunc = HPMHooks.list.HP_quest_db_post[hIndex].func; retVal___ = postHookFunc(retVal___, quest_id); @@ -75422,11 +75422,11 @@ int HP_quest_read_db(void) { } return retVal___; } -struct quest_db* HP_quest_read_db_sub(struct config_setting_t *cs, int n, const char *source) { +struct quest_db * HP_quest_read_db_sub(struct config_setting_t *cs, int n, const char *source) { int hIndex = 0; - struct quest_db* retVal___ = NULL; + struct quest_db * retVal___ = NULL; if (HPMHooks.count.HP_quest_read_db_sub_pre > 0) { - struct quest_db* (*preHookFunc) (struct config_setting_t **cs, int *n, const char **source); + struct quest_db * (*preHookFunc) (struct config_setting_t **cs, int *n, const char **source); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_quest_read_db_sub_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_quest_read_db_sub_pre[hIndex].func; @@ -75441,7 +75441,7 @@ struct quest_db* HP_quest_read_db_sub(struct config_setting_t *cs, int n, const retVal___ = HPMHooks.source.quest.read_db_sub(cs, n, source); } if (HPMHooks.count.HP_quest_read_db_sub_post > 0) { - struct quest_db* (*postHookFunc) (struct quest_db* retVal___, struct config_setting_t *cs, int n, const char *source); + struct quest_db * (*postHookFunc) (struct quest_db * retVal___, struct config_setting_t *cs, int n, const char *source); for (hIndex = 0; hIndex < HPMHooks.count.HP_quest_read_db_sub_post; hIndex++) { postHookFunc = HPMHooks.list.HP_quest_read_db_sub_post[hIndex].func; retVal___ = postHookFunc(retVal___, cs, n, source); @@ -76787,11 +76787,11 @@ void HP_rodex_send_mail_result(struct map_session_data *ssd, struct map_session_ } return; } -struct rodex_message* HP_rodex_get_mail(struct map_session_data *sd, int64 mail_id) { +struct rodex_message * HP_rodex_get_mail(struct map_session_data *sd, int64 mail_id) { int hIndex = 0; - struct rodex_message* retVal___ = NULL; + struct rodex_message * retVal___ = NULL; if (HPMHooks.count.HP_rodex_get_mail_pre > 0) { - struct rodex_message* (*preHookFunc) (struct map_session_data **sd, int64 *mail_id); + struct rodex_message * (*preHookFunc) (struct map_session_data **sd, int64 *mail_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_rodex_get_mail_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_rodex_get_mail_pre[hIndex].func; @@ -76806,7 +76806,7 @@ struct rodex_message* HP_rodex_get_mail(struct map_session_data *sd, int64 mail_ retVal___ = HPMHooks.source.rodex.get_mail(sd, mail_id); } if (HPMHooks.count.HP_rodex_get_mail_post > 0) { - struct rodex_message* (*postHookFunc) (struct rodex_message* retVal___, struct map_session_data *sd, int64 mail_id); + struct rodex_message * (*postHookFunc) (struct rodex_message * retVal___, struct map_session_data *sd, int64 mail_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_rodex_get_mail_post; hIndex++) { postHookFunc = HPMHooks.list.HP_rodex_get_mail_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, mail_id); @@ -77076,11 +77076,11 @@ int HP_script_reload(void) { } return retVal___; } -struct script_code* HP_script_parse(const char *src, const char *file, int line, int options, int *retval) { +struct script_code * HP_script_parse(const char *src, const char *file, int line, int options, int *retval) { int hIndex = 0; - struct script_code* retVal___ = NULL; + struct script_code * retVal___ = NULL; if (HPMHooks.count.HP_script_parse_pre > 0) { - struct script_code* (*preHookFunc) (const char **src, const char **file, int *line, int *options, int **retval); + struct script_code * (*preHookFunc) (const char **src, const char **file, int *line, int *options, int **retval); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_parse_pre[hIndex].func; @@ -77095,7 +77095,7 @@ struct script_code* HP_script_parse(const char *src, const char *file, int line, retVal___ = HPMHooks.source.script.parse(src, file, line, options, retval); } if (HPMHooks.count.HP_script_parse_post > 0) { - struct script_code* (*postHookFunc) (struct script_code* retVal___, const char *src, const char *file, int line, int options, int *retval); + struct script_code * (*postHookFunc) (struct script_code * retVal___, const char *src, const char *file, int line, int options, int *retval); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_parse_post[hIndex].func; retVal___ = postHookFunc(retVal___, src, file, line, options, retval); @@ -77156,11 +77156,11 @@ void HP_script_parse_builtin(void) { } return; } -const char* HP_script_parse_subexpr(const char *p, int limit) { +const char * HP_script_parse_subexpr(const char *p, int limit) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_parse_subexpr_pre > 0) { - const char* (*preHookFunc) (const char **p, int *limit); + const char * (*preHookFunc) (const char **p, int *limit); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_subexpr_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_parse_subexpr_pre[hIndex].func; @@ -77175,7 +77175,7 @@ const char* HP_script_parse_subexpr(const char *p, int limit) { retVal___ = HPMHooks.source.script.parse_subexpr(p, limit); } if (HPMHooks.count.HP_script_parse_subexpr_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p, int limit); + const char * (*postHookFunc) (const char * retVal___, const char *p, int limit); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_subexpr_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_parse_subexpr_post[hIndex].func; retVal___ = postHookFunc(retVal___, p, limit); @@ -77183,11 +77183,11 @@ const char* HP_script_parse_subexpr(const char *p, int limit) { } return retVal___; } -const char* HP_script_skip_space(const char *p) { +const char * HP_script_skip_space(const char *p) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_skip_space_pre > 0) { - const char* (*preHookFunc) (const char **p); + const char * (*preHookFunc) (const char **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_skip_space_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_skip_space_pre[hIndex].func; @@ -77202,7 +77202,7 @@ const char* HP_script_skip_space(const char *p) { retVal___ = HPMHooks.source.script.skip_space(p); } if (HPMHooks.count.HP_script_skip_space_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p); + const char * (*postHookFunc) (const char * retVal___, const char *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_skip_space_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_skip_space_post[hIndex].func; retVal___ = postHookFunc(retVal___, p); @@ -77262,11 +77262,11 @@ void HP_script_warning(const char *src, const char *file, int start_line, const } return; } -struct script_code* HP_script_clone_script(struct script_code *original) { +struct script_code * HP_script_clone_script(struct script_code *original) { int hIndex = 0; - struct script_code* retVal___ = NULL; + struct script_code * retVal___ = NULL; if (HPMHooks.count.HP_script_clone_script_pre > 0) { - struct script_code* (*preHookFunc) (struct script_code **original); + struct script_code * (*preHookFunc) (struct script_code **original); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_clone_script_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_clone_script_pre[hIndex].func; @@ -77281,7 +77281,7 @@ struct script_code* HP_script_clone_script(struct script_code *original) { retVal___ = HPMHooks.source.script.clone_script(original); } if (HPMHooks.count.HP_script_clone_script_post > 0) { - struct script_code* (*postHookFunc) (struct script_code* retVal___, struct script_code *original); + struct script_code * (*postHookFunc) (struct script_code * retVal___, struct script_code *original); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_clone_script_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_clone_script_post[hIndex].func; retVal___ = postHookFunc(retVal___, original); @@ -77343,11 +77343,11 @@ int HP_script_conv_num(struct script_state *st, struct script_data *data) { } return retVal___; } -const char* HP_script_conv_str(struct script_state *st, struct script_data *data) { +const char * HP_script_conv_str(struct script_state *st, struct script_data *data) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_conv_str_pre > 0) { - const char* (*preHookFunc) (struct script_state **st, struct script_data **data); + const char * (*preHookFunc) (struct script_state **st, struct script_data **data); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_conv_str_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_conv_str_pre[hIndex].func; @@ -77362,7 +77362,7 @@ const char* HP_script_conv_str(struct script_state *st, struct script_data *data retVal___ = HPMHooks.source.script.conv_str(st, data); } if (HPMHooks.count.HP_script_conv_str_post > 0) { - const char* (*postHookFunc) (const char* retVal___, struct script_state *st, struct script_data *data); + const char * (*postHookFunc) (const char * retVal___, struct script_state *st, struct script_data *data); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_conv_str_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_conv_str_post[hIndex].func; retVal___ = postHookFunc(retVal___, st, data); @@ -77370,11 +77370,11 @@ const char* HP_script_conv_str(struct script_state *st, struct script_data *data } return retVal___; } -struct map_session_data* HP_script_rid2sd(struct script_state *st) { +struct map_session_data * HP_script_rid2sd(struct script_state *st) { int hIndex = 0; - struct map_session_data* retVal___ = NULL; + struct map_session_data * retVal___ = NULL; if (HPMHooks.count.HP_script_rid2sd_pre > 0) { - struct map_session_data* (*preHookFunc) (struct script_state **st); + struct map_session_data * (*preHookFunc) (struct script_state **st); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_rid2sd_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_rid2sd_pre[hIndex].func; @@ -77389,7 +77389,7 @@ struct map_session_data* HP_script_rid2sd(struct script_state *st) { retVal___ = HPMHooks.source.script.rid2sd(st); } if (HPMHooks.count.HP_script_rid2sd_post > 0) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, struct script_state *st); + struct map_session_data * (*postHookFunc) (struct map_session_data * retVal___, struct script_state *st); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_rid2sd_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_rid2sd_post[hIndex].func; retVal___ = postHookFunc(retVal___, st); @@ -77397,11 +77397,11 @@ struct map_session_data* HP_script_rid2sd(struct script_state *st) { } return retVal___; } -struct map_session_data* HP_script_id2sd(struct script_state *st, int account_id) { +struct map_session_data * HP_script_id2sd(struct script_state *st, int account_id) { int hIndex = 0; - struct map_session_data* retVal___ = NULL; + struct map_session_data * retVal___ = NULL; if (HPMHooks.count.HP_script_id2sd_pre > 0) { - struct map_session_data* (*preHookFunc) (struct script_state **st, int *account_id); + struct map_session_data * (*preHookFunc) (struct script_state **st, int *account_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_id2sd_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_id2sd_pre[hIndex].func; @@ -77416,7 +77416,7 @@ struct map_session_data* HP_script_id2sd(struct script_state *st, int account_id retVal___ = HPMHooks.source.script.id2sd(st, account_id); } if (HPMHooks.count.HP_script_id2sd_post > 0) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, struct script_state *st, int account_id); + struct map_session_data * (*postHookFunc) (struct map_session_data * retVal___, struct script_state *st, int account_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_id2sd_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_id2sd_post[hIndex].func; retVal___ = postHookFunc(retVal___, st, account_id); @@ -77424,11 +77424,11 @@ struct map_session_data* HP_script_id2sd(struct script_state *st, int account_id } return retVal___; } -struct map_session_data* HP_script_charid2sd(struct script_state *st, int char_id) { +struct map_session_data * HP_script_charid2sd(struct script_state *st, int char_id) { int hIndex = 0; - struct map_session_data* retVal___ = NULL; + struct map_session_data * retVal___ = NULL; if (HPMHooks.count.HP_script_charid2sd_pre > 0) { - struct map_session_data* (*preHookFunc) (struct script_state **st, int *char_id); + struct map_session_data * (*preHookFunc) (struct script_state **st, int *char_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_charid2sd_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_charid2sd_pre[hIndex].func; @@ -77443,7 +77443,7 @@ struct map_session_data* HP_script_charid2sd(struct script_state *st, int char_i retVal___ = HPMHooks.source.script.charid2sd(st, char_id); } if (HPMHooks.count.HP_script_charid2sd_post > 0) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, struct script_state *st, int char_id); + struct map_session_data * (*postHookFunc) (struct map_session_data * retVal___, struct script_state *st, int char_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_charid2sd_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_charid2sd_post[hIndex].func; retVal___ = postHookFunc(retVal___, st, char_id); @@ -77451,11 +77451,11 @@ struct map_session_data* HP_script_charid2sd(struct script_state *st, int char_i } return retVal___; } -struct map_session_data* HP_script_nick2sd(struct script_state *st, const char *name) { +struct map_session_data * HP_script_nick2sd(struct script_state *st, const char *name) { int hIndex = 0; - struct map_session_data* retVal___ = NULL; + struct map_session_data * retVal___ = NULL; if (HPMHooks.count.HP_script_nick2sd_pre > 0) { - struct map_session_data* (*preHookFunc) (struct script_state **st, const char **name); + struct map_session_data * (*preHookFunc) (struct script_state **st, const char **name); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_nick2sd_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_nick2sd_pre[hIndex].func; @@ -77470,7 +77470,7 @@ struct map_session_data* HP_script_nick2sd(struct script_state *st, const char * retVal___ = HPMHooks.source.script.nick2sd(st, name); } if (HPMHooks.count.HP_script_nick2sd_post > 0) { - struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, struct script_state *st, const char *name); + struct map_session_data * (*postHookFunc) (struct map_session_data * retVal___, struct script_state *st, const char *name); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_nick2sd_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_nick2sd_post[hIndex].func; retVal___ = postHookFunc(retVal___, st, name); @@ -77504,11 +77504,11 @@ void HP_script_detach_rid(struct script_state *st) { } return; } -struct script_data* HP_script_push_val(struct script_stack *stack, enum c_op type, int64 val, struct reg_db *ref) { +struct script_data * HP_script_push_val(struct script_stack *stack, enum c_op type, int64 val, struct reg_db *ref) { int hIndex = 0; - struct script_data* retVal___ = NULL; + struct script_data * retVal___ = NULL; if (HPMHooks.count.HP_script_push_val_pre > 0) { - struct script_data* (*preHookFunc) (struct script_stack **stack, enum c_op *type, int64 *val, struct reg_db **ref); + struct script_data * (*preHookFunc) (struct script_stack **stack, enum c_op *type, int64 *val, struct reg_db **ref); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_push_val_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_push_val_pre[hIndex].func; @@ -77523,7 +77523,7 @@ struct script_data* HP_script_push_val(struct script_stack *stack, enum c_op typ retVal___ = HPMHooks.source.script.push_val(stack, type, val, ref); } if (HPMHooks.count.HP_script_push_val_post > 0) { - struct script_data* (*postHookFunc) (struct script_data* retVal___, struct script_stack *stack, enum c_op type, int64 val, struct reg_db *ref); + struct script_data * (*postHookFunc) (struct script_data * retVal___, struct script_stack *stack, enum c_op type, int64 val, struct reg_db *ref); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_push_val_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_push_val_post[hIndex].func; retVal___ = postHookFunc(retVal___, stack, type, val, ref); @@ -77531,11 +77531,11 @@ struct script_data* HP_script_push_val(struct script_stack *stack, enum c_op typ } return retVal___; } -struct script_data* HP_script_get_val(struct script_state *st, struct script_data *data) { +struct script_data * HP_script_get_val(struct script_state *st, struct script_data *data) { int hIndex = 0; - struct script_data* retVal___ = NULL; + struct script_data * retVal___ = NULL; if (HPMHooks.count.HP_script_get_val_pre > 0) { - struct script_data* (*preHookFunc) (struct script_state **st, struct script_data **data); + struct script_data * (*preHookFunc) (struct script_state **st, struct script_data **data); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_get_val_pre[hIndex].func; @@ -77550,7 +77550,7 @@ struct script_data* HP_script_get_val(struct script_state *st, struct script_dat retVal___ = HPMHooks.source.script.get_val(st, data); } if (HPMHooks.count.HP_script_get_val_post > 0) { - struct script_data* (*postHookFunc) (struct script_data* retVal___, struct script_state *st, struct script_data *data); + struct script_data * (*postHookFunc) (struct script_data * retVal___, struct script_state *st, struct script_data *data); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_get_val_post[hIndex].func; retVal___ = postHookFunc(retVal___, st, data); @@ -77558,11 +77558,11 @@ struct script_data* HP_script_get_val(struct script_state *st, struct script_dat } return retVal___; } -char* HP_script_get_val_ref_str(struct script_state *st, struct reg_db *n, struct script_data *data) { +char * HP_script_get_val_ref_str(struct script_state *st, struct reg_db *n, struct script_data *data) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_script_get_val_ref_str_pre > 0) { - char* (*preHookFunc) (struct script_state **st, struct reg_db **n, struct script_data **data); + char * (*preHookFunc) (struct script_state **st, struct reg_db **n, struct script_data **data); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_ref_str_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_get_val_ref_str_pre[hIndex].func; @@ -77577,7 +77577,7 @@ char* HP_script_get_val_ref_str(struct script_state *st, struct reg_db *n, struc retVal___ = HPMHooks.source.script.get_val_ref_str(st, n, data); } if (HPMHooks.count.HP_script_get_val_ref_str_post > 0) { - char* (*postHookFunc) (char* retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); + char * (*postHookFunc) (char * retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_ref_str_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_get_val_ref_str_post[hIndex].func; retVal___ = postHookFunc(retVal___, st, n, data); @@ -77585,11 +77585,11 @@ char* HP_script_get_val_ref_str(struct script_state *st, struct reg_db *n, struc } return retVal___; } -char* HP_script_get_val_pc_ref_str(struct script_state *st, struct reg_db *n, struct script_data *data) { +char * HP_script_get_val_pc_ref_str(struct script_state *st, struct reg_db *n, struct script_data *data) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_script_get_val_pc_ref_str_pre > 0) { - char* (*preHookFunc) (struct script_state **st, struct reg_db **n, struct script_data **data); + char * (*preHookFunc) (struct script_state **st, struct reg_db **n, struct script_data **data); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_pc_ref_str_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_get_val_pc_ref_str_pre[hIndex].func; @@ -77604,7 +77604,7 @@ char* HP_script_get_val_pc_ref_str(struct script_state *st, struct reg_db *n, st retVal___ = HPMHooks.source.script.get_val_pc_ref_str(st, n, data); } if (HPMHooks.count.HP_script_get_val_pc_ref_str_post > 0) { - char* (*postHookFunc) (char* retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); + char * (*postHookFunc) (char * retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_pc_ref_str_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_get_val_pc_ref_str_post[hIndex].func; retVal___ = postHookFunc(retVal___, st, n, data); @@ -77612,11 +77612,11 @@ char* HP_script_get_val_pc_ref_str(struct script_state *st, struct reg_db *n, st } return retVal___; } -char* HP_script_get_val_scope_str(struct script_state *st, struct reg_db *n, struct script_data *data) { +char * HP_script_get_val_scope_str(struct script_state *st, struct reg_db *n, struct script_data *data) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_script_get_val_scope_str_pre > 0) { - char* (*preHookFunc) (struct script_state **st, struct reg_db **n, struct script_data **data); + char * (*preHookFunc) (struct script_state **st, struct reg_db **n, struct script_data **data); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_scope_str_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_get_val_scope_str_pre[hIndex].func; @@ -77631,7 +77631,7 @@ char* HP_script_get_val_scope_str(struct script_state *st, struct reg_db *n, str retVal___ = HPMHooks.source.script.get_val_scope_str(st, n, data); } if (HPMHooks.count.HP_script_get_val_scope_str_post > 0) { - char* (*postHookFunc) (char* retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); + char * (*postHookFunc) (char * retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_scope_str_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_get_val_scope_str_post[hIndex].func; retVal___ = postHookFunc(retVal___, st, n, data); @@ -77639,11 +77639,11 @@ char* HP_script_get_val_scope_str(struct script_state *st, struct reg_db *n, str } return retVal___; } -char* HP_script_get_val_npc_str(struct script_state *st, struct reg_db *n, struct script_data *data) { +char * HP_script_get_val_npc_str(struct script_state *st, struct reg_db *n, struct script_data *data) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_script_get_val_npc_str_pre > 0) { - char* (*preHookFunc) (struct script_state **st, struct reg_db **n, struct script_data **data); + char * (*preHookFunc) (struct script_state **st, struct reg_db **n, struct script_data **data); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_npc_str_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_get_val_npc_str_pre[hIndex].func; @@ -77658,7 +77658,7 @@ char* HP_script_get_val_npc_str(struct script_state *st, struct reg_db *n, struc retVal___ = HPMHooks.source.script.get_val_npc_str(st, n, data); } if (HPMHooks.count.HP_script_get_val_npc_str_post > 0) { - char* (*postHookFunc) (char* retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); + char * (*postHookFunc) (char * retVal___, struct script_state *st, struct reg_db *n, struct script_data *data); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_npc_str_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_get_val_npc_str_post[hIndex].func; retVal___ = postHookFunc(retVal___, st, n, data); @@ -77666,11 +77666,11 @@ char* HP_script_get_val_npc_str(struct script_state *st, struct reg_db *n, struc } return retVal___; } -char* HP_script_get_val_instance_str(struct script_state *st, const char *name, struct script_data *data) { +char * HP_script_get_val_instance_str(struct script_state *st, const char *name, struct script_data *data) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_script_get_val_instance_str_pre > 0) { - char* (*preHookFunc) (struct script_state **st, const char **name, struct script_data **data); + char * (*preHookFunc) (struct script_state **st, const char **name, struct script_data **data); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_instance_str_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_get_val_instance_str_pre[hIndex].func; @@ -77685,7 +77685,7 @@ char* HP_script_get_val_instance_str(struct script_state *st, const char *name, retVal___ = HPMHooks.source.script.get_val_instance_str(st, name, data); } if (HPMHooks.count.HP_script_get_val_instance_str_post > 0) { - char* (*postHookFunc) (char* retVal___, struct script_state *st, const char *name, struct script_data *data); + char * (*postHookFunc) (char * retVal___, struct script_state *st, const char *name, struct script_data *data); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val_instance_str_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_get_val_instance_str_post[hIndex].func; retVal___ = postHookFunc(retVal___, st, name, data); @@ -77828,11 +77828,11 @@ int HP_script_get_val_instance_num(struct script_state *st, const char *name, st } return retVal___; } -const void* HP_script_get_val2(struct script_state *st, int64 uid, struct reg_db *ref) { +const void * HP_script_get_val2(struct script_state *st, int64 uid, struct reg_db *ref) { int hIndex = 0; - const void* retVal___ = NULL; + const void * retVal___ = NULL; if (HPMHooks.count.HP_script_get_val2_pre > 0) { - const void* (*preHookFunc) (struct script_state **st, int64 *uid, struct reg_db **ref); + const void * (*preHookFunc) (struct script_state **st, int64 *uid, struct reg_db **ref); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val2_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_get_val2_pre[hIndex].func; @@ -77847,7 +77847,7 @@ const void* HP_script_get_val2(struct script_state *st, int64 uid, struct reg_db retVal___ = HPMHooks.source.script.get_val2(st, uid, ref); } if (HPMHooks.count.HP_script_get_val2_post > 0) { - const void* (*postHookFunc) (const void* retVal___, struct script_state *st, int64 uid, struct reg_db *ref); + const void * (*postHookFunc) (const void * retVal___, struct script_state *st, int64 uid, struct reg_db *ref); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_val2_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_get_val2_post[hIndex].func; retVal___ = postHookFunc(retVal___, st, uid, ref); @@ -77855,11 +77855,11 @@ const void* HP_script_get_val2(struct script_state *st, int64 uid, struct reg_db } return retVal___; } -struct script_data* HP_script_push_str(struct script_stack *stack, char *str) { +struct script_data * HP_script_push_str(struct script_stack *stack, char *str) { int hIndex = 0; - struct script_data* retVal___ = NULL; + struct script_data * retVal___ = NULL; if (HPMHooks.count.HP_script_push_str_pre > 0) { - struct script_data* (*preHookFunc) (struct script_stack **stack, char **str); + struct script_data * (*preHookFunc) (struct script_stack **stack, char **str); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_push_str_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_push_str_pre[hIndex].func; @@ -77874,7 +77874,7 @@ struct script_data* HP_script_push_str(struct script_stack *stack, char *str) { retVal___ = HPMHooks.source.script.push_str(stack, str); } if (HPMHooks.count.HP_script_push_str_post > 0) { - struct script_data* (*postHookFunc) (struct script_data* retVal___, struct script_stack *stack, char *str); + struct script_data * (*postHookFunc) (struct script_data * retVal___, struct script_stack *stack, char *str); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_push_str_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_push_str_post[hIndex].func; retVal___ = postHookFunc(retVal___, stack, str); @@ -77882,11 +77882,11 @@ struct script_data* HP_script_push_str(struct script_stack *stack, char *str) { } return retVal___; } -struct script_data* HP_script_push_conststr(struct script_stack *stack, const char *str) { +struct script_data * HP_script_push_conststr(struct script_stack *stack, const char *str) { int hIndex = 0; - struct script_data* retVal___ = NULL; + struct script_data * retVal___ = NULL; if (HPMHooks.count.HP_script_push_conststr_pre > 0) { - struct script_data* (*preHookFunc) (struct script_stack **stack, const char **str); + struct script_data * (*preHookFunc) (struct script_stack **stack, const char **str); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_push_conststr_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_push_conststr_pre[hIndex].func; @@ -77901,7 +77901,7 @@ struct script_data* HP_script_push_conststr(struct script_stack *stack, const ch retVal___ = HPMHooks.source.script.push_conststr(stack, str); } if (HPMHooks.count.HP_script_push_conststr_post > 0) { - struct script_data* (*postHookFunc) (struct script_data* retVal___, struct script_stack *stack, const char *str); + struct script_data * (*postHookFunc) (struct script_data * retVal___, struct script_stack *stack, const char *str); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_push_conststr_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_push_conststr_post[hIndex].func; retVal___ = postHookFunc(retVal___, stack, str); @@ -77909,11 +77909,11 @@ struct script_data* HP_script_push_conststr(struct script_stack *stack, const ch } return retVal___; } -struct script_data* HP_script_push_copy(struct script_stack *stack, int pos) { +struct script_data * HP_script_push_copy(struct script_stack *stack, int pos) { int hIndex = 0; - struct script_data* retVal___ = NULL; + struct script_data * retVal___ = NULL; if (HPMHooks.count.HP_script_push_copy_pre > 0) { - struct script_data* (*preHookFunc) (struct script_stack **stack, int *pos); + struct script_data * (*preHookFunc) (struct script_stack **stack, int *pos); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_push_copy_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_push_copy_pre[hIndex].func; @@ -77928,7 +77928,7 @@ struct script_data* HP_script_push_copy(struct script_stack *stack, int pos) { retVal___ = HPMHooks.source.script.push_copy(stack, pos); } if (HPMHooks.count.HP_script_push_copy_post > 0) { - struct script_data* (*postHookFunc) (struct script_data* retVal___, struct script_stack *stack, int pos); + struct script_data * (*postHookFunc) (struct script_data * retVal___, struct script_stack *stack, int pos); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_push_copy_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_push_copy_post[hIndex].func; retVal___ = postHookFunc(retVal___, stack, pos); @@ -78303,11 +78303,11 @@ void HP_script_free_vars(struct DBMap *var_storage) { } return; } -struct script_state* HP_script_alloc_state(struct script_code *rootscript, int pos, int rid, int oid) { +struct script_state * HP_script_alloc_state(struct script_code *rootscript, int pos, int rid, int oid) { int hIndex = 0; - struct script_state* retVal___ = NULL; + struct script_state * retVal___ = NULL; if (HPMHooks.count.HP_script_alloc_state_pre > 0) { - struct script_state* (*preHookFunc) (struct script_code **rootscript, int *pos, int *rid, int *oid); + struct script_state * (*preHookFunc) (struct script_code **rootscript, int *pos, int *rid, int *oid); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_alloc_state_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_alloc_state_pre[hIndex].func; @@ -78322,7 +78322,7 @@ struct script_state* HP_script_alloc_state(struct script_code *rootscript, int p retVal___ = HPMHooks.source.script.alloc_state(rootscript, pos, rid, oid); } if (HPMHooks.count.HP_script_alloc_state_post > 0) { - struct script_state* (*postHookFunc) (struct script_state* retVal___, struct script_code *rootscript, int pos, int rid, int oid); + struct script_state * (*postHookFunc) (struct script_state * retVal___, struct script_code *rootscript, int pos, int rid, int oid); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_alloc_state_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_alloc_state_post[hIndex].func; retVal___ = postHookFunc(retVal___, rootscript, pos, rid, oid); @@ -78541,11 +78541,11 @@ int HP_script_add_variable(const char *varname) { } return retVal___; } -const char* HP_script_get_str(int id) { +const char * HP_script_get_str(int id) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_get_str_pre > 0) { - const char* (*preHookFunc) (int *id); + const char * (*preHookFunc) (int *id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_str_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_get_str_pre[hIndex].func; @@ -78560,7 +78560,7 @@ const char* HP_script_get_str(int id) { retVal___ = HPMHooks.source.script.get_str(id); } if (HPMHooks.count.HP_script_get_str_post > 0) { - const char* (*postHookFunc) (const char* retVal___, int id); + const char * (*postHookFunc) (const char * retVal___, int id); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_str_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_get_str_post[hIndex].func; retVal___ = postHookFunc(retVal___, id); @@ -78647,11 +78647,11 @@ void HP_script_attach_state(struct script_state *st) { } return; } -struct script_queue* HP_script_queue(int idx) { +struct script_queue * HP_script_queue(int idx) { int hIndex = 0; - struct script_queue* retVal___ = NULL; + struct script_queue * retVal___ = NULL; if (HPMHooks.count.HP_script_queue_pre > 0) { - struct script_queue* (*preHookFunc) (int *idx); + struct script_queue * (*preHookFunc) (int *idx); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_queue_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_queue_pre[hIndex].func; @@ -78666,7 +78666,7 @@ struct script_queue* HP_script_queue(int idx) { retVal___ = HPMHooks.source.script.queue(idx); } if (HPMHooks.count.HP_script_queue_post > 0) { - struct script_queue* (*postHookFunc) (struct script_queue* retVal___, int idx); + struct script_queue * (*postHookFunc) (struct script_queue * retVal___, int idx); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_queue_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_queue_post[hIndex].func; retVal___ = postHookFunc(retVal___, idx); @@ -78809,11 +78809,11 @@ bool HP_script_queue_clear(int idx) { } return retVal___; } -const char* HP_script_parse_curly_close(const char *p) { +const char * HP_script_parse_curly_close(const char *p) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_parse_curly_close_pre > 0) { - const char* (*preHookFunc) (const char **p); + const char * (*preHookFunc) (const char **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_curly_close_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_parse_curly_close_pre[hIndex].func; @@ -78828,7 +78828,7 @@ const char* HP_script_parse_curly_close(const char *p) { retVal___ = HPMHooks.source.script.parse_curly_close(p); } if (HPMHooks.count.HP_script_parse_curly_close_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p); + const char * (*postHookFunc) (const char * retVal___, const char *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_curly_close_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_parse_curly_close_post[hIndex].func; retVal___ = postHookFunc(retVal___, p); @@ -78836,11 +78836,11 @@ const char* HP_script_parse_curly_close(const char *p) { } return retVal___; } -const char* HP_script_parse_syntax_close(const char *p) { +const char * HP_script_parse_syntax_close(const char *p) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_parse_syntax_close_pre > 0) { - const char* (*preHookFunc) (const char **p); + const char * (*preHookFunc) (const char **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_syntax_close_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_parse_syntax_close_pre[hIndex].func; @@ -78855,7 +78855,7 @@ const char* HP_script_parse_syntax_close(const char *p) { retVal___ = HPMHooks.source.script.parse_syntax_close(p); } if (HPMHooks.count.HP_script_parse_syntax_close_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p); + const char * (*postHookFunc) (const char * retVal___, const char *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_syntax_close_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_parse_syntax_close_post[hIndex].func; retVal___ = postHookFunc(retVal___, p); @@ -78863,11 +78863,11 @@ const char* HP_script_parse_syntax_close(const char *p) { } return retVal___; } -const char* HP_script_parse_syntax_close_sub(const char *p, int *flag) { +const char * HP_script_parse_syntax_close_sub(const char *p, int *flag) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_parse_syntax_close_sub_pre > 0) { - const char* (*preHookFunc) (const char **p, int **flag); + const char * (*preHookFunc) (const char **p, int **flag); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_syntax_close_sub_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_parse_syntax_close_sub_pre[hIndex].func; @@ -78882,7 +78882,7 @@ const char* HP_script_parse_syntax_close_sub(const char *p, int *flag) { retVal___ = HPMHooks.source.script.parse_syntax_close_sub(p, flag); } if (HPMHooks.count.HP_script_parse_syntax_close_sub_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p, int *flag); + const char * (*postHookFunc) (const char * retVal___, const char *p, int *flag); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_syntax_close_sub_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_parse_syntax_close_sub_post[hIndex].func; retVal___ = postHookFunc(retVal___, p, flag); @@ -78890,11 +78890,11 @@ const char* HP_script_parse_syntax_close_sub(const char *p, int *flag) { } return retVal___; } -const char* HP_script_parse_syntax(const char *p) { +const char * HP_script_parse_syntax(const char *p) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_parse_syntax_pre > 0) { - const char* (*preHookFunc) (const char **p); + const char * (*preHookFunc) (const char **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_syntax_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_parse_syntax_pre[hIndex].func; @@ -78909,7 +78909,7 @@ const char* HP_script_parse_syntax(const char *p) { retVal___ = HPMHooks.source.script.parse_syntax(p); } if (HPMHooks.count.HP_script_parse_syntax_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p); + const char * (*postHookFunc) (const char * retVal___, const char *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_syntax_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_parse_syntax_post[hIndex].func; retVal___ = postHookFunc(retVal___, p); @@ -78917,11 +78917,11 @@ const char* HP_script_parse_syntax(const char *p) { } return retVal___; } -const char* HP_script_parse_syntax_function(const char *p, bool is_public) { +const char * HP_script_parse_syntax_function(const char *p, bool is_public) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_parse_syntax_function_pre > 0) { - const char* (*preHookFunc) (const char **p, bool *is_public); + const char * (*preHookFunc) (const char **p, bool *is_public); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_syntax_function_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_parse_syntax_function_pre[hIndex].func; @@ -78936,7 +78936,7 @@ const char* HP_script_parse_syntax_function(const char *p, bool is_public) { retVal___ = HPMHooks.source.script.parse_syntax_function(p, is_public); } if (HPMHooks.count.HP_script_parse_syntax_function_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p, bool is_public); + const char * (*postHookFunc) (const char * retVal___, const char *p, bool is_public); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_syntax_function_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_parse_syntax_function_post[hIndex].func; retVal___ = postHookFunc(retVal___, p, is_public); @@ -78998,11 +78998,11 @@ int HP_script_get_num(const struct script_buf *scriptbuf, int *pos) { } return retVal___; } -const char* HP_script_op2name(int op) { +const char * HP_script_op2name(int op) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_op2name_pre > 0) { - const char* (*preHookFunc) (int *op); + const char * (*preHookFunc) (int *op); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_op2name_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_op2name_pre[hIndex].func; @@ -79017,7 +79017,7 @@ const char* HP_script_op2name(int op) { retVal___ = HPMHooks.source.script.op2name(op); } if (HPMHooks.count.HP_script_op2name_post > 0) { - const char* (*postHookFunc) (const char* retVal___, int op); + const char * (*postHookFunc) (const char * retVal___, int op); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_op2name_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_op2name_post[hIndex].func; retVal___ = postHookFunc(retVal___, op); @@ -79312,11 +79312,11 @@ void HP_script_set_label(int l, int pos, const char *script_pos) { } return; } -const char* HP_script_skip_word(const char *p) { +const char * HP_script_skip_word(const char *p) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_skip_word_pre > 0) { - const char* (*preHookFunc) (const char **p); + const char * (*preHookFunc) (const char **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_skip_word_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_skip_word_pre[hIndex].func; @@ -79331,7 +79331,7 @@ const char* HP_script_skip_word(const char *p) { retVal___ = HPMHooks.source.script.skip_word(p); } if (HPMHooks.count.HP_script_skip_word_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p); + const char * (*postHookFunc) (const char * retVal___, const char *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_skip_word_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_skip_word_post[hIndex].func; retVal___ = postHookFunc(retVal___, p); @@ -79366,11 +79366,11 @@ int HP_script_add_word(const char *p) { } return retVal___; } -const char* HP_script_parse_callfunc(const char *p, int require_paren, int is_custom) { +const char * HP_script_parse_callfunc(const char *p, int require_paren, int is_custom) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_parse_callfunc_pre > 0) { - const char* (*preHookFunc) (const char **p, int *require_paren, int *is_custom); + const char * (*preHookFunc) (const char **p, int *require_paren, int *is_custom); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_callfunc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_parse_callfunc_pre[hIndex].func; @@ -79385,7 +79385,7 @@ const char* HP_script_parse_callfunc(const char *p, int require_paren, int is_cu retVal___ = HPMHooks.source.script.parse_callfunc(p, require_paren, is_custom); } if (HPMHooks.count.HP_script_parse_callfunc_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p, int require_paren, int is_custom); + const char * (*postHookFunc) (const char * retVal___, const char *p, int require_paren, int is_custom); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_callfunc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_parse_callfunc_post[hIndex].func; retVal___ = postHookFunc(retVal___, p, require_paren, is_custom); @@ -79419,11 +79419,11 @@ void HP_script_parse_nextline(bool first, const char *p) { } return; } -const char* HP_script_parse_variable(const char *p) { +const char * HP_script_parse_variable(const char *p) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_parse_variable_pre > 0) { - const char* (*preHookFunc) (const char **p); + const char * (*preHookFunc) (const char **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_variable_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_parse_variable_pre[hIndex].func; @@ -79438,7 +79438,7 @@ const char* HP_script_parse_variable(const char *p) { retVal___ = HPMHooks.source.script.parse_variable(p); } if (HPMHooks.count.HP_script_parse_variable_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p); + const char * (*postHookFunc) (const char * retVal___, const char *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_variable_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_parse_variable_post[hIndex].func; retVal___ = postHookFunc(retVal___, p); @@ -79446,11 +79446,11 @@ const char* HP_script_parse_variable(const char *p) { } return retVal___; } -const char* HP_script_parse_simpleexpr(const char *p) { +const char * HP_script_parse_simpleexpr(const char *p) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_parse_simpleexpr_pre > 0) { - const char* (*preHookFunc) (const char **p); + const char * (*preHookFunc) (const char **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_simpleexpr_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_parse_simpleexpr_pre[hIndex].func; @@ -79465,7 +79465,7 @@ const char* HP_script_parse_simpleexpr(const char *p) { retVal___ = HPMHooks.source.script.parse_simpleexpr(p); } if (HPMHooks.count.HP_script_parse_simpleexpr_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p); + const char * (*postHookFunc) (const char * retVal___, const char *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_simpleexpr_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_parse_simpleexpr_post[hIndex].func; retVal___ = postHookFunc(retVal___, p); @@ -79473,11 +79473,11 @@ const char* HP_script_parse_simpleexpr(const char *p) { } return retVal___; } -const char* HP_script_parse_simpleexpr_paren(const char *p) { +const char * HP_script_parse_simpleexpr_paren(const char *p) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_parse_simpleexpr_paren_pre > 0) { - const char* (*preHookFunc) (const char **p); + const char * (*preHookFunc) (const char **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_simpleexpr_paren_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_parse_simpleexpr_paren_pre[hIndex].func; @@ -79492,7 +79492,7 @@ const char* HP_script_parse_simpleexpr_paren(const char *p) { retVal___ = HPMHooks.source.script.parse_simpleexpr_paren(p); } if (HPMHooks.count.HP_script_parse_simpleexpr_paren_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p); + const char * (*postHookFunc) (const char * retVal___, const char *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_simpleexpr_paren_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_parse_simpleexpr_paren_post[hIndex].func; retVal___ = postHookFunc(retVal___, p); @@ -79500,11 +79500,11 @@ const char* HP_script_parse_simpleexpr_paren(const char *p) { } return retVal___; } -const char* HP_script_parse_simpleexpr_number(const char *p) { +const char * HP_script_parse_simpleexpr_number(const char *p) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_parse_simpleexpr_number_pre > 0) { - const char* (*preHookFunc) (const char **p); + const char * (*preHookFunc) (const char **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_simpleexpr_number_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_parse_simpleexpr_number_pre[hIndex].func; @@ -79519,7 +79519,7 @@ const char* HP_script_parse_simpleexpr_number(const char *p) { retVal___ = HPMHooks.source.script.parse_simpleexpr_number(p); } if (HPMHooks.count.HP_script_parse_simpleexpr_number_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p); + const char * (*postHookFunc) (const char * retVal___, const char *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_simpleexpr_number_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_parse_simpleexpr_number_post[hIndex].func; retVal___ = postHookFunc(retVal___, p); @@ -79527,11 +79527,11 @@ const char* HP_script_parse_simpleexpr_number(const char *p) { } return retVal___; } -const char* HP_script_parse_simpleexpr_string(const char *p) { +const char * HP_script_parse_simpleexpr_string(const char *p) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_parse_simpleexpr_string_pre > 0) { - const char* (*preHookFunc) (const char **p); + const char * (*preHookFunc) (const char **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_simpleexpr_string_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_parse_simpleexpr_string_pre[hIndex].func; @@ -79546,7 +79546,7 @@ const char* HP_script_parse_simpleexpr_string(const char *p) { retVal___ = HPMHooks.source.script.parse_simpleexpr_string(p); } if (HPMHooks.count.HP_script_parse_simpleexpr_string_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p); + const char * (*postHookFunc) (const char * retVal___, const char *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_simpleexpr_string_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_parse_simpleexpr_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, p); @@ -79554,11 +79554,11 @@ const char* HP_script_parse_simpleexpr_string(const char *p) { } return retVal___; } -const char* HP_script_parse_simpleexpr_name(const char *p) { +const char * HP_script_parse_simpleexpr_name(const char *p) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_parse_simpleexpr_name_pre > 0) { - const char* (*preHookFunc) (const char **p); + const char * (*preHookFunc) (const char **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_simpleexpr_name_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_parse_simpleexpr_name_pre[hIndex].func; @@ -79573,7 +79573,7 @@ const char* HP_script_parse_simpleexpr_name(const char *p) { retVal___ = HPMHooks.source.script.parse_simpleexpr_name(p); } if (HPMHooks.count.HP_script_parse_simpleexpr_name_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p); + const char * (*postHookFunc) (const char * retVal___, const char *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_simpleexpr_name_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_parse_simpleexpr_name_post[hIndex].func; retVal___ = postHookFunc(retVal___, p); @@ -79607,11 +79607,11 @@ void HP_script_add_translatable_string(const struct script_string_buf *string, c } return; } -const char* HP_script_parse_expr(const char *p) { +const char * HP_script_parse_expr(const char *p) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_parse_expr_pre > 0) { - const char* (*preHookFunc) (const char **p); + const char * (*preHookFunc) (const char **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_expr_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_parse_expr_pre[hIndex].func; @@ -79626,7 +79626,7 @@ const char* HP_script_parse_expr(const char *p) { retVal___ = HPMHooks.source.script.parse_expr(p); } if (HPMHooks.count.HP_script_parse_expr_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p); + const char * (*postHookFunc) (const char * retVal___, const char *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_expr_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_parse_expr_post[hIndex].func; retVal___ = postHookFunc(retVal___, p); @@ -79634,11 +79634,11 @@ const char* HP_script_parse_expr(const char *p) { } return retVal___; } -const char* HP_script_parse_line(const char *p) { +const char * HP_script_parse_line(const char *p) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_parse_line_pre > 0) { - const char* (*preHookFunc) (const char **p); + const char * (*preHookFunc) (const char **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_line_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_parse_line_pre[hIndex].func; @@ -79653,7 +79653,7 @@ const char* HP_script_parse_line(const char *p) { retVal___ = HPMHooks.source.script.parse_line(p); } if (HPMHooks.count.HP_script_parse_line_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p); + const char * (*postHookFunc) (const char * retVal___, const char *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_parse_line_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_parse_line_post[hIndex].func; retVal___ = postHookFunc(retVal___, p); @@ -79739,11 +79739,11 @@ void HP_script_load_parameters(void) { } return; } -const char* HP_script_print_line(StringBuf *buf, const char *p, const char *mark, int line) { +const char * HP_script_print_line(StringBuf *buf, const char *p, const char *mark, int line) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_print_line_pre > 0) { - const char* (*preHookFunc) (StringBuf **buf, const char **p, const char **mark, int *line); + const char * (*preHookFunc) (StringBuf **buf, const char **p, const char **mark, int *line); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_print_line_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_print_line_pre[hIndex].func; @@ -79758,7 +79758,7 @@ const char* HP_script_print_line(StringBuf *buf, const char *p, const char *mark retVal___ = HPMHooks.source.script.print_line(buf, p, mark, line); } if (HPMHooks.count.HP_script_print_line_post > 0) { - const char* (*postHookFunc) (const char* retVal___, StringBuf *buf, const char *p, const char *mark, int line); + const char * (*postHookFunc) (const char * retVal___, StringBuf *buf, const char *p, const char *mark, int line); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_print_line_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_print_line_post[hIndex].func; retVal___ = postHookFunc(retVal___, buf, p, mark, line); @@ -80132,11 +80132,11 @@ void HP_script_stack_expand(struct script_stack *stack) { } return; } -struct script_data* HP_script_push_retinfo(struct script_stack *stack, struct script_retinfo *ri, struct reg_db *ref) { +struct script_data * HP_script_push_retinfo(struct script_stack *stack, struct script_retinfo *ri, struct reg_db *ref) { int hIndex = 0; - struct script_data* retVal___ = NULL; + struct script_data * retVal___ = NULL; if (HPMHooks.count.HP_script_push_retinfo_pre > 0) { - struct script_data* (*preHookFunc) (struct script_stack **stack, struct script_retinfo **ri, struct reg_db **ref); + struct script_data * (*preHookFunc) (struct script_stack **stack, struct script_retinfo **ri, struct reg_db **ref); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_push_retinfo_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_push_retinfo_pre[hIndex].func; @@ -80151,7 +80151,7 @@ struct script_data* HP_script_push_retinfo(struct script_stack *stack, struct sc retVal___ = HPMHooks.source.script.push_retinfo(stack, ri, ref); } if (HPMHooks.count.HP_script_push_retinfo_post > 0) { - struct script_data* (*postHookFunc) (struct script_data* retVal___, struct script_stack *stack, struct script_retinfo *ri, struct reg_db *ref); + struct script_data * (*postHookFunc) (struct script_data * retVal___, struct script_stack *stack, struct script_retinfo *ri, struct reg_db *ref); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_push_retinfo_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_push_retinfo_post[hIndex].func; retVal___ = postHookFunc(retVal___, stack, ri, ref); @@ -81369,11 +81369,11 @@ bool HP_script_sprintf_helper(struct script_state *st, int start, struct StringB } return retVal___; } -const char* HP_script_getfuncname(struct script_state *st) { +const char * HP_script_getfuncname(struct script_state *st) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_getfuncname_pre > 0) { - const char* (*preHookFunc) (struct script_state **st); + const char * (*preHookFunc) (struct script_state **st); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_getfuncname_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_getfuncname_pre[hIndex].func; @@ -81388,7 +81388,7 @@ const char* HP_script_getfuncname(struct script_state *st) { retVal___ = HPMHooks.source.script.getfuncname(st); } if (HPMHooks.count.HP_script_getfuncname_post > 0) { - const char* (*postHookFunc) (const char* retVal___, struct script_state *st); + const char * (*postHookFunc) (const char * retVal___, struct script_state *st); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_getfuncname_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_getfuncname_post[hIndex].func; retVal___ = postHookFunc(retVal___, st); @@ -81423,11 +81423,11 @@ unsigned int HP_script_calc_hash_ci(const char *p) { } return retVal___; } -struct reg_db* HP_script_array_src(struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref) { +struct reg_db * HP_script_array_src(struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref) { int hIndex = 0; - struct reg_db* retVal___ = NULL; + struct reg_db * retVal___ = NULL; if (HPMHooks.count.HP_script_array_src_pre > 0) { - struct reg_db* (*preHookFunc) (struct script_state **st, struct map_session_data **sd, const char **name, struct reg_db **ref); + struct reg_db * (*preHookFunc) (struct script_state **st, struct map_session_data **sd, const char **name, struct reg_db **ref); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_array_src_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_array_src_pre[hIndex].func; @@ -81442,7 +81442,7 @@ struct reg_db* HP_script_array_src(struct script_state *st, struct map_session_d retVal___ = HPMHooks.source.script.array_src(st, sd, name, ref); } if (HPMHooks.count.HP_script_array_src_post > 0) { - struct reg_db* (*postHookFunc) (struct reg_db* retVal___, struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref); + struct reg_db * (*postHookFunc) (struct reg_db * retVal___, struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_array_src_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_array_src_post[hIndex].func; retVal___ = postHookFunc(retVal___, st, sd, name, ref); @@ -81779,11 +81779,11 @@ void HP_script_generic_ui_array_expand(unsigned int plus) { } return; } -unsigned int* HP_script_array_cpy_list(struct script_array *sa) { +unsigned int * HP_script_array_cpy_list(struct script_array *sa) { int hIndex = 0; - unsigned int* retVal___ = NULL; + unsigned int * retVal___ = NULL; if (HPMHooks.count.HP_script_array_cpy_list_pre > 0) { - unsigned int* (*preHookFunc) (struct script_array **sa); + unsigned int * (*preHookFunc) (struct script_array **sa); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_array_cpy_list_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_array_cpy_list_pre[hIndex].func; @@ -81798,7 +81798,7 @@ unsigned int* HP_script_array_cpy_list(struct script_array *sa) { retVal___ = HPMHooks.source.script.array_cpy_list(sa); } if (HPMHooks.count.HP_script_array_cpy_list_post > 0) { - unsigned int* (*postHookFunc) (unsigned int* retVal___, struct script_array *sa); + unsigned int * (*postHookFunc) (unsigned int * retVal___, struct script_array *sa); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_array_cpy_list_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_array_cpy_list_post[hIndex].func; retVal___ = postHookFunc(retVal___, sa); @@ -82106,11 +82106,11 @@ uint8 HP_script_add_language(const char *name) { } return retVal___; } -const char* HP_script_get_translation_dir_name(const char *directory) { +const char * HP_script_get_translation_dir_name(const char *directory) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_script_get_translation_dir_name_pre > 0) { - const char* (*preHookFunc) (const char **directory); + const char * (*preHookFunc) (const char **directory); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_translation_dir_name_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_script_get_translation_dir_name_pre[hIndex].func; @@ -82125,7 +82125,7 @@ const char* HP_script_get_translation_dir_name(const char *directory) { retVal___ = HPMHooks.source.script.get_translation_dir_name(directory); } if (HPMHooks.count.HP_script_get_translation_dir_name_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *directory); + const char * (*postHookFunc) (const char * retVal___, const char *directory); for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_translation_dir_name_post; hIndex++) { postHookFunc = HPMHooks.list.HP_script_get_translation_dir_name_post[hIndex].func; retVal___ = postHookFunc(retVal___, directory); @@ -82771,11 +82771,11 @@ int HP_showmsg_showMessageV(const char *string, va_list ap) { } return retVal___; } -const char* HP_showmsg_getLogFileName(void) { +const char * HP_showmsg_getLogFileName(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_showmsg_getLogFileName_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_showmsg_getLogFileName_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_showmsg_getLogFileName_pre[hIndex].func; @@ -82790,7 +82790,7 @@ const char* HP_showmsg_getLogFileName(void) { retVal___ = HPMHooks.source.showmsg.getLogFileName(); } if (HPMHooks.count.HP_showmsg_getLogFileName_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_showmsg_getLogFileName_post; hIndex++) { postHookFunc = HPMHooks.list.HP_showmsg_getLogFileName_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -84309,11 +84309,11 @@ int HP_skill_tree_get_max(int skill_id, int class) { } return retVal___; } -const char* HP_skill_get_name(int skill_id) { +const char * HP_skill_get_name(int skill_id) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_skill_get_name_pre > 0) { - const char* (*preHookFunc) (int *skill_id); + const char * (*preHookFunc) (int *skill_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_name_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_skill_get_name_pre[hIndex].func; @@ -84328,7 +84328,7 @@ const char* HP_skill_get_name(int skill_id) { retVal___ = HPMHooks.source.skill.get_name(skill_id); } if (HPMHooks.count.HP_skill_get_name_post > 0) { - const char* (*postHookFunc) (const char* retVal___, int skill_id); + const char * (*postHookFunc) (const char * retVal___, int skill_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_name_post; hIndex++) { postHookFunc = HPMHooks.list.HP_skill_get_name_post[hIndex].func; retVal___ = postHookFunc(retVal___, skill_id); @@ -84336,11 +84336,11 @@ const char* HP_skill_get_name(int skill_id) { } return retVal___; } -const char* HP_skill_get_desc(int skill_id) { +const char * HP_skill_get_desc(int skill_id) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_skill_get_desc_pre > 0) { - const char* (*preHookFunc) (int *skill_id); + const char * (*preHookFunc) (int *skill_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_desc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_skill_get_desc_pre[hIndex].func; @@ -84355,7 +84355,7 @@ const char* HP_skill_get_desc(int skill_id) { retVal___ = HPMHooks.source.skill.get_desc(skill_id); } if (HPMHooks.count.HP_skill_get_desc_post > 0) { - const char* (*postHookFunc) (const char* retVal___, int skill_id); + const char * (*postHookFunc) (const char * retVal___, int skill_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_desc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_skill_get_desc_post[hIndex].func; retVal___ = postHookFunc(retVal___, skill_id); @@ -84795,11 +84795,11 @@ int HP_skill_strip_equip(struct block_list *bl, unsigned short where, int rate, } return retVal___; } -struct skill_unit_group* HP_skill_id2group(int group_id) { +struct skill_unit_group * HP_skill_id2group(int group_id) { int hIndex = 0; - struct skill_unit_group* retVal___ = NULL; + struct skill_unit_group * retVal___ = NULL; if (HPMHooks.count.HP_skill_id2group_pre > 0) { - struct skill_unit_group* (*preHookFunc) (int *group_id); + struct skill_unit_group * (*preHookFunc) (int *group_id); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_id2group_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_skill_id2group_pre[hIndex].func; @@ -84814,7 +84814,7 @@ struct skill_unit_group* HP_skill_id2group(int group_id) { retVal___ = HPMHooks.source.skill.id2group(group_id); } if (HPMHooks.count.HP_skill_id2group_post > 0) { - struct skill_unit_group* (*postHookFunc) (struct skill_unit_group* retVal___, int group_id); + struct skill_unit_group * (*postHookFunc) (struct skill_unit_group * retVal___, int group_id); for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_id2group_post; hIndex++) { postHookFunc = HPMHooks.list.HP_skill_id2group_post[hIndex].func; retVal___ = postHookFunc(retVal___, group_id); @@ -84822,11 +84822,11 @@ struct skill_unit_group* HP_skill_id2group(int group_id) { } return retVal___; } -struct skill_unit_group* HP_skill_unitsetting(struct block_list *src, uint16 skill_id, uint16 skill_lv, short x, short y, int flag) { +struct skill_unit_group * HP_skill_unitsetting(struct block_list *src, uint16 skill_id, uint16 skill_lv, short x, short y, int flag) { int hIndex = 0; - struct skill_unit_group* retVal___ = NULL; + struct skill_unit_group * retVal___ = NULL; if (HPMHooks.count.HP_skill_unitsetting_pre > 0) { - struct skill_unit_group* (*preHookFunc) (struct block_list **src, uint16 *skill_id, uint16 *skill_lv, short *x, short *y, int *flag); + struct skill_unit_group * (*preHookFunc) (struct block_list **src, uint16 *skill_id, uint16 *skill_lv, short *x, short *y, int *flag); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_unitsetting_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_skill_unitsetting_pre[hIndex].func; @@ -84841,7 +84841,7 @@ struct skill_unit_group* HP_skill_unitsetting(struct block_list *src, uint16 ski retVal___ = HPMHooks.source.skill.unitsetting(src, skill_id, skill_lv, x, y, flag); } if (HPMHooks.count.HP_skill_unitsetting_post > 0) { - struct skill_unit_group* (*postHookFunc) (struct skill_unit_group* retVal___, struct block_list *src, uint16 skill_id, uint16 skill_lv, short x, short y, int flag); + struct skill_unit_group * (*postHookFunc) (struct skill_unit_group * retVal___, struct block_list *src, uint16 skill_id, uint16 skill_lv, short x, short y, int flag); for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_unitsetting_post; hIndex++) { postHookFunc = HPMHooks.list.HP_skill_unitsetting_post[hIndex].func; retVal___ = postHookFunc(retVal___, src, skill_id, skill_lv, x, y, flag); @@ -84849,11 +84849,11 @@ struct skill_unit_group* HP_skill_unitsetting(struct block_list *src, uint16 ski } return retVal___; } -struct skill_unit* HP_skill_initunit(struct skill_unit_group *group, int idx, int x, int y, int val1, int val2) { +struct skill_unit * HP_skill_initunit(struct skill_unit_group *group, int idx, int x, int y, int val1, int val2) { int hIndex = 0; - struct skill_unit* retVal___ = NULL; + struct skill_unit * retVal___ = NULL; if (HPMHooks.count.HP_skill_initunit_pre > 0) { - struct skill_unit* (*preHookFunc) (struct skill_unit_group **group, int *idx, int *x, int *y, int *val1, int *val2); + struct skill_unit * (*preHookFunc) (struct skill_unit_group **group, int *idx, int *x, int *y, int *val1, int *val2); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_initunit_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_skill_initunit_pre[hIndex].func; @@ -84868,7 +84868,7 @@ struct skill_unit* HP_skill_initunit(struct skill_unit_group *group, int idx, in retVal___ = HPMHooks.source.skill.initunit(group, idx, x, y, val1, val2); } if (HPMHooks.count.HP_skill_initunit_post > 0) { - struct skill_unit* (*postHookFunc) (struct skill_unit* retVal___, struct skill_unit_group *group, int idx, int x, int y, int val1, int val2); + struct skill_unit * (*postHookFunc) (struct skill_unit * retVal___, struct skill_unit_group *group, int idx, int x, int y, int val1, int val2); for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_initunit_post; hIndex++) { postHookFunc = HPMHooks.list.HP_skill_initunit_post[hIndex].func; retVal___ = postHookFunc(retVal___, group, idx, x, y, val1, val2); @@ -84903,11 +84903,11 @@ int HP_skill_delunit(struct skill_unit *su) { } return retVal___; } -struct skill_unit_group* HP_skill_init_unitgroup(struct block_list *src, int count, uint16 skill_id, uint16 skill_lv, int unit_id, int limit, int interval) { +struct skill_unit_group * HP_skill_init_unitgroup(struct block_list *src, int count, uint16 skill_id, uint16 skill_lv, int unit_id, int limit, int interval) { int hIndex = 0; - struct skill_unit_group* retVal___ = NULL; + struct skill_unit_group * retVal___ = NULL; if (HPMHooks.count.HP_skill_init_unitgroup_pre > 0) { - struct skill_unit_group* (*preHookFunc) (struct block_list **src, int *count, uint16 *skill_id, uint16 *skill_lv, int *unit_id, int *limit, int *interval); + struct skill_unit_group * (*preHookFunc) (struct block_list **src, int *count, uint16 *skill_id, uint16 *skill_lv, int *unit_id, int *limit, int *interval); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_init_unitgroup_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_skill_init_unitgroup_pre[hIndex].func; @@ -84922,7 +84922,7 @@ struct skill_unit_group* HP_skill_init_unitgroup(struct block_list *src, int cou retVal___ = HPMHooks.source.skill.init_unitgroup(src, count, skill_id, skill_lv, unit_id, limit, interval); } if (HPMHooks.count.HP_skill_init_unitgroup_post > 0) { - struct skill_unit_group* (*postHookFunc) (struct skill_unit_group* retVal___, struct block_list *src, int count, uint16 skill_id, uint16 skill_lv, int unit_id, int limit, int interval); + struct skill_unit_group * (*postHookFunc) (struct skill_unit_group * retVal___, struct block_list *src, int count, uint16 skill_id, uint16 skill_lv, int unit_id, int limit, int interval); for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_init_unitgroup_post; hIndex++) { postHookFunc = HPMHooks.list.HP_skill_init_unitgroup_post[hIndex].func; retVal___ = postHookFunc(retVal___, src, count, skill_id, skill_lv, unit_id, limit, interval); @@ -86837,11 +86837,11 @@ int HP_skill_check_condition_mercenary(struct block_list *bl, int skill_id, int } return retVal___; } -struct skill_unit_group* HP_skill_locate_element_field(struct block_list *bl) { +struct skill_unit_group * HP_skill_locate_element_field(struct block_list *bl) { int hIndex = 0; - struct skill_unit_group* retVal___ = NULL; + struct skill_unit_group * retVal___ = NULL; if (HPMHooks.count.HP_skill_locate_element_field_pre > 0) { - struct skill_unit_group* (*preHookFunc) (struct block_list **bl); + struct skill_unit_group * (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_locate_element_field_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_skill_locate_element_field_pre[hIndex].func; @@ -86856,7 +86856,7 @@ struct skill_unit_group* HP_skill_locate_element_field(struct block_list *bl) { retVal___ = HPMHooks.source.skill.locate_element_field(bl); } if (HPMHooks.count.HP_skill_locate_element_field_post > 0) { - struct skill_unit_group* (*postHookFunc) (struct skill_unit_group* retVal___, struct block_list *bl); + struct skill_unit_group * (*postHookFunc) (struct skill_unit_group * retVal___, struct block_list *bl); for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_locate_element_field_post; hIndex++) { postHookFunc = HPMHooks.list.HP_skill_locate_element_field_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl); @@ -86990,11 +86990,11 @@ int HP_skill_dance_overlap(struct skill_unit *su, int flag) { } return retVal___; } -struct s_skill_unit_layout* HP_skill_get_unit_layout(uint16 skill_id, uint16 skill_lv, struct block_list *src, int x, int y) { +struct s_skill_unit_layout * HP_skill_get_unit_layout(uint16 skill_id, uint16 skill_lv, struct block_list *src, int x, int y) { int hIndex = 0; - struct s_skill_unit_layout* retVal___ = NULL; + struct s_skill_unit_layout * retVal___ = NULL; if (HPMHooks.count.HP_skill_get_unit_layout_pre > 0) { - struct s_skill_unit_layout* (*preHookFunc) (uint16 *skill_id, uint16 *skill_lv, struct block_list **src, int *x, int *y); + struct s_skill_unit_layout * (*preHookFunc) (uint16 *skill_id, uint16 *skill_lv, struct block_list **src, int *x, int *y); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_unit_layout_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_skill_get_unit_layout_pre[hIndex].func; @@ -87009,7 +87009,7 @@ struct s_skill_unit_layout* HP_skill_get_unit_layout(uint16 skill_id, uint16 ski retVal___ = HPMHooks.source.skill.get_unit_layout(skill_id, skill_lv, src, x, y); } if (HPMHooks.count.HP_skill_get_unit_layout_post > 0) { - struct s_skill_unit_layout* (*postHookFunc) (struct s_skill_unit_layout* retVal___, uint16 skill_id, uint16 skill_lv, struct block_list *src, int x, int y); + struct s_skill_unit_layout * (*postHookFunc) (struct s_skill_unit_layout * retVal___, uint16 skill_id, uint16 skill_lv, struct block_list *src, int x, int y); for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_get_unit_layout_post; hIndex++) { postHookFunc = HPMHooks.list.HP_skill_get_unit_layout_post[hIndex].func; retVal___ = postHookFunc(retVal___, skill_id, skill_lv, src, x, y); @@ -87116,11 +87116,11 @@ int HP_skill_destroy_trap(struct block_list *bl, va_list ap) { } return retVal___; } -struct skill_unit_group_tickset* HP_skill_unitgrouptickset_search(struct block_list *bl, struct skill_unit_group *group, int64 tick) { +struct skill_unit_group_tickset * HP_skill_unitgrouptickset_search(struct block_list *bl, struct skill_unit_group *group, int64 tick) { int hIndex = 0; - struct skill_unit_group_tickset* retVal___ = NULL; + struct skill_unit_group_tickset * retVal___ = NULL; if (HPMHooks.count.HP_skill_unitgrouptickset_search_pre > 0) { - struct skill_unit_group_tickset* (*preHookFunc) (struct block_list **bl, struct skill_unit_group **group, int64 *tick); + struct skill_unit_group_tickset * (*preHookFunc) (struct block_list **bl, struct skill_unit_group **group, int64 *tick); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_unitgrouptickset_search_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_skill_unitgrouptickset_search_pre[hIndex].func; @@ -87135,7 +87135,7 @@ struct skill_unit_group_tickset* HP_skill_unitgrouptickset_search(struct block_l retVal___ = HPMHooks.source.skill.unitgrouptickset_search(bl, group, tick); } if (HPMHooks.count.HP_skill_unitgrouptickset_search_post > 0) { - struct skill_unit_group_tickset* (*postHookFunc) (struct skill_unit_group_tickset* retVal___, struct block_list *bl, struct skill_unit_group *group, int64 tick); + struct skill_unit_group_tickset * (*postHookFunc) (struct skill_unit_group_tickset * retVal___, struct block_list *bl, struct skill_unit_group *group, int64 tick); for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_unitgrouptickset_search_post; hIndex++) { postHookFunc = HPMHooks.list.HP_skill_unitgrouptickset_search_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl, group, tick); @@ -91924,11 +91924,11 @@ uint32 HP_sockt_host2ip(const char *hostname) { } return retVal___; } -const char* HP_sockt_ip2str(uint32 ip, char *ip_str) { +const char * HP_sockt_ip2str(uint32 ip, char *ip_str) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sockt_ip2str_pre > 0) { - const char* (*preHookFunc) (uint32 *ip, char **ip_str); + const char * (*preHookFunc) (uint32 *ip, char **ip_str); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sockt_ip2str_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sockt_ip2str_pre[hIndex].func; @@ -91943,7 +91943,7 @@ const char* HP_sockt_ip2str(uint32 ip, char *ip_str) { retVal___ = HPMHooks.source.sockt.ip2str(ip, ip_str); } if (HPMHooks.count.HP_sockt_ip2str_post > 0) { - const char* (*postHookFunc) (const char* retVal___, uint32 ip, char *ip_str); + const char * (*postHookFunc) (const char * retVal___, uint32 ip, char *ip_str); for (hIndex = 0; hIndex < HPMHooks.count.HP_sockt_ip2str_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sockt_ip2str_post[hIndex].func; retVal___ = postHookFunc(retVal___, ip, ip_str); @@ -92682,11 +92682,11 @@ void HP_SQL_Free(struct Sql *self) { } return; } -struct Sql* HP_SQL_Malloc(void) { +struct Sql * HP_SQL_Malloc(void) { int hIndex = 0; - struct Sql* retVal___ = NULL; + struct Sql * retVal___ = NULL; if (HPMHooks.count.HP_SQL_Malloc_pre > 0) { - struct Sql* (*preHookFunc) (void); + struct Sql * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Malloc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_SQL_Malloc_pre[hIndex].func; @@ -92701,7 +92701,7 @@ struct Sql* HP_SQL_Malloc(void) { retVal___ = HPMHooks.source.SQL.Malloc(); } if (HPMHooks.count.HP_SQL_Malloc_post > 0) { - struct Sql* (*postHookFunc) (struct Sql* retVal___); + struct Sql * (*postHookFunc) (struct Sql * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_SQL_Malloc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_SQL_Malloc_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -92709,11 +92709,11 @@ struct Sql* HP_SQL_Malloc(void) { } return retVal___; } -struct SqlStmt* HP_SQL_StmtMalloc(struct Sql *sql) { +struct SqlStmt * HP_SQL_StmtMalloc(struct Sql *sql) { int hIndex = 0; - struct SqlStmt* retVal___ = NULL; + struct SqlStmt * retVal___ = NULL; if (HPMHooks.count.HP_SQL_StmtMalloc_pre > 0) { - struct SqlStmt* (*preHookFunc) (struct Sql **sql); + struct SqlStmt * (*preHookFunc) (struct Sql **sql); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtMalloc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_SQL_StmtMalloc_pre[hIndex].func; @@ -92728,7 +92728,7 @@ struct SqlStmt* HP_SQL_StmtMalloc(struct Sql *sql) { retVal___ = HPMHooks.source.SQL.StmtMalloc(sql); } if (HPMHooks.count.HP_SQL_StmtMalloc_post > 0) { - struct SqlStmt* (*postHookFunc) (struct SqlStmt* retVal___, struct Sql *sql); + struct SqlStmt * (*postHookFunc) (struct SqlStmt * retVal___, struct Sql *sql); for (hIndex = 0; hIndex < HPMHooks.count.HP_SQL_StmtMalloc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_SQL_StmtMalloc_post[hIndex].func; retVal___ = postHookFunc(retVal___, sql); @@ -93495,11 +93495,11 @@ int HP_status_fixed_revive(struct block_list *bl, unsigned int per_hp, unsigned } return retVal___; } -struct regen_data* HP_status_get_regen_data(struct block_list *bl) { +struct regen_data * HP_status_get_regen_data(struct block_list *bl) { int hIndex = 0; - struct regen_data* retVal___ = NULL; + struct regen_data * retVal___ = NULL; if (HPMHooks.count.HP_status_get_regen_data_pre > 0) { - struct regen_data* (*preHookFunc) (struct block_list **bl); + struct regen_data * (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_status_get_regen_data_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_status_get_regen_data_pre[hIndex].func; @@ -93514,7 +93514,7 @@ struct regen_data* HP_status_get_regen_data(struct block_list *bl) { retVal___ = HPMHooks.source.status.get_regen_data(bl); } if (HPMHooks.count.HP_status_get_regen_data_post > 0) { - struct regen_data* (*postHookFunc) (struct regen_data* retVal___, struct block_list *bl); + struct regen_data * (*postHookFunc) (struct regen_data * retVal___, struct block_list *bl); for (hIndex = 0; hIndex < HPMHooks.count.HP_status_get_regen_data_post; hIndex++) { postHookFunc = HPMHooks.list.HP_status_get_regen_data_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl); @@ -93522,11 +93522,11 @@ struct regen_data* HP_status_get_regen_data(struct block_list *bl) { } return retVal___; } -struct status_data* HP_status_get_status_data(struct block_list *bl) { +struct status_data * HP_status_get_status_data(struct block_list *bl) { int hIndex = 0; - struct status_data* retVal___ = NULL; + struct status_data * retVal___ = NULL; if (HPMHooks.count.HP_status_get_status_data_pre > 0) { - struct status_data* (*preHookFunc) (struct block_list **bl); + struct status_data * (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_status_get_status_data_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_status_get_status_data_pre[hIndex].func; @@ -93541,7 +93541,7 @@ struct status_data* HP_status_get_status_data(struct block_list *bl) { retVal___ = HPMHooks.source.status.get_status_data(bl); } if (HPMHooks.count.HP_status_get_status_data_post > 0) { - struct status_data* (*postHookFunc) (struct status_data* retVal___, struct block_list *bl); + struct status_data * (*postHookFunc) (struct status_data * retVal___, struct block_list *bl); for (hIndex = 0; hIndex < HPMHooks.count.HP_status_get_status_data_post; hIndex++) { postHookFunc = HPMHooks.list.HP_status_get_status_data_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl); @@ -93549,11 +93549,11 @@ struct status_data* HP_status_get_status_data(struct block_list *bl) { } return retVal___; } -struct status_data* HP_status_get_base_status(struct block_list *bl) { +struct status_data * HP_status_get_base_status(struct block_list *bl) { int hIndex = 0; - struct status_data* retVal___ = NULL; + struct status_data * retVal___ = NULL; if (HPMHooks.count.HP_status_get_base_status_pre > 0) { - struct status_data* (*preHookFunc) (struct block_list **bl); + struct status_data * (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_status_get_base_status_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_status_get_base_status_pre[hIndex].func; @@ -93568,7 +93568,7 @@ struct status_data* HP_status_get_base_status(struct block_list *bl) { retVal___ = HPMHooks.source.status.get_base_status(bl); } if (HPMHooks.count.HP_status_get_base_status_post > 0) { - struct status_data* (*postHookFunc) (struct status_data* retVal___, struct block_list *bl); + struct status_data * (*postHookFunc) (struct status_data * retVal___, struct block_list *bl); for (hIndex = 0; hIndex < HPMHooks.count.HP_status_get_base_status_post; hIndex++) { postHookFunc = HPMHooks.list.HP_status_get_base_status_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl); @@ -93576,11 +93576,11 @@ struct status_data* HP_status_get_base_status(struct block_list *bl) { } return retVal___; } -const char* HP_status_get_name(const struct block_list *bl) { +const char * HP_status_get_name(const struct block_list *bl) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_status_get_name_pre > 0) { - const char* (*preHookFunc) (const struct block_list **bl); + const char * (*preHookFunc) (const struct block_list **bl); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_status_get_name_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_status_get_name_pre[hIndex].func; @@ -93595,7 +93595,7 @@ const char* HP_status_get_name(const struct block_list *bl) { retVal___ = HPMHooks.source.status.get_name(bl); } if (HPMHooks.count.HP_status_get_name_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const struct block_list *bl); + const char * (*postHookFunc) (const char * retVal___, const struct block_list *bl); for (hIndex = 0; hIndex < HPMHooks.count.HP_status_get_name_post; hIndex++) { postHookFunc = HPMHooks.list.HP_status_get_name_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl); @@ -93900,11 +93900,11 @@ int HP_status_get_race2(const struct block_list *bl) { } return retVal___; } -struct view_data* HP_status_get_viewdata(struct block_list *bl) { +struct view_data * HP_status_get_viewdata(struct block_list *bl) { int hIndex = 0; - struct view_data* retVal___ = NULL; + struct view_data * retVal___ = NULL; if (HPMHooks.count.HP_status_get_viewdata_pre > 0) { - struct view_data* (*preHookFunc) (struct block_list **bl); + struct view_data * (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_status_get_viewdata_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_status_get_viewdata_pre[hIndex].func; @@ -93919,7 +93919,7 @@ struct view_data* HP_status_get_viewdata(struct block_list *bl) { retVal___ = HPMHooks.source.status.get_viewdata(bl); } if (HPMHooks.count.HP_status_get_viewdata_post > 0) { - struct view_data* (*postHookFunc) (struct view_data* retVal___, struct block_list *bl); + struct view_data * (*postHookFunc) (struct view_data * retVal___, struct block_list *bl); for (hIndex = 0; hIndex < HPMHooks.count.HP_status_get_viewdata_post; hIndex++) { postHookFunc = HPMHooks.list.HP_status_get_viewdata_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl); @@ -93979,11 +93979,11 @@ void HP_status_change_init(struct block_list *bl) { } return; } -struct status_change* HP_status_get_sc(struct block_list *bl) { +struct status_change * HP_status_get_sc(struct block_list *bl) { int hIndex = 0; - struct status_change* retVal___ = NULL; + struct status_change * retVal___ = NULL; if (HPMHooks.count.HP_status_get_sc_pre > 0) { - struct status_change* (*preHookFunc) (struct block_list **bl); + struct status_change * (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_status_get_sc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_status_get_sc_pre[hIndex].func; @@ -93998,7 +93998,7 @@ struct status_change* HP_status_get_sc(struct block_list *bl) { retVal___ = HPMHooks.source.status.get_sc(bl); } if (HPMHooks.count.HP_status_get_sc_post > 0) { - struct status_change* (*postHookFunc) (struct status_change* retVal___, struct block_list *bl); + struct status_change * (*postHookFunc) (struct status_change * retVal___, struct block_list *bl); for (hIndex = 0; hIndex < HPMHooks.count.HP_status_get_sc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_status_get_sc_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl); @@ -95587,11 +95587,11 @@ unsigned int HP_status_get_base_maxhp(const struct map_session_data *sd, const s } return retVal___; } -struct s_maxhp_entry* HP_status_get_maxhp_cap_entry(int classidx, int level) { +struct s_maxhp_entry * HP_status_get_maxhp_cap_entry(int classidx, int level) { int hIndex = 0; - struct s_maxhp_entry* retVal___ = NULL; + struct s_maxhp_entry * retVal___ = NULL; if (HPMHooks.count.HP_status_get_maxhp_cap_entry_pre > 0) { - struct s_maxhp_entry* (*preHookFunc) (int *classidx, int *level); + struct s_maxhp_entry * (*preHookFunc) (int *classidx, int *level); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_status_get_maxhp_cap_entry_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_status_get_maxhp_cap_entry_pre[hIndex].func; @@ -95606,7 +95606,7 @@ struct s_maxhp_entry* HP_status_get_maxhp_cap_entry(int classidx, int level) { retVal___ = HPMHooks.source.status.get_maxhp_cap_entry(classidx, level); } if (HPMHooks.count.HP_status_get_maxhp_cap_entry_post > 0) { - struct s_maxhp_entry* (*postHookFunc) (struct s_maxhp_entry* retVal___, int classidx, int level); + struct s_maxhp_entry * (*postHookFunc) (struct s_maxhp_entry * retVal___, int classidx, int level); for (hIndex = 0; hIndex < HPMHooks.count.HP_status_get_maxhp_cap_entry_post; hIndex++) { postHookFunc = HPMHooks.list.HP_status_get_maxhp_cap_entry_post[hIndex].func; retVal___ = postHookFunc(retVal___, classidx, level); @@ -97203,6 +97203,58 @@ void HP_status_check_job_bonus(int idx, const char *name, int class) { return; } /* storage_interface */ +void HP_storage_init(bool minimal) { + int hIndex = 0; + if (HPMHooks.count.HP_storage_init_pre > 0) { + void (*preHookFunc) (bool *minimal); + *HPMforce_return = false; + for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_init_pre; hIndex++) { + preHookFunc = HPMHooks.list.HP_storage_init_pre[hIndex].func; + preHookFunc(&minimal); + } + if (*HPMforce_return) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.storage.init(minimal); + } + if (HPMHooks.count.HP_storage_init_post > 0) { + void (*postHookFunc) (bool minimal); + for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_init_post; hIndex++) { + postHookFunc = HPMHooks.list.HP_storage_init_post[hIndex].func; + postHookFunc(minimal); + } + } + return; +} +void HP_storage_final(void) { + int hIndex = 0; + if (HPMHooks.count.HP_storage_final_pre > 0) { + void (*preHookFunc) (void); + *HPMforce_return = false; + for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_final_pre; hIndex++) { + preHookFunc = HPMHooks.list.HP_storage_final_pre[hIndex].func; + preHookFunc(); + } + if (*HPMforce_return) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.storage.final(); + } + if (HPMHooks.count.HP_storage_final_post > 0) { + void (*postHookFunc) (void); + for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_final_post; hIndex++) { + postHookFunc = HPMHooks.list.HP_storage_final_post[hIndex].func; + postHookFunc(); + } + } + return; +} void HP_storage_reconnect(void) { int hIndex = 0; if (HPMHooks.count.HP_storage_reconnect_pre > 0) { @@ -97229,15 +97281,149 @@ void HP_storage_reconnect(void) { } return; } -int HP_storage_delitem(struct map_session_data *sd, int n, int amount) { +bool HP_storage_config_read(const char *filename, bool imported) { + int hIndex = 0; + bool retVal___ = false; + if (HPMHooks.count.HP_storage_config_read_pre > 0) { + bool (*preHookFunc) (const char **filename, bool *imported); + *HPMforce_return = false; + for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_config_read_pre; hIndex++) { + preHookFunc = HPMHooks.list.HP_storage_config_read_pre[hIndex].func; + retVal___ = preHookFunc(&filename, &imported); + } + if (*HPMforce_return) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.storage.config_read(filename, imported); + } + if (HPMHooks.count.HP_storage_config_read_post > 0) { + bool (*postHookFunc) (bool retVal___, const char *filename, bool imported); + for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_config_read_post; hIndex++) { + postHookFunc = HPMHooks.list.HP_storage_config_read_post[hIndex].func; + retVal___ = postHookFunc(retVal___, filename, imported); + } + } + return retVal___; +} +void HP_storage_config_read_additional_fields(struct config_setting_t *t, struct storage_settings *s_conf, const char *filename) { + int hIndex = 0; + if (HPMHooks.count.HP_storage_config_read_additional_fields_pre > 0) { + void (*preHookFunc) (struct config_setting_t **t, struct storage_settings **s_conf, const char **filename); + *HPMforce_return = false; + for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_config_read_additional_fields_pre; hIndex++) { + preHookFunc = HPMHooks.list.HP_storage_config_read_additional_fields_pre[hIndex].func; + preHookFunc(&t, &s_conf, &filename); + } + if (*HPMforce_return) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.storage.config_read_additional_fields(t, s_conf, filename); + } + if (HPMHooks.count.HP_storage_config_read_additional_fields_post > 0) { + void (*postHookFunc) (struct config_setting_t *t, struct storage_settings *s_conf, const char *filename); + for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_config_read_additional_fields_post; hIndex++) { + postHookFunc = HPMHooks.list.HP_storage_config_read_additional_fields_post[hIndex].func; + postHookFunc(t, s_conf, filename); + } + } + return; +} +int HP_storage_get_id_by_name(const char *storage_name) { + int hIndex = 0; + int retVal___ = 0; + if (HPMHooks.count.HP_storage_get_id_by_name_pre > 0) { + int (*preHookFunc) (const char **storage_name); + *HPMforce_return = false; + for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_get_id_by_name_pre; hIndex++) { + preHookFunc = HPMHooks.list.HP_storage_get_id_by_name_pre[hIndex].func; + retVal___ = preHookFunc(&storage_name); + } + if (*HPMforce_return) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.storage.get_id_by_name(storage_name); + } + if (HPMHooks.count.HP_storage_get_id_by_name_post > 0) { + int (*postHookFunc) (int retVal___, const char *storage_name); + for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_get_id_by_name_post; hIndex++) { + postHookFunc = HPMHooks.list.HP_storage_get_id_by_name_post[hIndex].func; + retVal___ = postHookFunc(retVal___, storage_name); + } + } + return retVal___; +} +struct storage_data * HP_storage_ensure(struct map_session_data *sd, int storage_id) { + int hIndex = 0; + struct storage_data * retVal___ = NULL; + if (HPMHooks.count.HP_storage_ensure_pre > 0) { + struct storage_data * (*preHookFunc) (struct map_session_data **sd, int *storage_id); + *HPMforce_return = false; + for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_ensure_pre; hIndex++) { + preHookFunc = HPMHooks.list.HP_storage_ensure_pre[hIndex].func; + retVal___ = preHookFunc(&sd, &storage_id); + } + if (*HPMforce_return) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.storage.ensure(sd, storage_id); + } + if (HPMHooks.count.HP_storage_ensure_post > 0) { + struct storage_data * (*postHookFunc) (struct storage_data * retVal___, struct map_session_data *sd, int storage_id); + for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_ensure_post; hIndex++) { + postHookFunc = HPMHooks.list.HP_storage_ensure_post[hIndex].func; + retVal___ = postHookFunc(retVal___, sd, storage_id); + } + } + return retVal___; +} +const struct storage_settings * HP_storage_get_settings(int storage_id) { + int hIndex = 0; + const struct storage_settings * retVal___ = NULL; + if (HPMHooks.count.HP_storage_get_settings_pre > 0) { + const struct storage_settings * (*preHookFunc) (int *storage_id); + *HPMforce_return = false; + for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_get_settings_pre; hIndex++) { + preHookFunc = HPMHooks.list.HP_storage_get_settings_pre[hIndex].func; + retVal___ = preHookFunc(&storage_id); + } + if (*HPMforce_return) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.storage.get_settings(storage_id); + } + if (HPMHooks.count.HP_storage_get_settings_post > 0) { + const struct storage_settings * (*postHookFunc) (const struct storage_settings * retVal___, int storage_id); + for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_get_settings_post; hIndex++) { + postHookFunc = HPMHooks.list.HP_storage_get_settings_post[hIndex].func; + retVal___ = postHookFunc(retVal___, storage_id); + } + } + return retVal___; +} +int HP_storage_delitem(struct map_session_data *sd, struct storage_data *stor, int n, int amount) { int hIndex = 0; int retVal___ = 0; if (HPMHooks.count.HP_storage_delitem_pre > 0) { - int (*preHookFunc) (struct map_session_data **sd, int *n, int *amount); + int (*preHookFunc) (struct map_session_data **sd, struct storage_data **stor, int *n, int *amount); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_delitem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_storage_delitem_pre[hIndex].func; - retVal___ = preHookFunc(&sd, &n, &amount); + retVal___ = preHookFunc(&sd, &stor, &n, &amount); } if (*HPMforce_return) { *HPMforce_return = false; @@ -97245,26 +97431,26 @@ int HP_storage_delitem(struct map_session_data *sd, int n, int amount) { } } { - retVal___ = HPMHooks.source.storage.delitem(sd, n, amount); + retVal___ = HPMHooks.source.storage.delitem(sd, stor, n, amount); } if (HPMHooks.count.HP_storage_delitem_post > 0) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int n, int amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct storage_data *stor, int n, int amount); for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_delitem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_storage_delitem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, n, amount); + retVal___ = postHookFunc(retVal___, sd, stor, n, amount); } } return retVal___; } -int HP_storage_open(struct map_session_data *sd) { +int HP_storage_open(struct map_session_data *sd, struct storage_data *stor, enum storage_access_modes mode) { int hIndex = 0; int retVal___ = 0; if (HPMHooks.count.HP_storage_open_pre > 0) { - int (*preHookFunc) (struct map_session_data **sd); + int (*preHookFunc) (struct map_session_data **sd, struct storage_data **stor, enum storage_access_modes *mode); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_open_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_storage_open_pre[hIndex].func; - retVal___ = preHookFunc(&sd); + retVal___ = preHookFunc(&sd, &stor, &mode); } if (*HPMforce_return) { *HPMforce_return = false; @@ -97272,26 +97458,26 @@ int HP_storage_open(struct map_session_data *sd) { } } { - retVal___ = HPMHooks.source.storage.open(sd); + retVal___ = HPMHooks.source.storage.open(sd, stor, mode); } if (HPMHooks.count.HP_storage_open_post > 0) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct storage_data *stor, enum storage_access_modes mode); for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_open_post; hIndex++) { postHookFunc = HPMHooks.list.HP_storage_open_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd); + retVal___ = postHookFunc(retVal___, sd, stor, mode); } } return retVal___; } -int HP_storage_add(struct map_session_data *sd, int index, int amount) { +int HP_storage_add(struct map_session_data *sd, struct storage_data *stor, int index, int amount) { int hIndex = 0; int retVal___ = 0; if (HPMHooks.count.HP_storage_add_pre > 0) { - int (*preHookFunc) (struct map_session_data **sd, int *index, int *amount); + int (*preHookFunc) (struct map_session_data **sd, struct storage_data **stor, int *index, int *amount); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_add_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_storage_add_pre[hIndex].func; - retVal___ = preHookFunc(&sd, &index, &amount); + retVal___ = preHookFunc(&sd, &stor, &index, &amount); } if (*HPMforce_return) { *HPMforce_return = false; @@ -97299,26 +97485,26 @@ int HP_storage_add(struct map_session_data *sd, int index, int amount) { } } { - retVal___ = HPMHooks.source.storage.add(sd, index, amount); + retVal___ = HPMHooks.source.storage.add(sd, stor, index, amount); } if (HPMHooks.count.HP_storage_add_post > 0) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int index, int amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct storage_data *stor, int index, int amount); for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_add_post; hIndex++) { postHookFunc = HPMHooks.list.HP_storage_add_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, index, amount); + retVal___ = postHookFunc(retVal___, sd, stor, index, amount); } } return retVal___; } -int HP_storage_get(struct map_session_data *sd, int index, int amount) { +int HP_storage_get(struct map_session_data *sd, struct storage_data *stor, int index, int amount) { int hIndex = 0; int retVal___ = 0; if (HPMHooks.count.HP_storage_get_pre > 0) { - int (*preHookFunc) (struct map_session_data **sd, int *index, int *amount); + int (*preHookFunc) (struct map_session_data **sd, struct storage_data **stor, int *index, int *amount); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_get_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_storage_get_pre[hIndex].func; - retVal___ = preHookFunc(&sd, &index, &amount); + retVal___ = preHookFunc(&sd, &stor, &index, &amount); } if (*HPMforce_return) { *HPMforce_return = false; @@ -97326,26 +97512,26 @@ int HP_storage_get(struct map_session_data *sd, int index, int amount) { } } { - retVal___ = HPMHooks.source.storage.get(sd, index, amount); + retVal___ = HPMHooks.source.storage.get(sd, stor, index, amount); } if (HPMHooks.count.HP_storage_get_post > 0) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int index, int amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct storage_data *stor, int index, int amount); for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_get_post; hIndex++) { postHookFunc = HPMHooks.list.HP_storage_get_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, index, amount); + retVal___ = postHookFunc(retVal___, sd, stor, index, amount); } } return retVal___; } -int HP_storage_additem(struct map_session_data *sd, struct item *item_data, int amount) { +int HP_storage_additem(struct map_session_data *sd, struct storage_data *stor, struct item *item_data, int amount) { int hIndex = 0; int retVal___ = 0; if (HPMHooks.count.HP_storage_additem_pre > 0) { - int (*preHookFunc) (struct map_session_data **sd, struct item **item_data, int *amount); + int (*preHookFunc) (struct map_session_data **sd, struct storage_data **stor, struct item **item_data, int *amount); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_additem_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_storage_additem_pre[hIndex].func; - retVal___ = preHookFunc(&sd, &item_data, &amount); + retVal___ = preHookFunc(&sd, &stor, &item_data, &amount); } if (*HPMforce_return) { *HPMforce_return = false; @@ -97353,26 +97539,26 @@ int HP_storage_additem(struct map_session_data *sd, struct item *item_data, int } } { - retVal___ = HPMHooks.source.storage.additem(sd, item_data, amount); + retVal___ = HPMHooks.source.storage.additem(sd, stor, item_data, amount); } if (HPMHooks.count.HP_storage_additem_post > 0) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct item *item_data, int amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct storage_data *stor, struct item *item_data, int amount); for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_additem_post; hIndex++) { postHookFunc = HPMHooks.list.HP_storage_additem_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, item_data, amount); + retVal___ = postHookFunc(retVal___, sd, stor, item_data, amount); } } return retVal___; } -int HP_storage_addfromcart(struct map_session_data *sd, int index, int amount) { +int HP_storage_addfromcart(struct map_session_data *sd, struct storage_data *stor, int index, int amount) { int hIndex = 0; int retVal___ = 0; if (HPMHooks.count.HP_storage_addfromcart_pre > 0) { - int (*preHookFunc) (struct map_session_data **sd, int *index, int *amount); + int (*preHookFunc) (struct map_session_data **sd, struct storage_data **stor, int *index, int *amount); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_addfromcart_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_storage_addfromcart_pre[hIndex].func; - retVal___ = preHookFunc(&sd, &index, &amount); + retVal___ = preHookFunc(&sd, &stor, &index, &amount); } if (*HPMforce_return) { *HPMforce_return = false; @@ -97380,26 +97566,26 @@ int HP_storage_addfromcart(struct map_session_data *sd, int index, int amount) { } } { - retVal___ = HPMHooks.source.storage.addfromcart(sd, index, amount); + retVal___ = HPMHooks.source.storage.addfromcart(sd, stor, index, amount); } if (HPMHooks.count.HP_storage_addfromcart_post > 0) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int index, int amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct storage_data *stor, int index, int amount); for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_addfromcart_post; hIndex++) { postHookFunc = HPMHooks.list.HP_storage_addfromcart_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, index, amount); + retVal___ = postHookFunc(retVal___, sd, stor, index, amount); } } return retVal___; } -int HP_storage_gettocart(struct map_session_data *sd, int index, int amount) { +int HP_storage_gettocart(struct map_session_data *sd, struct storage_data *stor, int index, int amount) { int hIndex = 0; int retVal___ = 0; if (HPMHooks.count.HP_storage_gettocart_pre > 0) { - int (*preHookFunc) (struct map_session_data **sd, int *index, int *amount); + int (*preHookFunc) (struct map_session_data **sd, struct storage_data **stor, int *index, int *amount); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_gettocart_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_storage_gettocart_pre[hIndex].func; - retVal___ = preHookFunc(&sd, &index, &amount); + retVal___ = preHookFunc(&sd, &stor, &index, &amount); } if (*HPMforce_return) { *HPMforce_return = false; @@ -97407,13 +97593,13 @@ int HP_storage_gettocart(struct map_session_data *sd, int index, int amount) { } } { - retVal___ = HPMHooks.source.storage.gettocart(sd, index, amount); + retVal___ = HPMHooks.source.storage.gettocart(sd, stor, index, amount); } if (HPMHooks.count.HP_storage_gettocart_post > 0) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int index, int amount); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct storage_data *stor, int index, int amount); for (hIndex = 0; hIndex < HPMHooks.count.HP_storage_gettocart_post; hIndex++) { postHookFunc = HPMHooks.list.HP_storage_gettocart_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, index, amount); + retVal___ = postHookFunc(retVal___, sd, stor, index, amount); } } return retVal___; @@ -97557,11 +97743,11 @@ int HP_storage_reconnect_sub(union DBKey key, struct DBData *data, va_list ap) { return retVal___; } /* stringbuf_interface */ -StringBuf* HP_StrBuf_Malloc(void) { +StringBuf * HP_StrBuf_Malloc(void) { int hIndex = 0; - StringBuf* retVal___ = NULL; + StringBuf * retVal___ = NULL; if (HPMHooks.count.HP_StrBuf_Malloc_pre > 0) { - StringBuf* (*preHookFunc) (void); + StringBuf * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Malloc_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_StrBuf_Malloc_pre[hIndex].func; @@ -97576,7 +97762,7 @@ StringBuf* HP_StrBuf_Malloc(void) { retVal___ = HPMHooks.source.StrBuf.Malloc(); } if (HPMHooks.count.HP_StrBuf_Malloc_post > 0) { - StringBuf* (*postHookFunc) (StringBuf* retVal___); + StringBuf * (*postHookFunc) (StringBuf * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Malloc_post; hIndex++) { postHookFunc = HPMHooks.list.HP_StrBuf_Malloc_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -97724,11 +97910,11 @@ int HP_StrBuf_Length(StringBuf *self) { } return retVal___; } -char* HP_StrBuf_Value(StringBuf *self) { +char * HP_StrBuf_Value(StringBuf *self) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_StrBuf_Value_pre > 0) { - char* (*preHookFunc) (StringBuf **self); + char * (*preHookFunc) (StringBuf **self); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Value_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_StrBuf_Value_pre[hIndex].func; @@ -97743,7 +97929,7 @@ char* HP_StrBuf_Value(StringBuf *self) { retVal___ = HPMHooks.source.StrBuf.Value(self); } if (HPMHooks.count.HP_StrBuf_Value_post > 0) { - char* (*postHookFunc) (char* retVal___, StringBuf *self); + char * (*postHookFunc) (char * retVal___, StringBuf *self); for (hIndex = 0; hIndex < HPMHooks.count.HP_StrBuf_Value_post; hIndex++) { postHookFunc = HPMHooks.list.HP_StrBuf_Value_post[hIndex].func; retVal___ = postHookFunc(retVal___, self); @@ -97830,11 +98016,11 @@ void HP_StrBuf_Free(StringBuf *self) { return; } /* strlib_interface */ -char* HP_strlib_jstrescape(char *pt) { +char * HP_strlib_jstrescape(char *pt) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_jstrescape_pre > 0) { - char* (*preHookFunc) (char **pt); + char * (*preHookFunc) (char **pt); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescape_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_jstrescape_pre[hIndex].func; @@ -97849,7 +98035,7 @@ char* HP_strlib_jstrescape(char *pt) { retVal___ = HPMHooks.source.strlib.jstrescape(pt); } if (HPMHooks.count.HP_strlib_jstrescape_post > 0) { - char* (*postHookFunc) (char* retVal___, char *pt); + char * (*postHookFunc) (char * retVal___, char *pt); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescape_post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_jstrescape_post[hIndex].func; retVal___ = postHookFunc(retVal___, pt); @@ -97857,11 +98043,11 @@ char* HP_strlib_jstrescape(char *pt) { } return retVal___; } -char* HP_strlib_jstrescapecpy(char *pt, const char *spt) { +char * HP_strlib_jstrescapecpy(char *pt, const char *spt) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_jstrescapecpy_pre > 0) { - char* (*preHookFunc) (char **pt, const char **spt); + char * (*preHookFunc) (char **pt, const char **spt); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescapecpy_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_jstrescapecpy_pre[hIndex].func; @@ -97876,7 +98062,7 @@ char* HP_strlib_jstrescapecpy(char *pt, const char *spt) { retVal___ = HPMHooks.source.strlib.jstrescapecpy(pt, spt); } if (HPMHooks.count.HP_strlib_jstrescapecpy_post > 0) { - char* (*postHookFunc) (char* retVal___, char *pt, const char *spt); + char * (*postHookFunc) (char * retVal___, char *pt, const char *spt); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_jstrescapecpy_post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_jstrescapecpy_post[hIndex].func; retVal___ = postHookFunc(retVal___, pt, spt); @@ -97938,11 +98124,11 @@ int HP_strlib_remove_control_chars_(char *str) { } return retVal___; } -char* HP_strlib_trim_(char *str) { +char * HP_strlib_trim_(char *str) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_trim__pre > 0) { - char* (*preHookFunc) (char **str); + char * (*preHookFunc) (char **str); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_trim__pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_trim__pre[hIndex].func; @@ -97957,7 +98143,7 @@ char* HP_strlib_trim_(char *str) { retVal___ = HPMHooks.source.strlib.trim_(str); } if (HPMHooks.count.HP_strlib_trim__post > 0) { - char* (*postHookFunc) (char* retVal___, char *str); + char * (*postHookFunc) (char * retVal___, char *str); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_trim__post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_trim__post[hIndex].func; retVal___ = postHookFunc(retVal___, str); @@ -97965,11 +98151,11 @@ char* HP_strlib_trim_(char *str) { } return retVal___; } -char* HP_strlib_normalize_name_(char *str, const char *delims) { +char * HP_strlib_normalize_name_(char *str, const char *delims) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_normalize_name__pre > 0) { - char* (*preHookFunc) (char **str, const char **delims); + char * (*preHookFunc) (char **str, const char **delims); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_normalize_name__pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_normalize_name__pre[hIndex].func; @@ -97984,7 +98170,7 @@ char* HP_strlib_normalize_name_(char *str, const char *delims) { retVal___ = HPMHooks.source.strlib.normalize_name_(str, delims); } if (HPMHooks.count.HP_strlib_normalize_name__post > 0) { - char* (*postHookFunc) (char* retVal___, char *str, const char *delims); + char * (*postHookFunc) (char * retVal___, char *str, const char *delims); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_normalize_name__post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_normalize_name__post[hIndex].func; retVal___ = postHookFunc(retVal___, str, delims); @@ -97992,11 +98178,11 @@ char* HP_strlib_normalize_name_(char *str, const char *delims) { } return retVal___; } -const char* HP_strlib_stristr_(const char *haystack, const char *needle) { +const char * HP_strlib_stristr_(const char *haystack, const char *needle) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_stristr__pre > 0) { - const char* (*preHookFunc) (const char **haystack, const char **needle); + const char * (*preHookFunc) (const char **haystack, const char **needle); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_stristr__pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_stristr__pre[hIndex].func; @@ -98011,7 +98197,7 @@ const char* HP_strlib_stristr_(const char *haystack, const char *needle) { retVal___ = HPMHooks.source.strlib.stristr_(haystack, needle); } if (HPMHooks.count.HP_strlib_stristr__post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *haystack, const char *needle); + const char * (*postHookFunc) (const char * retVal___, const char *haystack, const char *needle); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_stristr__post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_stristr__post[hIndex].func; retVal___ = postHookFunc(retVal___, haystack, needle); @@ -98046,11 +98232,11 @@ size_t HP_strlib_strnlen_(const char *string, size_t maxlen) { } return retVal___; } -char* HP_strlib_strtok_r_(char *s1, const char *s2, char **lasts) { +char * HP_strlib_strtok_r_(char *s1, const char *s2, char **lasts) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_strtok_r__pre > 0) { - char* (*preHookFunc) (char **s1, const char **s2, char ***lasts); + char * (*preHookFunc) (char **s1, const char **s2, char ***lasts); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strtok_r__pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_strtok_r__pre[hIndex].func; @@ -98065,7 +98251,7 @@ char* HP_strlib_strtok_r_(char *s1, const char *s2, char **lasts) { retVal___ = HPMHooks.source.strlib.strtok_r_(s1, s2, lasts); } if (HPMHooks.count.HP_strlib_strtok_r__post > 0) { - char* (*postHookFunc) (char* retVal___, char *s1, const char *s2, char **lasts); + char * (*postHookFunc) (char * retVal___, char *s1, const char *s2, char **lasts); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_strtok_r__post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_strtok_r__post[hIndex].func; retVal___ = postHookFunc(retVal___, s1, s2, lasts); @@ -98127,11 +98313,11 @@ int HP_strlib_config_switch_(const char *str) { } return retVal___; } -char* HP_strlib_safestrncpy_(char *dst, const char *src, size_t n) { +char * HP_strlib_safestrncpy_(char *dst, const char *src, size_t n) { int hIndex = 0; - char* retVal___ = NULL; + char * retVal___ = NULL; if (HPMHooks.count.HP_strlib_safestrncpy__pre > 0) { - char* (*preHookFunc) (char **dst, const char **src, size_t *n); + char * (*preHookFunc) (char **dst, const char **src, size_t *n); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_safestrncpy__pre; hIndex++) { preHookFunc = HPMHooks.list.HP_strlib_safestrncpy__pre[hIndex].func; @@ -98146,7 +98332,7 @@ char* HP_strlib_safestrncpy_(char *dst, const char *src, size_t n) { retVal___ = HPMHooks.source.strlib.safestrncpy_(dst, src, n); } if (HPMHooks.count.HP_strlib_safestrncpy__post > 0) { - char* (*postHookFunc) (char* retVal___, char *dst, const char *src, size_t n); + char * (*postHookFunc) (char * retVal___, char *dst, const char *src, size_t n); for (hIndex = 0; hIndex < HPMHooks.count.HP_strlib_safestrncpy__post; hIndex++) { postHookFunc = HPMHooks.list.HP_strlib_safestrncpy__post[hIndex].func; retVal___ = postHookFunc(retVal___, dst, src, n); @@ -98609,11 +98795,11 @@ size_t HP_sv_unescape_c(char *out_dest, const char *src, size_t len) { } return retVal___; } -const char* HP_sv_skip_escaped_c(const char *p) { +const char * HP_sv_skip_escaped_c(const char *p) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sv_skip_escaped_c_pre > 0) { - const char* (*preHookFunc) (const char **p); + const char * (*preHookFunc) (const char **p); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sv_skip_escaped_c_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sv_skip_escaped_c_pre[hIndex].func; @@ -98628,7 +98814,7 @@ const char* HP_sv_skip_escaped_c(const char *p) { retVal___ = HPMHooks.source.sv.skip_escaped_c(p); } if (HPMHooks.count.HP_sv_skip_escaped_c_post > 0) { - const char* (*postHookFunc) (const char* retVal___, const char *p); + const char * (*postHookFunc) (const char * retVal___, const char *p); for (hIndex = 0; hIndex < HPMHooks.count.HP_sv_skip_escaped_c_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sv_skip_escaped_c_post[hIndex].func; retVal___ = postHookFunc(retVal___, p); @@ -98691,11 +98877,11 @@ long HP_sysinfo_getpagesize(void) { } return retVal___; } -const char* HP_sysinfo_platform(void) { +const char * HP_sysinfo_platform(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_platform_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_platform_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_platform_pre[hIndex].func; @@ -98710,7 +98896,7 @@ const char* HP_sysinfo_platform(void) { retVal___ = HPMHooks.source.sysinfo.platform(); } if (HPMHooks.count.HP_sysinfo_platform_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_platform_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_platform_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -98718,11 +98904,11 @@ const char* HP_sysinfo_platform(void) { } return retVal___; } -const char* HP_sysinfo_osversion(void) { +const char * HP_sysinfo_osversion(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_osversion_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_osversion_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_osversion_pre[hIndex].func; @@ -98737,7 +98923,7 @@ const char* HP_sysinfo_osversion(void) { retVal___ = HPMHooks.source.sysinfo.osversion(); } if (HPMHooks.count.HP_sysinfo_osversion_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_osversion_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_osversion_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -98745,11 +98931,11 @@ const char* HP_sysinfo_osversion(void) { } return retVal___; } -const char* HP_sysinfo_cpu(void) { +const char * HP_sysinfo_cpu(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_cpu_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_cpu_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_cpu_pre[hIndex].func; @@ -98764,7 +98950,7 @@ const char* HP_sysinfo_cpu(void) { retVal___ = HPMHooks.source.sysinfo.cpu(); } if (HPMHooks.count.HP_sysinfo_cpu_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_cpu_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_cpu_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -98799,11 +98985,11 @@ int HP_sysinfo_cpucores(void) { } return retVal___; } -const char* HP_sysinfo_arch(void) { +const char * HP_sysinfo_arch(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_arch_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_arch_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_arch_pre[hIndex].func; @@ -98818,7 +99004,7 @@ const char* HP_sysinfo_arch(void) { retVal___ = HPMHooks.source.sysinfo.arch(); } if (HPMHooks.count.HP_sysinfo_arch_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_arch_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_arch_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -98853,11 +99039,11 @@ bool HP_sysinfo_is64bit(void) { } return retVal___; } -const char* HP_sysinfo_compiler(void) { +const char * HP_sysinfo_compiler(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_compiler_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_compiler_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_compiler_pre[hIndex].func; @@ -98872,7 +99058,7 @@ const char* HP_sysinfo_compiler(void) { retVal___ = HPMHooks.source.sysinfo.compiler(); } if (HPMHooks.count.HP_sysinfo_compiler_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_compiler_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_compiler_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -98880,11 +99066,11 @@ const char* HP_sysinfo_compiler(void) { } return retVal___; } -const char* HP_sysinfo_cflags(void) { +const char * HP_sysinfo_cflags(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_cflags_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_cflags_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_cflags_pre[hIndex].func; @@ -98899,7 +99085,7 @@ const char* HP_sysinfo_cflags(void) { retVal___ = HPMHooks.source.sysinfo.cflags(); } if (HPMHooks.count.HP_sysinfo_cflags_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_cflags_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_cflags_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -98907,11 +99093,11 @@ const char* HP_sysinfo_cflags(void) { } return retVal___; } -const char* HP_sysinfo_time(void) { +const char * HP_sysinfo_time(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_time_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_time_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_time_pre[hIndex].func; @@ -98926,7 +99112,7 @@ const char* HP_sysinfo_time(void) { retVal___ = HPMHooks.source.sysinfo.time(); } if (HPMHooks.count.HP_sysinfo_time_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_time_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_time_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -98934,11 +99120,11 @@ const char* HP_sysinfo_time(void) { } return retVal___; } -const char* HP_sysinfo_vcstype(void) { +const char * HP_sysinfo_vcstype(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_vcstype_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcstype_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_vcstype_pre[hIndex].func; @@ -98953,7 +99139,7 @@ const char* HP_sysinfo_vcstype(void) { retVal___ = HPMHooks.source.sysinfo.vcstype(); } if (HPMHooks.count.HP_sysinfo_vcstype_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcstype_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_vcstype_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -98988,11 +99174,11 @@ int HP_sysinfo_vcstypeid(void) { } return retVal___; } -const char* HP_sysinfo_vcsrevision_src(void) { +const char * HP_sysinfo_vcsrevision_src(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_vcsrevision_src_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcsrevision_src_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_vcsrevision_src_pre[hIndex].func; @@ -99007,7 +99193,7 @@ const char* HP_sysinfo_vcsrevision_src(void) { retVal___ = HPMHooks.source.sysinfo.vcsrevision_src(); } if (HPMHooks.count.HP_sysinfo_vcsrevision_src_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcsrevision_src_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_vcsrevision_src_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -99015,11 +99201,11 @@ const char* HP_sysinfo_vcsrevision_src(void) { } return retVal___; } -const char* HP_sysinfo_vcsrevision_scripts(void) { +const char * HP_sysinfo_vcsrevision_scripts(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_vcsrevision_scripts_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcsrevision_scripts_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_vcsrevision_scripts_pre[hIndex].func; @@ -99034,7 +99220,7 @@ const char* HP_sysinfo_vcsrevision_scripts(void) { retVal___ = HPMHooks.source.sysinfo.vcsrevision_scripts(); } if (HPMHooks.count.HP_sysinfo_vcsrevision_scripts_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_vcsrevision_scripts_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_vcsrevision_scripts_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -99149,11 +99335,11 @@ bool HP_sysinfo_is_superuser(void) { } return retVal___; } -const char* HP_sysinfo_zlib(void) { +const char * HP_sysinfo_zlib(void) { int hIndex = 0; - const char* retVal___ = NULL; + const char * retVal___ = NULL; if (HPMHooks.count.HP_sysinfo_zlib_pre > 0) { - const char* (*preHookFunc) (void); + const char * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_zlib_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_sysinfo_zlib_pre[hIndex].func; @@ -99168,7 +99354,7 @@ const char* HP_sysinfo_zlib(void) { retVal___ = HPMHooks.source.sysinfo.zlib(); } if (HPMHooks.count.HP_sysinfo_zlib_post > 0) { - const char* (*postHookFunc) (const char* retVal___); + const char * (*postHookFunc) (const char * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_zlib_post; hIndex++) { postHookFunc = HPMHooks.list.HP_sysinfo_zlib_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -99281,11 +99467,11 @@ void HP_thread_final(void) { } return; } -struct thread_handle* HP_thread_create(threadFunc entry_point, void *param) { +struct thread_handle * HP_thread_create(threadFunc entry_point, void *param) { int hIndex = 0; - struct thread_handle* retVal___ = NULL; + struct thread_handle * retVal___ = NULL; if (HPMHooks.count.HP_thread_create_pre > 0) { - struct thread_handle* (*preHookFunc) (threadFunc *entry_point, void **param); + struct thread_handle * (*preHookFunc) (threadFunc *entry_point, void **param); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_create_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_thread_create_pre[hIndex].func; @@ -99300,7 +99486,7 @@ struct thread_handle* HP_thread_create(threadFunc entry_point, void *param) { retVal___ = HPMHooks.source.thread.create(entry_point, param); } if (HPMHooks.count.HP_thread_create_post > 0) { - struct thread_handle* (*postHookFunc) (struct thread_handle* retVal___, threadFunc entry_point, void *param); + struct thread_handle * (*postHookFunc) (struct thread_handle * retVal___, threadFunc entry_point, void *param); for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_create_post; hIndex++) { postHookFunc = HPMHooks.list.HP_thread_create_post[hIndex].func; retVal___ = postHookFunc(retVal___, entry_point, param); @@ -99308,11 +99494,11 @@ struct thread_handle* HP_thread_create(threadFunc entry_point, void *param) { } return retVal___; } -struct thread_handle* HP_thread_create_opt(threadFunc entry_point, void *param, size_t stack_size, enum thread_priority prio) { +struct thread_handle * HP_thread_create_opt(threadFunc entry_point, void *param, size_t stack_size, enum thread_priority prio) { int hIndex = 0; - struct thread_handle* retVal___ = NULL; + struct thread_handle * retVal___ = NULL; if (HPMHooks.count.HP_thread_create_opt_pre > 0) { - struct thread_handle* (*preHookFunc) (threadFunc *entry_point, void **param, size_t *stack_size, enum thread_priority *prio); + struct thread_handle * (*preHookFunc) (threadFunc *entry_point, void **param, size_t *stack_size, enum thread_priority *prio); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_create_opt_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_thread_create_opt_pre[hIndex].func; @@ -99327,7 +99513,7 @@ struct thread_handle* HP_thread_create_opt(threadFunc entry_point, void *param, retVal___ = HPMHooks.source.thread.create_opt(entry_point, param, stack_size, prio); } if (HPMHooks.count.HP_thread_create_opt_post > 0) { - struct thread_handle* (*postHookFunc) (struct thread_handle* retVal___, threadFunc entry_point, void *param, size_t stack_size, enum thread_priority prio); + struct thread_handle * (*postHookFunc) (struct thread_handle * retVal___, threadFunc entry_point, void *param, size_t stack_size, enum thread_priority prio); for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_create_opt_post; hIndex++) { postHookFunc = HPMHooks.list.HP_thread_create_opt_post[hIndex].func; retVal___ = postHookFunc(retVal___, entry_point, param, stack_size, prio); @@ -99361,11 +99547,11 @@ void HP_thread_destroy(struct thread_handle *handle) { } return; } -struct thread_handle* HP_thread_self(void) { +struct thread_handle * HP_thread_self(void) { int hIndex = 0; - struct thread_handle* retVal___ = NULL; + struct thread_handle * retVal___ = NULL; if (HPMHooks.count.HP_thread_self_pre > 0) { - struct thread_handle* (*preHookFunc) (void); + struct thread_handle * (*preHookFunc) (void); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_self_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_thread_self_pre[hIndex].func; @@ -99380,7 +99566,7 @@ struct thread_handle* HP_thread_self(void) { retVal___ = HPMHooks.source.thread.self(); } if (HPMHooks.count.HP_thread_self_post > 0) { - struct thread_handle* (*postHookFunc) (struct thread_handle* retVal___); + struct thread_handle * (*postHookFunc) (struct thread_handle * retVal___); for (hIndex = 0; hIndex < HPMHooks.count.HP_thread_self_post; hIndex++) { postHookFunc = HPMHooks.list.HP_thread_self_post[hIndex].func; retVal___ = postHookFunc(retVal___); @@ -99630,11 +99816,11 @@ int HP_timer_add_interval(int64 tick, TimerFunc func, int id, intptr_t data, int } return retVal___; } -const struct TimerData* HP_timer_get(int tid) { +const struct TimerData * HP_timer_get(int tid) { int hIndex = 0; - const struct TimerData* retVal___ = NULL; + const struct TimerData * retVal___ = NULL; if (HPMHooks.count.HP_timer_get_pre > 0) { - const struct TimerData* (*preHookFunc) (int *tid); + const struct TimerData * (*preHookFunc) (int *tid); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_timer_get_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_timer_get_pre[hIndex].func; @@ -99649,7 +99835,7 @@ const struct TimerData* HP_timer_get(int tid) { retVal___ = HPMHooks.source.timer.get(tid); } if (HPMHooks.count.HP_timer_get_post > 0) { - const struct TimerData* (*postHookFunc) (const struct TimerData* retVal___, int tid); + const struct TimerData * (*postHookFunc) (const struct TimerData * retVal___, int tid); for (hIndex = 0; hIndex < HPMHooks.count.HP_timer_get_post; hIndex++) { postHookFunc = HPMHooks.list.HP_timer_get_post[hIndex].func; retVal___ = postHookFunc(retVal___, tid); @@ -100243,11 +100429,11 @@ int HP_unit_final(void) { } return retVal___; } -struct unit_data* HP_unit_bl2ud(struct block_list *bl) { +struct unit_data * HP_unit_bl2ud(struct block_list *bl) { int hIndex = 0; - struct unit_data* retVal___ = NULL; + struct unit_data * retVal___ = NULL; if (HPMHooks.count.HP_unit_bl2ud_pre > 0) { - struct unit_data* (*preHookFunc) (struct block_list **bl); + struct unit_data * (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_bl2ud_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_unit_bl2ud_pre[hIndex].func; @@ -100262,7 +100448,7 @@ struct unit_data* HP_unit_bl2ud(struct block_list *bl) { retVal___ = HPMHooks.source.unit.bl2ud(bl); } if (HPMHooks.count.HP_unit_bl2ud_post > 0) { - struct unit_data* (*postHookFunc) (struct unit_data* retVal___, struct block_list *bl); + struct unit_data * (*postHookFunc) (struct unit_data * retVal___, struct block_list *bl); for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_bl2ud_post; hIndex++) { postHookFunc = HPMHooks.list.HP_unit_bl2ud_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl); @@ -100270,11 +100456,11 @@ struct unit_data* HP_unit_bl2ud(struct block_list *bl) { } return retVal___; } -const struct unit_data* HP_unit_cbl2ud(const struct block_list *bl) { +const struct unit_data * HP_unit_cbl2ud(const struct block_list *bl) { int hIndex = 0; - const struct unit_data* retVal___ = NULL; + const struct unit_data * retVal___ = NULL; if (HPMHooks.count.HP_unit_cbl2ud_pre > 0) { - const struct unit_data* (*preHookFunc) (const struct block_list **bl); + const struct unit_data * (*preHookFunc) (const struct block_list **bl); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_cbl2ud_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_unit_cbl2ud_pre[hIndex].func; @@ -100289,7 +100475,7 @@ const struct unit_data* HP_unit_cbl2ud(const struct block_list *bl) { retVal___ = HPMHooks.source.unit.cbl2ud(bl); } if (HPMHooks.count.HP_unit_cbl2ud_post > 0) { - const struct unit_data* (*postHookFunc) (const struct unit_data* retVal___, const struct block_list *bl); + const struct unit_data * (*postHookFunc) (const struct unit_data * retVal___, const struct block_list *bl); for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_cbl2ud_post; hIndex++) { postHookFunc = HPMHooks.list.HP_unit_cbl2ud_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl); @@ -100297,11 +100483,11 @@ const struct unit_data* HP_unit_cbl2ud(const struct block_list *bl) { } return retVal___; } -struct unit_data* HP_unit_bl2ud2(struct block_list *bl) { +struct unit_data * HP_unit_bl2ud2(struct block_list *bl) { int hIndex = 0; - struct unit_data* retVal___ = NULL; + struct unit_data * retVal___ = NULL; if (HPMHooks.count.HP_unit_bl2ud2_pre > 0) { - struct unit_data* (*preHookFunc) (struct block_list **bl); + struct unit_data * (*preHookFunc) (struct block_list **bl); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_bl2ud2_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_unit_bl2ud2_pre[hIndex].func; @@ -100316,7 +100502,7 @@ struct unit_data* HP_unit_bl2ud2(struct block_list *bl) { retVal___ = HPMHooks.source.unit.bl2ud2(bl); } if (HPMHooks.count.HP_unit_bl2ud2_post > 0) { - struct unit_data* (*postHookFunc) (struct unit_data* retVal___, struct block_list *bl); + struct unit_data * (*postHookFunc) (struct unit_data * retVal___, struct block_list *bl); for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_bl2ud2_post; hIndex++) { postHookFunc = HPMHooks.list.HP_unit_bl2ud2_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl);