Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding LGTM to CI tools (#3636)

Browse Source 
Thanks to @aleos89 for his help.
This commit is contained in:
Lemongrass3110 2018-10-29 21:25:36 +01:00 committed by GitHub
parent 446217cbcd
commit c0793a8072
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 460 additions and 458 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,7 +1,7 @@
rAthena
=======
Build Status: [![Build Status](https://travis-ci.org/rathena/rathena.png?branch=master)](https://travis-ci.org/rathena/rathena) [![Build status](https://ci.appveyor.com/api/projects/status/8574b8nlwd57loda/branch/master?svg=true)](https://ci.appveyor.com/project/rAthenaAPI/rathena/branch/master)
Build Status: [![Build Status](https://travis-ci.org/rathena/rathena.png?branch=master)](https://travis-ci.org/rathena/rathena) [![Build status](https://ci.appveyor.com/api/projects/status/8574b8nlwd57loda/branch/master?svg=true)](https://ci.appveyor.com/project/rAthenaAPI/rathena/branch/master) [![Total alerts](https://img.shields.io/lgtm/alerts/g/rathena/rathena.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/rathena/rathena/alerts/) [![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/rathena/rathena.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/rathena/rathena/context:cpp)
Table of Contents
---------

2
src/char/char.cpp
View File

@ -2823,7 +2823,7 @@ void char_config_split_startpoint(char *w1_value, char *w2_value, struct point s
start_point[i].map = mapindex_name2id(fields[1]);
if (!start_point[i].map) {
ShowError("Start point %s not found in map-index cache. Setting to default location.\n", start_point[i].map);
ShowError("Start point %s not found in map-index cache. Setting to default location.\n", fields[1]);
start_point[i].map = mapindex_name2id(MAP_DEFAULT_NAME);
start_point[i].x = MAP_DEFAULT_X;
start_point[i].y = MAP_DEFAULT_Y;

6
src/char/char_mapif.cpp
View File

@ -253,7 +253,7 @@ int chmapif_parse_getmapname(int fd, int id){
mapbuf = RFIFOP(fd,4);
RFIFOSKIP(fd,RFIFOW(fd,2));
ShowStatus("Map-Server %d connected: %d maps, from IP %d.%d.%d.%d port %d.\n",
ShowStatus("Map-Server %d connected: %" PRIuPTR " maps, from IP %d.%d.%d.%d port %d.\n",
id, map_server[id].map.size(), CONVIP(map_server[id].ip), map_server[id].port);
ShowStatus("Map-server %d loading complete.\n", id);
@ -397,7 +397,7 @@ int chmapif_parse_reqsavechar(int fd, int id){
if (size - 13 != sizeof(struct mmo_charstatus))
{
ShowError("parse_from_map (save-char): Size mismatch! %d != %d\n", size-13, sizeof(struct mmo_charstatus));
ShowError("parse_from_map (save-char): Size mismatch! %d != %" PRIuPTR "\n", size-13, sizeof(struct mmo_charstatus));
RFIFOSKIP(fd,size);
return 1;
}
@ -967,7 +967,7 @@ int chmapif_parse_save_scdata(int fd){
memcpy (&data, RFIFOP(fd, 14+i*sizeof(struct status_change_data)), sizeof(struct status_change_data));
if( i > 0 )
StringBuf_AppendStr(&buf, ", ");
StringBuf_Printf(&buf, "('%d','%d','%hu','%d','%d','%d','%d','%d')", aid, cid,
StringBuf_Printf(&buf, "('%d','%d','%hu','%d','%ld','%ld','%ld','%ld')", aid, cid,
data.type, data.tick, data.val1, data.val2, data.val3, data.val4);
}
if( SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf)) )

32
src/char/int_achievement.cpp
View File

@ -108,7 +108,7 @@ bool mapif_achievement_delete(uint32 char_id, int achievement_id)
* @param ad: Achievement data
* @return false in case of errors, true otherwise
*/
bool mapif_achievement_add(uint32 char_id, struct achievement ad)
bool mapif_achievement_add(uint32 char_id, struct achievement* ad)
{
StringBuf buf;
int i;
@ -118,19 +118,19 @@ bool mapif_achievement_add(uint32 char_id, struct achievement ad)
for (i = 0; i < MAX_ACHIEVEMENT_OBJECTIVES; ++i)
StringBuf_Printf(&buf, ", `count%d`", i + 1);
StringBuf_AppendStr(&buf, ")");
StringBuf_Printf(&buf, " VALUES ('%u', '%d',", char_id, ad.achievement_id, (uint32)ad.completed, (uint32)ad.rewarded);
if( ad.completed ){
StringBuf_Printf(&buf, "FROM_UNIXTIME('%u'),", (uint32)ad.completed);
StringBuf_Printf(&buf, " VALUES ('%u', '%d',", char_id, ad->achievement_id, (uint32)ad->completed, (uint32)ad->rewarded);
if( ad->completed ){
StringBuf_Printf(&buf, "FROM_UNIXTIME('%u'),", (uint32)ad->completed);
}else{
StringBuf_AppendStr(&buf, "NULL,");
}
if( ad.rewarded ){
StringBuf_Printf(&buf, "FROM_UNIXTIME('%u')", (uint32)ad.rewarded);
if( ad->rewarded ){
StringBuf_Printf(&buf, "FROM_UNIXTIME('%u')", (uint32)ad->rewarded);
}else{
StringBuf_AppendStr(&buf, "NULL");
}
for (i = 0; i < MAX_ACHIEVEMENT_OBJECTIVES; ++i)
StringBuf_Printf(&buf, ", '%d'", ad.count[i]);
StringBuf_Printf(&buf, ", '%d'", ad->count[i]);
StringBuf_AppendStr(&buf, ")");
if (SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf))) {
@ -150,26 +150,26 @@ bool mapif_achievement_add(uint32 char_id, struct achievement ad)
* @param ad: Achievement data
* @return false in case of errors, true otherwise
*/
bool mapif_achievement_update(uint32 char_id, struct achievement ad)
bool mapif_achievement_update(uint32 char_id, struct achievement* ad)
{
StringBuf buf;
int i;
StringBuf_Init(&buf);
StringBuf_Printf(&buf, "UPDATE `%s` SET ", schema_config.achievement_table);
if( ad.completed ){
StringBuf_Printf(&buf, "`completed` = FROM_UNIXTIME('%u'),", (uint32)ad.completed);
if( ad->completed ){
StringBuf_Printf(&buf, "`completed` = FROM_UNIXTIME('%u'),", (uint32)ad->completed);
}else{
StringBuf_AppendStr(&buf, "`completed` = NULL,");
}
if( ad.rewarded ){
StringBuf_Printf(&buf, "`rewarded` = FROM_UNIXTIME('%u')", (uint32)ad.rewarded);
if( ad->rewarded ){
StringBuf_Printf(&buf, "`rewarded` = FROM_UNIXTIME('%u')", (uint32)ad->rewarded);
}else{
StringBuf_AppendStr(&buf, "`rewarded` = NULL");
}
for (i = 0; i < MAX_ACHIEVEMENT_OBJECTIVES; ++i)
StringBuf_Printf(&buf, ", `count%d` = '%d'", i + 1, ad.count[i]);
StringBuf_Printf(&buf, " WHERE `id` = %d AND `char_id` = %u", ad.achievement_id, char_id);
StringBuf_Printf(&buf, ", `count%d` = '%d'", i + 1, ad->count[i]);
StringBuf_Printf(&buf, " WHERE `id` = %d AND `char_id` = %u", ad->achievement_id, char_id);
if (SQL_ERROR == Sql_QueryStr(sql_handle, StringBuf_Value(&buf))) {
Sql_ShowDebug(sql_handle);
@ -216,7 +216,7 @@ int mapif_parse_achievement_save(int fd)
// Only counts, complete, and reward are changable.
ARR_FIND(0, MAX_ACHIEVEMENT_OBJECTIVES, k, new_ad[i].count[k] != old_ad[j].count[k]);
if (k != MAX_ACHIEVEMENT_OBJECTIVES || new_ad[i].completed != old_ad[j].completed || new_ad[i].rewarded != old_ad[j].rewarded) {
if ((success = mapif_achievement_update(char_id, new_ad[i])) == false)
if ((success = mapif_achievement_update(char_id, &new_ad[i])) == false)
break;
}
@ -227,7 +227,7 @@ int mapif_parse_achievement_save(int fd)
}
} else { // Add new achievements
if (new_ad[i].achievement_id) {
if ((success = mapif_achievement_add(char_id, new_ad[i])) == false)
if ((success = mapif_achievement_add(char_id, &new_ad[i])) == false)
break;
}
}

2
src/char/int_pet.cpp
View File

@ -251,7 +251,7 @@ int mapif_save_pet(int fd, uint32 account_id, struct s_pet *data) {
RFIFOHEAD(fd);
len=RFIFOW(fd, 2);
if(sizeof(struct s_pet)!=len-8) {
ShowError("inter pet: data size error %d %d\n", sizeof(struct s_pet), len-8);
ShowError("inter pet: data size error %" PRIuPTR " %d\n", sizeof(struct s_pet), len-8);
}
else{

8
src/char/int_storage.cpp
View File

@ -252,7 +252,7 @@ bool mapif_parse_SaveGuildStorage(int fd)
if( sizeof(struct s_storage) != len - 12 )
{
ShowError("inter storage: data size error %d != %d\n", sizeof(struct s_storage), len - 12);
ShowError("inter storage: data size error %" PRIuPTR " != %d\n", sizeof(struct s_storage), len - 12);
}
else
{
@ -465,7 +465,7 @@ bool mapif_parse_itembound_retrieve(int fd)
* @param entries Inventory/cart/storage entries
* @param result
*/
void mapif_storage_data_loaded(int fd, uint32 account_id, char type, struct s_storage entries, bool result) {
void mapif_storage_data_loaded(int fd, uint32 account_id, char type, struct s_storage* entries, bool result) {
uint16 size = sizeof(struct s_storage) + 10;
WFIFOHEAD(fd, size);
@ -474,7 +474,7 @@ void mapif_storage_data_loaded(int fd, uint32 account_id, char type, struct s_st
WFIFOB(fd, 4) = type;
WFIFOL(fd, 5) = account_id;
WFIFOB(fd, 9) = result;
memcpy(WFIFOP(fd, 10), &entries, sizeof(struct s_storage));
memcpy(WFIFOP(fd, 10), entries, sizeof(struct s_storage));
WFIFOSET(fd, size);
}
@ -536,7 +536,7 @@ bool mapif_parse_StorageLoad(int fd) {
stor.state.put = (mode&STOR_MODE_PUT) ? 1 : 0;
stor.state.get = (mode&STOR_MODE_GET) ? 1 : 0;
mapif_storage_data_loaded(fd, aid, type, stor, res);
mapif_storage_data_loaded(fd, aid, type, &stor, res);
return true;
}

4
src/char/inter.cpp
View File

@ -887,7 +887,7 @@ void inter_config_readConf(void) {
try {
id = node["ID"].as<unsigned int>();
}
catch (std::exception) {
catch (const std::exception&) {
yaml_invalid_warning("inter_config_readConf: Storage definition with invalid ID field in '" CL_WHITE "%s" CL_RESET "', skipping.\n", node, current_file);
continue;
}
@ -913,7 +913,7 @@ void inter_config_readConf(void) {
try {
storage_table->max_num = node["Max"].as<uint16>();
}
catch (std::exception) {
catch (const std::exception&) {
yaml_invalid_warning("inter_config_readConf: Storage definition with invalid Max field in '" CL_WHITE "%s" CL_RESET "', skipping.\n", node, current_file);
continue;
}

4
src/common/malloc.cpp
View File

@ -235,7 +235,7 @@ void* _mmalloc(size_t size, const char *file, int line, const char *func )
struct unit_head *head;
if (((long) size) < 0) {
ShowError("_mmalloc: %d\n", size);
ShowError("_mmalloc: %" PRIuPTR "\n", size);
return NULL;
}
@ -265,7 +265,7 @@ void* _mmalloc(size_t size, const char *file, int line, const char *func )
*(long*)((char*)p + sizeof(struct unit_head_large) - sizeof(long) + size) = FREED_POINTER;
return (char *)p + sizeof(struct unit_head_large) - sizeof(long);
} else {
ShowFatalError("Memory manager::memmgr_alloc failed (allocating %d+%d bytes at %s:%d).\n", sizeof(struct unit_head_large), size, file, line);
ShowFatalError("Memory manager::memmgr_alloc failed (allocating %" PRIuPTR "+%" PRIuPTR " bytes at %s:%d).\n", sizeof(struct unit_head_large), size, file, line);
exit(EXIT_FAILURE);
}
}

12
src/common/socket.cpp
View File

@ -321,9 +321,9 @@ void setsocketopts(int fd,int delay_timeout){
#endif
if (sSetsockopt (fd, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout,sizeof(timeout)) < 0)
ShowError("setsocketopts: Unable to set SO_RCVTIMEO timeout for connection #%d!\n");
ShowError("setsocketopts: Unable to set SO_RCVTIMEO timeout for connection #%d!\n", fd);
if (sSetsockopt (fd, SOL_SOCKET, SO_SNDTIMEO, (char *)&timeout,sizeof(timeout)) < 0)
ShowError("setsocketopts: Unable to set SO_SNDTIMEO timeout for connection #%d!\n");
ShowError("setsocketopts: Unable to set SO_SNDTIMEO timeout for connection #%d!\n", fd);
}
}
@ -737,7 +737,7 @@ int RFIFOSKIP(int fd, size_t len)
s = session[fd];
if ( s->rdata_size < s->rdata_pos + len ) {
ShowError("RFIFOSKIP: skipped past end of read buffer! Adjusting from %d to %d (session #%d)\n", len, RFIFOREST(fd), fd);
ShowError("RFIFOSKIP: skipped past end of read buffer! Adjusting from %" PRIuPTR " to %d (session #%d)\n", len, RFIFOREST(fd), fd);
len = RFIFOREST(fd);
}
@ -786,12 +786,12 @@ int WFIFOSET(int fd, size_t len)
if( !s->flag.server ) {
if( len > socket_max_client_packet ) {// see declaration of socket_max_client_packet for details
ShowError("WFIFOSET: Dropped too large client packet 0x%04x (length=%u, max=%u).\n", WFIFOW(fd,0), len, socket_max_client_packet);
ShowError("WFIFOSET: Dropped too large client packet 0x%04x (length=%" PRIuPTR ", max=%" PRIuPTR ").\n", WFIFOW(fd,0), len, socket_max_client_packet);
return 0;
}
if( s->wdata_size+len > WFIFO_MAX ) {// reached maximum write fifo size
ShowError("WFIFOSET: Maximum write buffer size for client connection %d exceeded, most likely caused by packet 0x%04x (len=%u, ip=%lu.%lu.%lu.%lu).\n", fd, WFIFOW(fd,0), len, CONVIP(s->client_addr));
ShowError("WFIFOSET: Maximum write buffer size for client connection %d exceeded, most likely caused by packet 0x%04x (len=%" PRIuPTR ", ip=%lu.%lu.%lu.%lu).\n", fd, WFIFOW(fd,0), len, CONVIP(s->client_addr));
set_eof(fd);
return 0;
}
@ -1525,7 +1525,7 @@ void send_shortlist_add_fd(int fd)
if( send_shortlist_count >= ARRAYLENGTH(send_shortlist_array) )
{
ShowDebug("send_shortlist_add_fd: shortlist is full, ignoring... (fd=%d shortlist.count=%d shortlist.length=%d)\n", fd, send_shortlist_count, ARRAYLENGTH(send_shortlist_array));
ShowDebug("send_shortlist_add_fd: shortlist is full, ignoring... (fd=%d shortlist.count=%" PRIuPTR " shortlist.length=%d)\n", fd, send_shortlist_count, ARRAYLENGTH(send_shortlist_array));
return;
}

2
src/common/sql.cpp
View File

@ -807,7 +807,7 @@ int SqlStmt_BindColumn(SqlStmt* self, size_t idx, enum SqlDataType buffer_type,
{
if( buffer_len < 1 )
{
ShowDebug("SqlStmt_BindColumn: buffer_len(%d) is too small, no room for the nul-terminator\n", buffer_len);
ShowDebug("SqlStmt_BindColumn: buffer_len(%" PRIuPTR ") is too small, no room for the nul-terminator\n", buffer_len);
return SQL_ERROR;
}
--buffer_len;// nul-terminator

4
src/login/login.cpp
View File

@ -365,14 +365,14 @@ int login_mmo_auth(struct login_session_data* sd, bool isServer) {
int i;
if( !sd->has_client_hash ) {
ShowNotice("Client didn't send client hash (account: %s, ip: %s)\n", sd->userid, acc.state, ip);
ShowNotice("Client didn't send client hash (account: %s, ip: %s)\n", sd->userid, ip);
return 5;
}
for( i = 0; i < 16; i++ )
sprintf(&smd5[i * 2], "%02x", sd->client_hash[i]);
ShowNotice("Invalid client hash (account: %s, sent md5: %d, ip: %s)\n", sd->userid, smd5, ip);
ShowNotice("Invalid client hash (account: %s, sent md5: %s, ip: %s)\n", sd->userid, smd5, ip);
return 5;
}
}

14
src/login/loginchrif.cpp
View File

@ -206,17 +206,17 @@ int logchrif_send_accdata(int fd, uint32 aid) {
* @param flag 0x1: VIP, 0x2: GM, 0x4: Show rates on player
* @param mapfd
*/
int logchrif_sendvipdata(int fd, struct mmo_account acc, unsigned char flag, int mapfd) {
int logchrif_sendvipdata(int fd, struct mmo_account* acc, unsigned char flag, int mapfd) {
#ifdef VIP_ENABLE
WFIFOHEAD(fd,19);
WFIFOW(fd,0) = 0x2743;
WFIFOL(fd,2) = acc.account_id;
WFIFOL(fd,6) = (int)acc.vip_time;
WFIFOL(fd,2) = acc->account_id;
WFIFOL(fd,6) = (int)acc->vip_time;
WFIFOB(fd,10) = flag;
WFIFOL(fd,11) = acc.group_id; //new group id
WFIFOL(fd,11) = acc->group_id; //new group id
WFIFOL(fd,15) = mapfd; //link to mapserv
WFIFOSET(fd,19);
logchrif_send_accdata(fd,acc.account_id); //refresh char with new setting
logchrif_send_accdata(fd,acc->account_id); //refresh char with new setting
#endif
return 1;
}
@ -672,7 +672,7 @@ int logchrif_parse_reqvipdata(int fd) {
bool isvip = false;
if( acc.group_id > login_config.vip_sys.group ) { //Don't change group if it's higher.
logchrif_sendvipdata(fd,acc,0x2|((flag&0x8)?0x4:0),mapfd);
logchrif_sendvipdata(fd,&acc,0x2|((flag&0x8)?0x4:0),mapfd);
return 1;
}
if( flag&2 ) {
@ -696,7 +696,7 @@ int logchrif_parse_reqvipdata(int fd) {
acc.vip_time = vip_time;
accounts->save(accounts,&acc);
if( flag&1 )
logchrif_sendvipdata(fd,acc,((isvip)?0x1:0)|((flag&0x8)?0x4:0),mapfd);
logchrif_sendvipdata(fd,&acc,((isvip)?0x1:0)|((flag&0x8)?0x4:0),mapfd);
}
}
#endif

651
src/map/battle.cpp
View File

File diff suppressed because it is too large Load Diff

1
src/map/battle.hpp
View File

@ -87,7 +87,6 @@ extern int attr_fix_table[MAX_ELE_LEVEL][ELE_MAX][ELE_MAX];
// Damage Calculation
struct Damage battle_calc_attack(int attack_type,struct block_list *bl,struct block_list *target,uint16 skill_id,uint16 skill_lv,int flag);
struct Damage battle_calc_attack_plant(struct Damage wd, struct block_list *src,struct block_list *target, uint16 skill_id, uint16 skill_lv);
int64 battle_calc_return_damage(struct block_list *bl, struct block_list *src, int64 *, int flag, uint16 skill_id, bool status_reflect);

4
src/map/cashshop.cpp
View File

@ -143,7 +143,7 @@ static int cashshop_read_db_sql( void ){
Sql_FreeResult( mmysql_handle );
ShowStatus( "Done reading '" CL_WHITE "%lu" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, cash_db_name[fi] );
ShowStatus( "Done reading '" CL_WHITE "%u" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, cash_db_name[fi] );
}
return 0;
@ -232,7 +232,7 @@ static void sale_read_db_sql( void ){
Sql_FreeResult(mmysql_handle);
ShowStatus( "Done reading '" CL_WHITE "%lu" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, sales_table );
ShowStatus( "Done reading '" CL_WHITE "%u" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, sales_table );
}
static TIMER_FUNC(sale_end_timer){

6
src/map/chrif.cpp
View File

@ -692,7 +692,7 @@ void chrif_authok(int fd) {
//Check if both servers agree on the struct's size
if( RFIFOW(fd,2) - 25 != sizeof(struct mmo_charstatus) ) {
ShowError("chrif_authok: Data size mismatch! %d != %d\n", RFIFOW(fd,2) - 25, sizeof(struct mmo_charstatus));
ShowError("chrif_authok: Data size mismatch! %d != %" PRIuPTR "\n", RFIFOW(fd,2) - 25, sizeof(struct mmo_charstatus));
return;
}
@ -1986,13 +1986,13 @@ void do_final_chrif(void) {
*------------------------------------------*/
void do_init_chrif(void) {
if(sizeof(struct mmo_charstatus) > 0xFFFF){
ShowError("mmo_charstatus size = %d is too big to be transmitted. (must be below 0xFFFF)\n",
ShowError("mmo_charstatus size = %" PRIuPTR " is too big to be transmitted. (must be below 0xFFFF)\n",
sizeof(struct mmo_charstatus));
exit(EXIT_FAILURE);
}
if (sizeof(struct s_storage) > 0xFFFF) {
ShowError("s_storage size = %d is too big to be transmitted. (must be below 0xFFFF)\n", sizeof(struct s_storage));
ShowError("s_storage size = %" PRIuPTR " is too big to be transmitted. (must be below 0xFFFF)\n", sizeof(struct s_storage));
exit(EXIT_FAILURE);
}

12
src/map/clif.cpp
View File

@ -6216,7 +6216,7 @@ void clif_GlobalMessage(struct block_list* bl, const char* message, enum send_ta
static_assert(CHAT_SIZE_MAX > 8, "CHAT_SIZE_MAX too small for packet");
if( len > CHAT_SIZE_MAX ) {
ShowWarning("clif_GlobalMessage: Truncating too long message '%s' (len=%d).\n", message, len);
ShowWarning("clif_GlobalMessage: Truncating too long message '%s' (len=%" PRIuPTR ").\n", message, len);
len = CHAT_SIZE_MAX;
}
std::unique_ptr<char> buf(new char[8+len]);
@ -7632,7 +7632,7 @@ void clif_party_message(struct party_data* p, uint32 account_id, const char* mes
if( len > sizeof(buf)-8 )
{
ShowWarning("clif_party_message: Truncated message '%s' (len=%d, max=%d, party_id=%d).\n", mes, len, sizeof(buf)-8, p->party.party_id);
ShowWarning("clif_party_message: Truncated message '%s' (len=%d, max=%" PRIuPTR ", party_id=%d).\n", mes, len, sizeof(buf)-8, p->party.party_id);
len = sizeof(buf)-8;
}
@ -8826,7 +8826,7 @@ void clif_guild_message(struct guild *g,uint32 account_id,const char *mes,int le
}
else if( len > sizeof(buf)-5 )
{
ShowWarning("clif_guild_message: Truncated message '%s' (len=%d, max=%d, guild_id=%d).\n", mes, len, sizeof(buf)-5, g->guild_id);
ShowWarning("clif_guild_message: Truncated message '%s' (len=%d, max=%" PRIuPTR ", guild_id=%d).\n", mes, len, sizeof(buf)-5, g->guild_id);
len = sizeof(buf)-5;
}
@ -9085,7 +9085,7 @@ void clif_disp_message(struct block_list* src, const char* mes, int len, enum se
if( len == 0 ) {
return;
} else if( len > sizeof(buf)-5 ) {
ShowWarning("clif_disp_message: Truncated message '%s' (len=%d, max=%d, aid=%d).\n", mes, len, sizeof(buf)-5, src->id);
ShowWarning("clif_disp_message: Truncated message '%s' (len=%d, max=%" PRIuPTR ", aid=%d).\n", mes, len, sizeof(buf)-5, src->id);
len = sizeof(buf)-5;
}
@ -19032,7 +19032,7 @@ void clif_showscript(struct block_list* bl, const char* message, enum send_targe
len = strlen(message)+1;
if( len > sizeof(buf)-8 ) {
ShowWarning("clif_showscript: Truncating too long message '%s' (len=%d).\n", message, len);
ShowWarning("clif_showscript: Truncating too long message '%s' (len=%" PRIuPTR ").\n", message, len);
len = sizeof(buf)-8;
}
@ -19070,7 +19070,7 @@ void clif_clan_message(struct clan *clan,const char *mes,int len){
if( len == 0 ){
return;
}else if( len > (sizeof(buf)-5-NAME_LENGTH) ){
ShowWarning("clif_clan_message: Truncated message '%s' (len=%d, max=%d, clan_id=%d).\n", mes, len, sizeof(buf)-5, clan->id);
ShowWarning("clif_clan_message: Truncated message '%s' (len=%d, max=%" PRIuPTR ", clan_id=%d).\n", mes, len, sizeof(buf)-5, clan->id);
len = sizeof(buf)-5-NAME_LENGTH;
}

9
src/map/homunculus.cpp
View File

@ -1591,11 +1591,12 @@ void read_homunculus_expdb(void)
memset(hexptbl,0,sizeof(hexptbl));
for (i = 0; i < ARRAYLENGTH(filename); i++) {
FILE *fp;
char path[1024];
char line[1024];
int j=0;
sprintf(line, "%s/%s", db_path, filename[i]);
fp = fopen(line,"r");
sprintf(path, "%s/%s", db_path, filename[i]);
fp = fopen(path,"r");
if (fp == NULL) {
if (i != 0)
continue;
@ -1611,11 +1612,11 @@ void read_homunculus_expdb(void)
break;
}
if (hexptbl[MAX_LEVEL - 1]) { // Last permitted level have to be 0!
ShowWarning("read_hexptbl: Reached max level in %s [%d]. Remaining lines were not read.\n ",filename,MAX_LEVEL);
ShowWarning("read_hexptbl: Reached max level in %s [%d]. Remaining lines were not read.\n ",path,MAX_LEVEL);
hexptbl[MAX_LEVEL - 1] = 0;
}
fclose(fp);
ShowStatus("Done reading '" CL_WHITE "%d" CL_RESET "' levels in '" CL_WHITE "%s/%s" CL_RESET "'.\n", j, db_path, filename[i]);
ShowStatus("Done reading '" CL_WHITE "%d" CL_RESET "' levels in '" CL_WHITE "%s/%s" CL_RESET "'.\n", j, db_path, path);
}
}

32
src/map/intif.cpp
View File

@ -428,7 +428,7 @@ int intif_saveregistry(struct map_session_data *sd)
++len;
if (!lValid) { //this is sql colum size, must be retrive from config
ShowError("intif_saveregistry: Variable name length is too long (aid: %d, cid: %d): '%s' sz=%d\n", sd->status.account_id, sd->status.char_id, varname, len);
ShowError("intif_saveregistry: Variable name length is too long (aid: %d, cid: %d): '%s' sz=%" PRIuPTR "\n", sd->status.account_id, sd->status.char_id, varname, len);
continue;
}
WFIFOB(inter_fd, plen) = (unsigned char)len; // won't be higher; the column size is 32
@ -450,7 +450,7 @@ int intif_saveregistry(struct map_session_data *sd)
lValid = script_check_RegistryVariableLength(1,p->value,&len);
++len;
if ( !lValid ) { // error can't be higher; the column size is 254. (nb the transmission limit with be fixed with protobuf revamp)
ShowDebug( "intif_saveregistry: Variable value length is too long (aid: %d, cid: %d): '%s' sz=%d to be saved with current system and will be truncated\n",sd->status.account_id, sd->status.char_id,p->value,len);
ShowDebug( "intif_saveregistry: Variable value length is too long (aid: %d, cid: %d): '%s' sz=%" PRIuPTR " to be saved with current system and will be truncated\n",sd->status.account_id, sd->status.char_id,p->value,len);
len = 254;
p->value[len - 1] = '\0'; //this is backward for old char-serv but new one doesn't need this
}
@ -1488,7 +1488,7 @@ int intif_parse_LoadGuildStorage(int fd)
return 0;
}
if (RFIFOW(fd,2)-13 != sizeof(struct s_storage)) {
ShowError("intif_parse_LoadGuildStorage: data size error %d %d\n",RFIFOW(fd,2)-13 , sizeof(struct s_storage));
ShowError("intif_parse_LoadGuildStorage: data size error %d %" PRIuPTR "\n",RFIFOW(fd,2)-13 , sizeof(struct s_storage));
gstor->status = false;
return 0;
}
@ -1538,7 +1538,7 @@ int intif_parse_PartyInfo(int fd)
}
if( RFIFOW(fd,2) != 8+sizeof(struct party) )
ShowError("intif: party info : data size error (char_id=%d party_id=%d packet_len=%d expected_len=%d)\n", RFIFOL(fd,4), RFIFOL(fd,8), RFIFOW(fd,2), 8+sizeof(struct party));
ShowError("intif: party info : data size error (char_id=%d party_id=%d packet_len=%d expected_len=%" PRIuPTR ")\n", RFIFOL(fd,4), RFIFOL(fd,8), RFIFOW(fd,2), 8+sizeof(struct party));
party_recv_info((struct party *)RFIFOP(fd,8), RFIFOL(fd,4));
return 1;
}
@ -1637,7 +1637,7 @@ int intif_parse_GuildInfo(int fd)
return 0;
}
if( RFIFOW(fd,2)!=sizeof(struct guild)+4 )
ShowError("intif: guild info : data size error Gid: %d recv size: %d Expected size: %d\n",RFIFOL(fd,4),RFIFOW(fd,2),sizeof(struct guild)+4);
ShowError("intif: guild info : data size error Gid: %d recv size: %d Expected size: %" PRIuPTR "\n",RFIFOL(fd,4),RFIFOW(fd,2),sizeof(struct guild)+4);
guild_recv_info((struct guild *)RFIFOP(fd,4));
return 1;
}
@ -1760,7 +1760,7 @@ int intif_parse_GuildMemberInfoChanged(int fd)
int intif_parse_GuildPosition(int fd)
{
if( RFIFOW(fd,2)!=sizeof(struct guild_position)+12 )
ShowError("intif: guild info : data size error\n %d %d %d",RFIFOL(fd,4),RFIFOW(fd,2),sizeof(struct guild_position)+12);
ShowError("intif: guild info : data size error %d %d %" PRIuPTR "\n",RFIFOL(fd,4),RFIFOW(fd,2),sizeof(struct guild_position)+12);
guild_position_changed(RFIFOL(fd,4),RFIFOL(fd,8),(struct guild_position *)RFIFOP(fd,12));
return 1;
}
@ -1863,7 +1863,7 @@ int intif_parse_RecvPetData(int fd)
len=RFIFOW(fd,2);
if(sizeof(struct s_pet)!=len-9) {
if(battle_config.etc_log)
ShowError("intif: pet data: data size error %d %d\n",sizeof(struct s_pet),len-9);
ShowError("intif: pet data: data size error %" PRIuPTR " %d\n",sizeof(struct s_pet),len-9);
}
else{
memcpy(&p,RFIFOP(fd,9),sizeof(struct s_pet));
@ -1938,7 +1938,7 @@ int intif_parse_CreateHomunculus(int fd)
len=RFIFOW(fd,2)-9;
if(sizeof(struct s_homunculus)!=len) {
if(battle_config.etc_log)
ShowError("intif: create homun data: data size error %d != %d\n",sizeof(struct s_homunculus),len);
ShowError("intif: create homun data: data size error %" PRIuPTR " != %d\n",sizeof(struct s_homunculus),len);
return 0;
}
hom_recv_data(RFIFOL(fd,4), (struct s_homunculus*)RFIFOP(fd,9), RFIFOB(fd,8)) ;
@ -1958,7 +1958,7 @@ int intif_parse_RecvHomunculusData(int fd)
if(sizeof(struct s_homunculus)!=len) {
if(battle_config.etc_log)
ShowError("intif: homun data: data size error %d %d\n",sizeof(struct s_homunculus),len);
ShowError("intif: homun data: data size error %" PRIuPTR " %d\n",sizeof(struct s_homunculus),len);
return 0;
}
hom_recv_data(RFIFOL(fd,4), (struct s_homunculus*)RFIFOP(fd,9), RFIFOB(fd,8));
@ -2306,7 +2306,7 @@ int intif_parse_Mail_inboxreceived(int fd)
if (RFIFOW(fd,2) - 10 != sizeof(struct mail_data))
{
ShowError("intif_parse_Mail_inboxreceived: data size error %d %d\n", RFIFOW(fd,2) - 10, sizeof(struct mail_data));
ShowError("intif_parse_Mail_inboxreceived: data size error %d %" PRIuPTR "\n", RFIFOW(fd,2) - 10, sizeof(struct mail_data));
return 0;
}
@ -2382,7 +2382,7 @@ int intif_parse_Mail_getattach(int fd)
if (RFIFOW(fd, 2) - 16 != sizeof(struct item)*MAIL_MAX_ITEM)
{
ShowError("intif_parse_Mail_getattach: data size error %d %d\n", RFIFOW(fd, 2) - 16, sizeof(struct item));
ShowError("intif_parse_Mail_getattach: data size error %d %" PRIuPTR "\n", RFIFOW(fd, 2) - 16, sizeof(struct item));
return 0;
}
@ -2564,7 +2564,7 @@ static void intif_parse_Mail_send(int fd)
if( RFIFOW(fd,2) - 4 != sizeof(struct mail_message) )
{
ShowError("intif_parse_Mail_send: data size error %d %d\n", RFIFOW(fd,2) - 4, sizeof(struct mail_message));
ShowError("intif_parse_Mail_send: data size error %d %" PRIuPTR "\n", RFIFOW(fd,2) - 4, sizeof(struct mail_message));
return;
}
@ -2725,7 +2725,7 @@ static void intif_parse_Auction_register(int fd)
if( RFIFOW(fd,2) - 4 != sizeof(struct auction_data) )
{
ShowError("intif_parse_Auction_register: data size error %d %d\n", RFIFOW(fd,2) - 4, sizeof(struct auction_data));
ShowError("intif_parse_Auction_register: data size error %d %" PRIuPTR "\n", RFIFOW(fd,2) - 4, sizeof(struct auction_data));
return;
}
@ -2935,7 +2935,7 @@ int intif_parse_mercenary_received(int fd)
if( sizeof(struct s_mercenary) != len )
{
if( battle_config.etc_log )
ShowError("intif: create mercenary data size error %d != %d\n", sizeof(struct s_mercenary), len);
ShowError("intif: create mercenary data size error %" PRIuPTR " != %d\n", sizeof(struct s_mercenary), len);
return 0;
}
@ -3060,7 +3060,7 @@ int intif_parse_elemental_received(int fd)
if( sizeof(struct s_elemental) != len )
{
if( battle_config.etc_log )
ShowError("intif: create elemental data size error %d != %d\n", sizeof(struct s_elemental), len);
ShowError("intif: create elemental data size error %" PRIuPTR " != %d\n", sizeof(struct s_elemental), len);
return 0;
}
@ -3427,7 +3427,7 @@ static bool intif_parse_StorageReceived(int fd)
}
}
if (RFIFOW(fd,2)-10 != sz_stor) {
ShowError("intif_parse_StorageReceived: data size error %d %d\n",RFIFOW(fd,2)-10 , sz_stor);
ShowError("intif_parse_StorageReceived: data size error %d %" PRIuPTR "\n",RFIFOW(fd,2)-10 , sz_stor);
stor->status = false;
return false;
}

10
src/map/itemdb.cpp
View File

@ -1081,7 +1081,7 @@ static void itemdb_read_combos(const char* basedir, bool silent) {
}
fclose(fp);
ShowStatus("Done reading '" CL_WHITE "%lu" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n",count,path);
ShowStatus("Done reading '" CL_WHITE "%u" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n",count,path);
return;
}
@ -1175,7 +1175,7 @@ bool itemdb_parse_roulette_db(void)
}
}
ShowStatus("Done reading '" CL_WHITE "%lu" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, roulette_table);
ShowStatus("Done reading '" CL_WHITE "%u" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, roulette_table);
return true;
}
@ -1521,7 +1521,7 @@ static int itemdb_readdb(void){
fclose(fp);
ShowStatus("Done reading '" CL_WHITE "%lu" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, path);
ShowStatus("Done reading '" CL_WHITE "%u" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, path);
}
return 0;
@ -1567,7 +1567,7 @@ static int itemdb_read_sqldb(void) {
// free the query result
Sql_FreeResult(mmysql_handle);
ShowStatus("Done reading '" CL_WHITE "%lu" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, item_db_name[fi]);
ShowStatus("Done reading '" CL_WHITE "%u" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, item_db_name[fi]);
}
return 0;
@ -1708,7 +1708,7 @@ static bool itemdb_read_randomopt(const char* basedir, bool silent) {
}
fclose(fp);
ShowStatus("Done reading '" CL_WHITE "%lu" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, path);
ShowStatus("Done reading '" CL_WHITE "%u" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, path);
return true;
}

2
src/map/map.cpp
View File

@ -3749,7 +3749,7 @@ int map_readallmaps (void)
map_cache_buffer[i] = map_init_mapcache(fp);
if( !map_cache_buffer[i] ) {
ShowFatalError( "Failed to initialize mapcache data (%s)..\n", mapcachefilepath );
ShowFatalError( "Failed to initialize mapcache data (%s)..\n", mapcachefilepath[i] );
exit(EXIT_FAILURE);
}

10
src/map/mob.cpp
View File

@ -3845,7 +3845,7 @@ int mob_clone_spawn(struct map_session_data *sd, int16 m, int16 x, int16 y, cons
try{
db = &mob_db_data[mob_id];
}catch( std::bad_alloc ){
}catch( const std::bad_alloc& ){
ShowError( "mob_clone_spawn: Memory allocation for clone %hu failed.\n", mob_id );
return 0;
}
@ -4264,7 +4264,7 @@ static bool mob_parse_dbrow(char** str)
if (db == NULL) {
try{
db = &mob_db_data[mob_id];
}catch( std::bad_alloc ){
}catch( const std::bad_alloc& ){
ShowError( "Memory allocation for monster %hu failed.\n", mob_id );
return false;
}
@ -4330,7 +4330,7 @@ static int mob_read_sqldb(void)
// free the query result
Sql_FreeResult(mmysql_handle);
ShowStatus("Done reading '" CL_WHITE "%lu" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, mob_db_name[fi]);
ShowStatus("Done reading '" CL_WHITE "%u" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, mob_db_name[fi]);
}
return 0;
}
@ -4455,7 +4455,7 @@ static bool mob_parse_row_chatdb(char* fields[], int columns, int current)
if( ms == NULL ){
try{
ms = &mob_chat_db[msg_id];
}catch( std::bad_alloc ){
}catch( const std::bad_alloc& ){
ShowError( "mob_parse_row_chatdb: Memory allocation for chat ID '%d' failed.\n", msg_id );
return false;
}
@ -4798,7 +4798,7 @@ static int mob_read_sqlskilldb(void)
// free the query result
Sql_FreeResult(mmysql_handle);
ShowStatus("Done reading '" CL_WHITE "%lu" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, mob_skill_db_name[fi]);
ShowStatus("Done reading '" CL_WHITE "%u" CL_RESET "' entries in '" CL_WHITE "%s" CL_RESET "'.\n", count, mob_skill_db_name[fi]);
}
return 0;
}

6
src/map/npc.cpp
View File

@ -2800,7 +2800,7 @@ static const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const
}
if (type == NPCTYPE_MARKETSHOP && (!qty || qty > UINT16_MAX)) {
ShowWarning("npc_parse_shop: Item %s [%hu] is stocked with invalid value %d, changed to 1. File '%s', line '%d'.\n",
id->name, nameid2, filepath, strline(buffer,start-buffer));
id->name, nameid2, qty, filepath, strline(buffer,start-buffer));
qty = 1;
}
//for logs filters, atcommands and iteminfo script command
@ -3994,7 +3994,7 @@ static const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, con
}
m = map_mapname2mapid(mapname);
if (m < 0) {
ShowWarning("npc_parse_mapflag: Unknown map in file '%s', line '%d' : %s\n * w1=%s\n * w2=%s\n * w3=%s\n * w4=%s\n", mapname, filepath, strline(buffer,start-buffer), w1, w2, w3, w4);
ShowWarning("npc_parse_mapflag: Unknown map '%s' in file '%s', line '%d'.\n * w1=%s\n * w2=%s\n * w3=%s\n * w4=%s\n", mapname, filepath, strline(buffer,start-buffer), w1, w2, w3, w4);
return strchr(start,'\n');// skip and continue
}
@ -4449,7 +4449,7 @@ void npc_read_event_script(void)
if (battle_config.etc_log) {
//Print summary.
for (i = 0; i < NPCE_MAX; i++)
ShowInfo("%d '%s' events.\n", script_event[static_cast<enum npce_event>(i)].size(), npc_get_script_event_name(i));
ShowInfo("%" PRIuPTR " '%s' events.\n", script_event[static_cast<enum npce_event>(i)].size(), npc_get_script_event_name(i));
}
}

12
src/map/pc.cpp
View File

@ -2484,7 +2484,7 @@ void pc_itemgrouphealrate(struct map_session_data *sd, uint16 group_id, short ra
}
if (i >= UINT8_MAX) {
ShowError("pc_itemgrouphealrate_add: Reached max (%d) possible bonuses for this player %d\n", UINT8_MAX);
ShowError("pc_itemgrouphealrate_add: Reached max (%d) possible bonuses for this player %d\n", UINT8_MAX, sd->status.char_id);
return;
}
@ -11401,7 +11401,7 @@ static bool pc_readdb_job_noenter_map(char *str[], int columns, int current) {
}
if (!pcdb_checkid(class_) || (idx = pc_class2idx(class_)) < 0) {
ShowError("pc_readdb_job_noenter_map: Invalid job %d specified.\n", str[0]);
ShowError("pc_readdb_job_noenter_map: Invalid job %d specified.\n", class_);
return false;
}
@ -11501,12 +11501,12 @@ void pc_readdb(void) {
s = pc_read_statsdb(dbsubpath2,s,i > 0);
if (i == 0)
#ifdef RENEWAL_ASPD
sv_readdb(dbsubpath1, "re/job_db1.txt",',',6+MAX_WEAPON_TYPE,6+MAX_WEAPON_TYPE,CLASS_COUNT,&pc_readdb_job1, i > 0);
sv_readdb(dbsubpath1, "re/job_db1.txt",',',6+MAX_WEAPON_TYPE,6+MAX_WEAPON_TYPE,CLASS_COUNT,&pc_readdb_job1, false);
#else
sv_readdb(dbsubpath1, "pre-re/job_db1.txt",',',5+MAX_WEAPON_TYPE,5+MAX_WEAPON_TYPE,CLASS_COUNT,&pc_readdb_job1, i > 0);
sv_readdb(dbsubpath1, "pre-re/job_db1.txt",',',5+MAX_WEAPON_TYPE,5+MAX_WEAPON_TYPE,CLASS_COUNT,&pc_readdb_job1, false);
#endif
else
sv_readdb(dbsubpath1, "job_db1.txt",',',5+MAX_WEAPON_TYPE,6+MAX_WEAPON_TYPE,CLASS_COUNT,&pc_readdb_job1, i > 0);
sv_readdb(dbsubpath1, "job_db1.txt",',',5+MAX_WEAPON_TYPE,6+MAX_WEAPON_TYPE,CLASS_COUNT,&pc_readdb_job1, true);
sv_readdb(dbsubpath1, "job_db2.txt",',',1,1+MAX_LEVEL,CLASS_COUNT,&pc_readdb_job2, i > 0);
sv_readdb(dbsubpath2, "job_exp.txt",',',4,1000+3,CLASS_COUNT*2,&pc_readdb_job_exp, i > 0); //support till 1000lvl
#ifdef HP_SP_TABLES
@ -12146,7 +12146,7 @@ TIMER_FUNC(pc_bonus_script_timer){
return 0;
if (!sd->bonus_script.head || entry == NULL) {
ShowError("pc_bonus_script_timer: Invalid entry pointer 0x%08X!\n", entry);
ShowError("pc_bonus_script_timer: Invalid entry pointer %p!\n", entry);
return 0;
}

2
src/map/quest.cpp
View File

@ -474,7 +474,7 @@ void quest_read_txtdb(void)
quest_id = atoi(str[0]);
if (quest_id < 0 || quest_id >= INT_MAX) {
ShowError("quest_read_txtdb: Invalid quest ID '%d' in '%s' line '%s' (min: 0, max: %d.)\n", quest_id, filename,ln, INT_MAX);
ShowError("quest_read_txtdb: Invalid quest ID '%d' in '%s' line '%d' (min: 0, max: %d.)\n", quest_id, filename, ln, INT_MAX);
continue;
}

65
src/map/script.cpp
View File

@ -1099,9 +1099,15 @@ const char* parse_variable(const char* p) {
const char *p2 = NULL;
const char *var = p;
if ((p[0] == '+' && p[1] == '+' && (type = C_ADD_PRE)) // pre ++
|| (p[0] == '-' && p[1] == '-' && (type = C_SUB_PRE))) // pre --
if( p[0] == '+' && p[1] == '+' ){
type = C_ADD_PRE; // pre ++
}else if( p[0] == '-' && p[1] == '-' ){
type = C_SUB_PRE; // pre --
}
if( type != C_NOP ){
var = p = skip_space(&p[2]);
}
// skip the variable where applicable
p = skip_word(p);
@ -1123,24 +1129,39 @@ const char* parse_variable(const char* p) {
}
}
if( type == C_NOP &&
!( ( p[0] == '=' && p[1] != '=' && (type = C_EQ) ) // =
|| ( p[0] == '+' && p[1] == '=' && (type = C_ADD) ) // +=
|| ( p[0] == '-' && p[1] == '=' && (type = C_SUB) ) // -=
|| ( p[0] == '^' && p[1] == '=' && (type = C_XOR) ) // ^=
|| ( p[0] == '|' && p[1] == '=' && (type = C_OR ) ) // |=
|| ( p[0] == '&' && p[1] == '=' && (type = C_AND) ) // &=
|| ( p[0] == '*' && p[1] == '=' && (type = C_MUL) ) // *=
|| ( p[0] == '/' && p[1] == '=' && (type = C_DIV) ) // /=
|| ( p[0] == '%' && p[1] == '=' && (type = C_MOD) ) // %=
|| ( p[0] == '~' && p[1] == '=' && (type = C_NOT) ) // ~=
|| ( p[0] == '+' && p[1] == '+' && (type = C_ADD_POST) ) // post ++
|| ( p[0] == '-' && p[1] == '-' && (type = C_SUB_POST) ) // post --
|| ( p[0] == '<' && p[1] == '<' && p[2] == '=' && (type = C_L_SHIFT) ) // <<=
|| ( p[0] == '>' && p[1] == '>' && p[2] == '=' && (type = C_R_SHIFT) ) // >>=
) )
{// failed to find a matching operator combination so invalid
return NULL;
if( type == C_NOP ){
if( p[0] == '=' && p[1] != '=' ){
type = C_EQ; // =
}else if( p[0] == '+' && p[1] == '=' ){
type = C_ADD; // +=
}else if( p[0] == '-' && p[1] == '=' ){
type = C_SUB; // -=
}else if( p[0] == '^' && p[1] == '=' ){
type = C_XOR; // ^=
}else if( p[0] == '|' && p[1] == '=' ){
type = C_OR; // |=
}else if( p[0] == '&' && p[1] == '=' ){
type = C_AND; // &=
}else if( p[0] == '*' && p[1] == '=' ){
type = C_MUL; // *=
}else if( p[0] == '/' && p[1] == '=' ){
type = C_DIV; // /=
}else if( p[0] == '%' && p[1] == '=' ){
type = C_MOD; // %=
}else if( p[0] == '~' && p[1] == '=' ){
type = C_NOT; // ~=
}else if( p[0] == '+' && p[1] == '+' ){
type = C_ADD_POST; // post ++
}else if( p[0] == '-' && p[1] == '-' ){
type = C_SUB_POST; // post --
}else if( p[0] == '<' && p[1] == '<' && p[2] == '=' ){
type = C_L_SHIFT; // <<=
}else if( p[0] == '>' && p[1] == '>' && p[2] == '=' ){
type = C_R_SHIFT; // >>=
}else{
// failed to find a matching operator combination so invalid
return nullptr;
}
}
switch( type ) {
@ -3074,7 +3095,7 @@ int set_reg(struct script_state* st, struct map_session_data* sd, int64 num, con
size_t vlen = 0;
if ( !script_check_RegistryVariableLength(0,name,&vlen) )
{
ShowError("set_reg: Variable name length is too long (aid: %d, cid: %d): '%s' sz=%d\n", sd?sd->status.account_id:-1, sd?sd->status.char_id:-1, name, vlen);
ShowError("set_reg: Variable name length is too long (aid: %d, cid: %d): '%s' sz=%" PRIuPTR "\n", sd?sd->status.account_id:-1, sd?sd->status.char_id:-1, name, vlen);
return 0;
}
@ -23694,7 +23715,7 @@ static inline bool mail_sub( struct script_state *st, struct script_data *data,
// Try to find the array's source pointer
if( !script_array_src( st, sd, name, reference_getref(data) ) ){
ShowError( "buildin_mail: variable \"%s\" is not an array.\n" );
ShowError( "buildin_mail: variable \"%s\" is not an array.\n", name );
return false;
}

2
src/map/skill.cpp
View File

@ -11030,7 +11030,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
// Do the teleport part
for (i = 0; i < MAX_PARTY; ++i) {
map_session_data *pl_sd = pl_sd = p->data[i].sd;
map_session_data *pl_sd = p->data[i].sd;
if (pl_sd == nullptr || pl_sd == sd || pl_sd->status.party_id != p->party.party_id || pc_isdead(pl_sd) ||
sd->bl.m != pl_sd->bl.m)

2
src/tool/mapcache.cpp
View File

@ -121,7 +121,7 @@ void cache_map(char *name, struct map_data *m)
// Fill the map header
if (strlen(name) > MAP_NAME_LENGTH) // It does not hurt to warn that there are maps with name longer than allowed.
ShowWarning ("Map name '%s' size '%d' is too long. Truncating to '%d'.\n", name, strlen(name), MAP_NAME_LENGTH);
ShowWarning ("Map name '%s' size '%" PRIuPTR "' is too long. Truncating to '%d'.\n", name, strlen(name), MAP_NAME_LENGTH);
strncpy(info.name, name, MAP_NAME_LENGTH);
info.xs = MakeShortLE(m->xs);
info.ys = MakeShortLE(m->ys);