Merge pull request #2536 from MishimaHaruna/compile-fixes

Compile fixes

4 files changed, 11 insertions, 11 deletions

diff --git a/src/map/log.c b/src/map/log.c
index 5bbca02a9..aa2f5f8f3 100644
--- a/src/map/log.c
+++ b/src/map/log.c
@@ -511,7 +511,7 @@ static void log_sql_final(void)
 /**
  * Initializes logs->config variables
  */
-void log_set_defaults(void)
+static void log_set_defaults(void)
 {
 	memset(&logs->config, 0, sizeof(logs->config));
 
@@ -540,7 +540,7 @@ void log_set_defaults(void)
  *
  * @retval false in case of error.
  */
-bool log_config_read_database(const char *filename, struct config_t *config, bool imported)
+static bool log_config_read_database(const char *filename, struct config_t *config, bool imported)
 {
 	struct config_setting_t *setting = NULL;
 
@@ -596,7 +596,7 @@ bool log_config_read_database(const char *filename, struct config_t *config, boo
  *
  * @retval false in case of error.
  */
-bool log_config_read_filter_item(const char *filename, struct config_t *config, bool imported)
+static bool log_config_read_filter_item(const char *filename, struct config_t *config, bool imported)
 {
 	struct config_setting_t *setting = NULL;
 
@@ -625,7 +625,7 @@ bool log_config_read_filter_item(const char *filename, struct config_t *config,
  *
  * @retval false in case of error.
  */
-bool log_config_read_filter_chat(const char *filename, struct config_t *config, bool imported)
+static bool log_config_read_filter_chat(const char *filename, struct config_t *config, bool imported)
 {
 	struct config_setting_t *setting = NULL;
 
@@ -651,7 +651,7 @@ bool log_config_read_filter_chat(const char *filename, struct config_t *config,
  *
  * @retval false in case of error.
  */
-bool log_config_read_filter(const char *filename, struct config_t *config, bool imported)
+static bool log_config_read_filter(const char *filename, struct config_t *config, bool imported)
 {
 	bool retval = true;
 
@@ -674,7 +674,7 @@ bool log_config_read_filter(const char *filename, struct config_t *config, bool
  *
  * @retval false in case of error.
  */
-bool log_config_read(const char *filename, bool imported)
+static bool log_config_read(const char *filename, bool imported)
 {
 	struct config_t config;
 	struct config_setting_t *setting = NULL;
@@ -755,7 +755,7 @@ bool log_config_read(const char *filename, bool imported)
 	return retval;
 }
 
-void log_config_complete(void)
+static void log_config_complete(void)
 {
 	if( logs->config.sql_logs ) {
 		logs->pick_sub = log_pick_sub_sql;
diff --git a/src/map/script.c b/src/map/script.c
index c7ec3c26f..df6e0d329 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -105,7 +105,7 @@ static inline void SETVALUE(struct script_buf *buf, int i, int n)
 	VECTOR_INDEX(*buf, i+2) = GetByte(n, 2);
 }
 
-const char *script_op2name(int op)
+static const char *script_op2name(int op)
 {
 #define RETURN_OP_NAME(type) case type: return #type
 	switch( op ) {
diff --git a/src/map/skill.c b/src/map/skill.c
index 4b6ab7d0d..ad27ef0e3 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -82,7 +82,7 @@
 #endif
 
 static struct skill_interface skill_s;
-struct s_skill_dbs skilldbs;
+static struct s_skill_dbs skilldbs;
 
 struct skill_interface *skill;
 
diff --git a/src/map/status.c b/src/map/status.c
index ba32b267e..71cce28c5 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -11808,10 +11808,10 @@ static int status_change_timer(int tid, int64 tick, int id, intptr_t data)
 
 		case SC_SPLASHER:
 #if 0 // custom Venom Splasher countdown timer
-			if (sce->val4 % 1000 == 0) {
+			if (sce->val4 % 1000 == 0 && bl && bl->type == BL_PC) {
 				char counter[10];
 				snprintf (counter, 10, "%d", sce->val4/1000);
-				clif->message(bl, counter);
+				clif->message(BL_UCCAST(BL_PC, bl)->fd, counter);
 			}
 #endif // 0
 			if((sce->val4 -= 500) > 0) {