Fixed compilation for PACKETVER 20100303 (#6804)

Fixes #6803

Thanks to @blurryrox
This commit is contained in:
Lemongrass3110
2022-04-07 22:47:52 +02:00
committed by GitHub
parent 41da8646ff
commit ff3b731951
3 changed files with 11 additions and 7 deletions

View File

@@ -870,17 +870,17 @@ bool char_memitemdata_from_sql(struct s_storage* p, int max, int id, enum storag
* @retval SEX_FEMALE if the per-character sex is female
*/
int char_mmo_gender( const struct char_session_data *sd, const struct mmo_charstatus *p, char sex ){
switch( sex ){
#if PACKETVER >= 20141016
switch( sex ){
case 'M':
return SEX_MALE;
case 'F':
return SEX_FEMALE;
#else
// No matter what the database says, always return the account gender
// Per character gender is not supported before 2014-10-16
#endif
default:
#else
// No matter what the database says, always return the account gender
// Per character gender is not supported before 2014-10-16
#endif
// There are calls to this function that do not contain the session
if( sd == nullptr ){
int i;
@@ -899,7 +899,9 @@ int char_mmo_gender( const struct char_session_data *sd, const struct mmo_charst
#endif
return sd->sex;
#if PACKETVER >= 20141016
}
#endif
}
int char_mmo_char_tobuf(uint8* buf, struct mmo_charstatus* p);

View File

@@ -8672,7 +8672,7 @@ void clif_mvp_exp(struct map_session_data *sd, t_exp exp) {
fd = sd->fd;
WFIFOHEAD(fd, packet_len(0x10b));
WFIFOW(fd,0) = 0x10b;
WFIFOL(fd,2) = (uint32)min( exp, MAX_EXP );
WFIFOL(fd,2) = (uint32)u64min( exp, MAX_EXP );
WFIFOSET(fd, packet_len(0x10b));
#endif
}
@@ -19262,6 +19262,7 @@ static void clif_parse_SearchStoreInfo( int fd, struct map_session_data *sd ){
/// 0 = no "next" label
/// 1 = "next" label to retrieve more results
void clif_search_store_info_ack( struct map_session_data* sd ){
#if PACKETVER_MAIN_NUM >= 20100817 || PACKETVER_RE_NUM >= 20100706 || defined(PACKETVER_ZERO)
nullpo_retv( sd );
int fd = sd->fd;
@@ -19315,6 +19316,7 @@ void clif_search_store_info_ack( struct map_session_data* sd ){
}
WFIFOSET( fd, len );
#endif
}

View File

@@ -405,9 +405,9 @@ bool mail_invalid_operation(struct map_session_data *sd)
clif_displaymessage( sd->fd, msg_txt( sd, 796 ) ); // You cannot use RODEX on this map.
return true;
}
#endif
return false;
#endif
}
/**