Merge branch 'master' of https://github.com/HerculesWS/Hercules

5 files changed, 41 insertions, 41 deletions

diff --git a/src/map/script.c b/src/map/script.c
index 53b5bbe16..1b5d888a4 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -11802,7 +11802,7 @@ BUILDIN(misceffect)
 /*==========================================
  * Play a BGM on a single client [Rikter/Yommy]
  *------------------------------------------*/
-BUILDIN(playBGM)
+BUILDIN(playbgm)
 {
 	const char* name;
 	struct map_session_data* sd;
@@ -11817,7 +11817,7 @@ BUILDIN(playBGM)
 	return true;
 }
 
-int playBGM_sub(struct block_list* bl,va_list ap)
+int playbgm_sub(struct block_list* bl,va_list ap)
 {
 	const char* name = va_arg(ap,const char*);
 	
@@ -11826,7 +11826,7 @@ int playBGM_sub(struct block_list* bl,va_list ap)
 	return 0;
 }
 
-int playBGM_foreachpc_sub(struct map_session_data* sd, va_list args)
+int playbgm_foreachpc_sub(struct map_session_data* sd, va_list args)
 {
 	const char* name = va_arg(args, const char*);
 	
@@ -11837,7 +11837,7 @@ int playBGM_foreachpc_sub(struct map_session_data* sd, va_list args)
 /*==========================================
  * Play a BGM on multiple client [Rikter/Yommy]
  *------------------------------------------*/
-BUILDIN(playBGMall) {
+BUILDIN(playbgmall) {
 	const char* name;
 	
 	name = script_getstr(st,2);
@@ -11852,25 +11852,25 @@ BUILDIN(playBGMall) {
 		int m;
 		
 		if ( ( m = map->mapname2mapid(mapname) ) == -1 ) {
-			ShowWarning("playBGMall: Attempted to play song '%s' on non-existent map '%s'\n",name, mapname);
+			ShowWarning("playbgmall: Attempted to play song '%s' on non-existent map '%s'\n",name, mapname);
 			return true;
 		}
 		
-		map->foreachinarea(script->playBGM_sub, m, x0, y0, x1, y1, BL_PC, name);
+		map->foreachinarea(script->playbgm_sub, m, x0, y0, x1, y1, BL_PC, name);
 	} else if( script_hasdata(st,3) ) {
 		// entire map
 		const char* mapname = script_getstr(st,3);
 		int m;
 		
 		if ( ( m = map->mapname2mapid(mapname) ) == -1 ) {
-			ShowWarning("playBGMall: Attempted to play song '%s' on non-existent map '%s'\n",name, mapname);
+			ShowWarning("playbgmall: Attempted to play song '%s' on non-existent map '%s'\n",name, mapname);
 			return true;
 		}
 		
-		map->foreachinmap(script->playBGM_sub, m, BL_PC, name);
+		map->foreachinmap(script->playbgm_sub, m, BL_PC, name);
 	} else {
 		// entire server
-		map->foreachpc(script->playBGM_foreachpc_sub, name);
+		map->foreachpc(script->playbgm_foreachpc_sub, name);
 	}
 	
 	return true;
@@ -18026,8 +18026,8 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF(clearitem,""),
 		BUILDIN_DEF(classchange,"ii"),
 		BUILDIN_DEF(misceffect,"i"),
-		BUILDIN_DEF(playBGM,"s"),
-		BUILDIN_DEF(playBGMall,"s?????"),
+		BUILDIN_DEF(playbgm,"s"),
+		BUILDIN_DEF(playbgmall,"s?????"),
 		BUILDIN_DEF(soundeffect,"si"),
 		BUILDIN_DEF(soundeffectall,"si?????"),	// SoundEffectAll [Codemaster]
 		BUILDIN_DEF(strmobinfo,"ii"),	// display mob data [Valaris]
@@ -18550,8 +18550,8 @@ void script_defaults(void) {
 	script->buildin_maprespawnguildid_sub_pc = buildin_maprespawnguildid_sub_pc;
 	script->buildin_maprespawnguildid_sub_mob = buildin_maprespawnguildid_sub_mob;
 	script->buildin_mobcount_sub = buildin_mobcount_sub;
-	script->playBGM_sub = playBGM_sub;
-	script->playBGM_foreachpc_sub = playBGM_foreachpc_sub;
+	script->playbgm_sub = playbgm_sub;
+	script->playbgm_foreachpc_sub = playbgm_foreachpc_sub;
 	script->soundeffect_sub = soundeffect_sub;
 	script->buildin_query_sql_sub = buildin_query_sql_sub;
 	script->axtoi = axtoi;
diff --git a/src/map/script.h b/src/map/script.h
index a846365dd..7fa8b92e4 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -621,8 +621,8 @@ struct script_interface {
 	int (*buildin_maprespawnguildid_sub_pc) (struct map_session_data *sd, va_list ap);
 	int (*buildin_maprespawnguildid_sub_mob) (struct block_list *bl, va_list ap);
 	int (*buildin_mobcount_sub) (struct block_list *bl, va_list ap);
-	int (*playBGM_sub) (struct block_list *bl, va_list ap);
-	int (*playBGM_foreachpc_sub) (struct map_session_data *sd, va_list args);
+	int (*playbgm_sub) (struct block_list *bl, va_list ap);
+	int (*playbgm_foreachpc_sub) (struct map_session_data *sd, va_list args);
 	int (*soundeffect_sub) (struct block_list *bl, va_list ap);
 	int (*buildin_query_sql_sub) (struct script_state *st, Sql *handle);
 	int (*axtoi) (const char *hexStg);
diff --git a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
index 19917e338..13457ec63 100644
--- a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
@@ -4169,10 +4169,10 @@ struct {
 	struct HPMHookPoint *HP_script_buildin_maprespawnguildid_sub_mob_post;
 	struct HPMHookPoint *HP_script_buildin_mobcount_sub_pre;
 	struct HPMHookPoint *HP_script_buildin_mobcount_sub_post;
-	struct HPMHookPoint *HP_script_playBGM_sub_pre;
-	struct HPMHookPoint *HP_script_playBGM_sub_post;
-	struct HPMHookPoint *HP_script_playBGM_foreachpc_sub_pre;
-	struct HPMHookPoint *HP_script_playBGM_foreachpc_sub_post;
+	struct HPMHookPoint *HP_script_playbgm_sub_pre;
+	struct HPMHookPoint *HP_script_playbgm_sub_post;
+	struct HPMHookPoint *HP_script_playbgm_foreachpc_sub_pre;
+	struct HPMHookPoint *HP_script_playbgm_foreachpc_sub_post;
 	struct HPMHookPoint *HP_script_soundeffect_sub_pre;
 	struct HPMHookPoint *HP_script_soundeffect_sub_post;
 	struct HPMHookPoint *HP_script_buildin_query_sql_sub_pre;
@@ -9112,10 +9112,10 @@ struct {
 	int HP_script_buildin_maprespawnguildid_sub_mob_post;
 	int HP_script_buildin_mobcount_sub_pre;
 	int HP_script_buildin_mobcount_sub_post;
-	int HP_script_playBGM_sub_pre;
-	int HP_script_playBGM_sub_post;
-	int HP_script_playBGM_foreachpc_sub_pre;
-	int HP_script_playBGM_foreachpc_sub_post;
+	int HP_script_playbgm_sub_pre;
+	int HP_script_playbgm_sub_post;
+	int HP_script_playbgm_foreachpc_sub_pre;
+	int HP_script_playbgm_foreachpc_sub_post;
 	int HP_script_soundeffect_sub_pre;
 	int HP_script_soundeffect_sub_post;
 	int HP_script_buildin_query_sql_sub_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
index 01eb6684b..c5a2f1dc6 100644
--- a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
@@ -2118,8 +2118,8 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(script->buildin_maprespawnguildid_sub_pc, HP_script_buildin_maprespawnguildid_sub_pc) },
 	{ HP_POP(script->buildin_maprespawnguildid_sub_mob, HP_script_buildin_maprespawnguildid_sub_mob) },
 	{ HP_POP(script->buildin_mobcount_sub, HP_script_buildin_mobcount_sub) },
-	{ HP_POP(script->playBGM_sub, HP_script_playBGM_sub) },
-	{ HP_POP(script->playBGM_foreachpc_sub, HP_script_playBGM_foreachpc_sub) },
+	{ HP_POP(script->playbgm_sub, HP_script_playbgm_sub) },
+	{ HP_POP(script->playbgm_foreachpc_sub, HP_script_playbgm_foreachpc_sub) },
 	{ HP_POP(script->soundeffect_sub, HP_script_soundeffect_sub) },
 	{ HP_POP(script->buildin_query_sql_sub, HP_script_buildin_query_sql_sub) },
 	{ HP_POP(script->axtoi, HP_script_axtoi) },
diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
index fdf4a6763..25d7eced4 100644
--- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
@@ -53842,14 +53842,14 @@ int HP_script_buildin_mobcount_sub(struct block_list *bl, va_list ap) {
 	}
 	return retVal___;
 }
-int HP_script_playBGM_sub(struct block_list *bl, va_list ap) {
+int HP_script_playbgm_sub(struct block_list *bl, va_list ap) {
 	int hIndex = 0;
 	int retVal___ = 0;
-	if( HPMHooks.count.HP_script_playBGM_sub_pre ) {
+	if( HPMHooks.count.HP_script_playbgm_sub_pre ) {
 		int (*preHookFunc) (struct block_list *bl, va_list ap);
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playBGM_sub_pre; hIndex++ ) {
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playbgm_sub_pre; hIndex++ ) {
 			va_list ap___copy; va_copy(ap___copy, ap);
-			preHookFunc = HPMHooks.list.HP_script_playBGM_sub_pre[hIndex].func;
+			preHookFunc = HPMHooks.list.HP_script_playbgm_sub_pre[hIndex].func;
 			retVal___ = preHookFunc(bl, ap___copy);
 			va_end(ap___copy);
 		}
@@ -53860,28 +53860,28 @@ int HP_script_playBGM_sub(struct block_list *bl, va_list ap) {
 	}
 	{
 		va_list ap___copy; va_copy(ap___copy, ap);
-		retVal___ = HPMHooks.source.script.playBGM_sub(bl, ap___copy);
+		retVal___ = HPMHooks.source.script.playbgm_sub(bl, ap___copy);
 		va_end(ap___copy);
 	}
-	if( HPMHooks.count.HP_script_playBGM_sub_post ) {
+	if( HPMHooks.count.HP_script_playbgm_sub_post ) {
 		int (*postHookFunc) (int retVal___, struct block_list *bl, va_list ap);
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playBGM_sub_post; hIndex++ ) {
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playbgm_sub_post; hIndex++ ) {
 			va_list ap___copy; va_copy(ap___copy, ap);
-			postHookFunc = HPMHooks.list.HP_script_playBGM_sub_post[hIndex].func;
+			postHookFunc = HPMHooks.list.HP_script_playbgm_sub_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, bl, ap___copy);
 			va_end(ap___copy);
 		}
 	}
 	return retVal___;
 }
-int HP_script_playBGM_foreachpc_sub(struct map_session_data *sd, va_list args) {
+int HP_script_playbgm_foreachpc_sub(struct map_session_data *sd, va_list args) {
 	int hIndex = 0;
 	int retVal___ = 0;
-	if( HPMHooks.count.HP_script_playBGM_foreachpc_sub_pre ) {
+	if( HPMHooks.count.HP_script_playbgm_foreachpc_sub_pre ) {
 		int (*preHookFunc) (struct map_session_data *sd, va_list args);
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playBGM_foreachpc_sub_pre; hIndex++ ) {
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playbgm_foreachpc_sub_pre; hIndex++ ) {
 			va_list args___copy; va_copy(args___copy, args);
-			preHookFunc = HPMHooks.list.HP_script_playBGM_foreachpc_sub_pre[hIndex].func;
+			preHookFunc = HPMHooks.list.HP_script_playbgm_foreachpc_sub_pre[hIndex].func;
 			retVal___ = preHookFunc(sd, args___copy);
 			va_end(args___copy);
 		}
@@ -53892,14 +53892,14 @@ int HP_script_playBGM_foreachpc_sub(struct map_session_data *sd, va_list args) {
 	}
 	{
 		va_list args___copy; va_copy(args___copy, args);
-		retVal___ = HPMHooks.source.script.playBGM_foreachpc_sub(sd, args___copy);
+		retVal___ = HPMHooks.source.script.playbgm_foreachpc_sub(sd, args___copy);
 		va_end(args___copy);
 	}
-	if( HPMHooks.count.HP_script_playBGM_foreachpc_sub_post ) {
+	if( HPMHooks.count.HP_script_playbgm_foreachpc_sub_post ) {
 		int (*postHookFunc) (int retVal___, struct map_session_data *sd, va_list args);
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playBGM_foreachpc_sub_post; hIndex++ ) {
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playbgm_foreachpc_sub_post; hIndex++ ) {
 			va_list args___copy; va_copy(args___copy, args);
-			postHookFunc = HPMHooks.list.HP_script_playBGM_foreachpc_sub_post[hIndex].func;
+			postHookFunc = HPMHooks.list.HP_script_playbgm_foreachpc_sub_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, sd, args___copy);
 			va_end(args___copy);
 		}