From f846f1e4c4bb15d60cbfdcca5f371dfb196ff6a1 Mon Sep 17 00:00:00 2001 From: Robbie Date: Thu, 9 Jan 2014 20:29:44 -0600 Subject: Because someone forgot I've contributed to *athena --- AUTHORS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 24405d990..b85402c7e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -48,6 +48,7 @@ CIA-2 CLOWNISIUS code codemaster +Cookie css25 Curax Cydh @@ -270,4 +271,4 @@ ZoDIaC 胡 胡蝶蘭 過去の人i1 -釈尊 \ No newline at end of file +釈尊 -- cgit v1.2.3-70-g09d2 From 6caf7cafff77d77a017cc2f0797d1dd3f805aea6 Mon Sep 17 00:00:00 2001 From: "Hercules.ws" Date: Tue, 14 Jan 2014 02:54:42 +0100 Subject: HPM Hooks Update Signed-off-by: HerculesWSAPI --- src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc | 4 ---- .../HPMHooking/HPMHooking.HookingPoints.inc | 1 - src/plugins/HPMHooking/HPMHooking.Hooks.inc | 26 ---------------------- 3 files changed, 31 deletions(-) diff --git a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc index 7f26bd208..bef0cec69 100644 --- a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc @@ -3495,8 +3495,6 @@ struct { struct HPMHookPoint *HP_pcg_get_level_post; struct HPMHookPoint *HP_pcg_get_idx_pre; struct HPMHookPoint *HP_pcg_get_idx_post; - struct HPMHookPoint *HP_pcg_add_permission_pre; - struct HPMHookPoint *HP_pcg_add_permission_post; struct HPMHookPoint *HP_pc_init_pre; struct HPMHookPoint *HP_pc_init_post; struct HPMHookPoint *HP_pc_final_pre; @@ -8518,8 +8516,6 @@ struct { int HP_pcg_get_level_post; int HP_pcg_get_idx_pre; int HP_pcg_get_idx_post; - int HP_pcg_add_permission_pre; - int HP_pcg_add_permission_post; int HP_pc_init_pre; int HP_pc_init_post; int HP_pc_final_pre; diff --git a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc index e6f593187..42e6593a1 100644 --- a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc @@ -1777,7 +1777,6 @@ struct HookingPointData HookingPoints[] = { { HP_POP(pcg->get_name, HP_pcg_get_name) }, { HP_POP(pcg->get_level, HP_pcg_get_level) }, { HP_POP(pcg->get_idx, HP_pcg_get_idx) }, - { HP_POP(pcg->add_permission, HP_pcg_add_permission) }, /* pc */ { HP_POP(pc->init, HP_pc_init) }, { HP_POP(pc->final, HP_pc_final) }, diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc index 2e4b62835..64194362c 100644 --- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc @@ -45007,32 +45007,6 @@ int HP_pcg_get_idx(GroupSettings *group) { } return retVal___; } -unsigned int HP_pcg_add_permission(const char *name) { - int hIndex = 0; - unsigned int retVal___ = 0; - if( HPMHooks.count.HP_pcg_add_permission_pre ) { - unsigned int (*preHookFunc) (const char *name); - for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_add_permission_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_pcg_add_permission_pre[hIndex].func; - retVal___ = preHookFunc(name); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return retVal___; - } - } - { - retVal___ = HPMHooks.source.pcg.add_permission(name); - } - if( HPMHooks.count.HP_pcg_add_permission_post ) { - unsigned int (*postHookFunc) (unsigned int retVal___, const char *name); - for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_add_permission_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_pcg_add_permission_post[hIndex].func; - retVal___ = postHookFunc(retVal___, name); - } - } - return retVal___; -} /* pc */ void HP_pc_init(bool minimal) { int hIndex = 0; -- cgit v1.2.3-70-g09d2 From 634e7e707819454a82f7bd965f06bb0c2590e81b Mon Sep 17 00:00:00 2001 From: ossi0110 Date: Tue, 14 Jan 2014 11:21:40 +0100 Subject: Update Hunting Mission Update Hunting_Mission.txt to the new SQL dbs --- npc/custom/quests/hunting_missions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/npc/custom/quests/hunting_missions.txt b/npc/custom/quests/hunting_missions.txt index 5c3c6a469..8da51a1c0 100644 --- a/npc/custom/quests/hunting_missions.txt +++ b/npc/custom/quests/hunting_missions.txt @@ -126,7 +126,7 @@ function Chk; function Cm; case 6: mes "[Hunting Missions]"; mes "The top hunters are:"; - query_sql("SELECT char_id AS id, (SELECT `name` FROM `char` WHERE char_id = id),`value` FROM `global_reg_value` WHERE str = 'Mission_Total' ORDER BY CAST(`value` AS SIGNED) DESC LIMIT 5",.@id,.@name$,.@val); + query_sql("SELECT char_id AS id, (SELECT `name` FROM `char` WHERE char_id = id),`value` FROM `char_reg_num_db` WHERE `key` = 'Mission_Total' ORDER BY CAST(`value` AS SIGNED) DESC LIMIT 5",.@id,.@name$,.@val); for(set .@i,0; .@i<5; set .@i,.@i+1) mes " [Rank "+(.@i+1)+"] "+((.@name$[.@i] == "")?"^777777none":"^0055FF"+.@name$[.@i]+"^000000 : ^FF0000"+.@val[.@i]+" pt.")+"^000000"; close; @@ -181,8 +181,8 @@ Mission_Status: set #Mission_Count,0; if (.Delay) set #Mission_Delay, gettimetick(2)+(.Delay*3600); set Mission_Total, Mission_Total+1; - if (Mission_Total == 1) query_sql("INSERT INTO `global_reg_value` (`char_id`,`str`,`value`,`type`,`account_id`) VALUES ("+getcharid(0)+",'Mission_Total','1',3,0)"); - else query_sql("UPDATE `global_reg_value` SET `value` = "+Mission_Total+" WHERE char_id = "+getcharid(0)+" AND `str` = 'Mission_Total'"); + if (Mission_Total == 1) query_sql("INSERT INTO `char_reg_num_db` (`char_id`,`key`,`index`,`value`) VALUES ("+getcharid(0)+",'Mission_Total','0',1)"); + else query_sql("UPDATE `char_reg_num_db` SET `value` = "+Mission_Total+" WHERE `char_id` = "+getcharid(0)+" AND `key` = 'Mission_Total'"); close; Mission_Info: -- cgit v1.2.3-70-g09d2