From d7c7d58d5ddbb0b06d8eb357b0b2a021eaa0be65 Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Fri, 28 Jul 2017 17:43:01 +0200 Subject: [PATCH] Fixed some compilation warnings in release mode Fixes #2219 Thanks to @keitenai, @CairoLee and @kukuasir1 --- src/map/intif.c | 4 ++-- src/map/pc.c | 6 ++++++ src/map/pc.h | 3 +-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/map/intif.c b/src/map/intif.c index 2f9c934f64..5f0e3da387 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -1370,7 +1370,7 @@ void intif_parse_Registers(int fd) } // have it not complain about insertion of vars before loading, and not set those vars as new or modified - reg_load = true; + pc_set_reg_load(true); if( RFIFOW(fd, 14) ) { char key[32]; @@ -1420,7 +1420,7 @@ void intif_parse_Registers(int fd) } } - reg_load = false; + pc_set_reg_load(false); if (flag && sd->vars_received&PRL_ACCG && sd->vars_received&PRL_ACCL && sd->vars_received&PRL_CHAR) pc_reg_received(sd); //Received all registry values, execute init scripts and what-not. [Skotlex] diff --git a/src/map/pc.c b/src/map/pc.c index 4414299c88..a3b11df20a 100755 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -67,6 +67,8 @@ struct fame_list taekwon_fame_list[MAX_FAME_LIST]; #define MOTD_LINE_SIZE 128 static char motd_text[MOTD_LINE_SIZE][CHAT_SIZE_MAX]; // Message of the day buffer [Valaris] +bool reg_load; + /** * Translation table from athena equip index to aegis bitmask */ @@ -101,6 +103,10 @@ const struct sg_data sg_info[MAX_PC_FEELHATE] = { { SG_STAR_ANGER, SG_STAR_BLESS, SG_STAR_COMFORT, "PC_FEEL_STAR", "PC_HATE_MOB_STAR", is_day_of_star } }; +void pc_set_reg_load( bool val ){ + reg_load = val; +} + /** * Item Cool Down Delay Saving * Struct item_cd is not a member of struct map_session_data diff --git a/src/map/pc.h b/src/map/pc.h index 43153b49d7..892872a4b3 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -746,8 +746,6 @@ extern struct eri *pc_itemgrouphealrate_ers; /// Player's Item Group Heal Rate t **/ struct eri *num_reg_ers; struct eri *str_reg_ers; -/* */ -bool reg_load; /* Global Expiration Timer ID */ extern int pc_expiration_tid; @@ -986,6 +984,7 @@ short pc_maxaspd(struct map_session_data *sd); ) #endif +void pc_set_reg_load(bool val); int pc_split_atoi(char* str, int* val, char sep, int max); int pc_class2idx(int class_); int pc_get_group_level(struct map_session_data *sd);