From 95aed16e64f6cdb86ffb71b242d437f38c9e6030 Mon Sep 17 00:00:00 2001 From: salix5 Date: Thu, 25 Apr 2024 18:46:44 +0800 Subject: [PATCH] use fixed width integer --- card.cpp | 72 +++++++++++++++++++++++++++--------------------------- duel.cpp | 6 ++--- ocgapi.cpp | 14 +++++------ 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/card.cpp b/card.cpp index 37a47f7ad..715454949 100644 --- a/card.cpp +++ b/card.cpp @@ -149,7 +149,7 @@ card::card(duel* pd) { inline void update_cache(uint32& tdata, uint32& cache, byte*& p, uint32& query_flag, const uint32 flag) { if (tdata != cache) { cache = tdata; - buffer_write(p, tdata); + buffer_write(p, tdata); } else query_flag &= ~flag; @@ -167,11 +167,11 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) { //first 8 bytes: data length, query flag p += 8; if (query_flag & QUERY_CODE) { - buffer_write(p, data.code); + buffer_write(p, data.code); } if (query_flag & QUERY_POSITION) { uint32 tdata = get_info_location(); - buffer_write(p, tdata); + buffer_write(p, tdata); if (q_cache.info_location != tdata) { q_cache.clear_cache(); q_cache.info_location = tdata; @@ -181,52 +181,52 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) { if(!use_cache) { if (query_flag & QUERY_ALIAS) { uint32 tdata = get_code(); - buffer_write(p, tdata); + buffer_write(p, tdata); q_cache.current_code = tdata; } if (query_flag & QUERY_TYPE) { uint32 tdata = get_type(); - buffer_write(p, tdata); + buffer_write(p, tdata); q_cache.type = tdata; } if (query_flag & QUERY_LEVEL) { uint32 tdata = get_level(); - buffer_write(p, tdata); + buffer_write(p, tdata); q_cache.level = tdata; } if (query_flag & QUERY_RANK) { uint32 tdata = get_rank(); - buffer_write(p, tdata); + buffer_write(p, tdata); q_cache.rank = tdata; } if (query_flag & QUERY_ATTRIBUTE) { uint32 tdata = get_attribute(); - buffer_write(p, tdata); + buffer_write(p, tdata); q_cache.attribute = tdata; } if (query_flag & QUERY_RACE) { uint32 tdata = get_race(); - buffer_write(p, tdata); + buffer_write(p, tdata); q_cache.race = tdata; } if (query_flag & QUERY_ATTACK) { - buffer_write(p, atk_def.first); + buffer_write(p, atk_def.first); q_cache.attack = atk_def.first; } if (query_flag & QUERY_DEFENSE) { - buffer_write(p, atk_def.second); + buffer_write(p, atk_def.second); q_cache.defense = atk_def.second; } if (query_flag & QUERY_BASE_ATTACK) { - buffer_write(p, base_atk_def.first); + buffer_write(p, base_atk_def.first); q_cache.base_attack = base_atk_def.first; } if (query_flag & QUERY_BASE_DEFENSE) { - buffer_write(p, base_atk_def.second); + buffer_write(p, base_atk_def.second); q_cache.base_defense = base_atk_def.second; } if (query_flag & QUERY_REASON) { - buffer_write(p, current.reason); + buffer_write(p, current.reason); q_cache.reason = current.reason; } } @@ -258,7 +258,7 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) { if((query_flag & QUERY_ATTACK)) { if (atk_def.first != q_cache.attack) { q_cache.attack = atk_def.first; - buffer_write(p, atk_def.first); + buffer_write(p, atk_def.first); } else query_flag &= ~QUERY_ATTACK; @@ -266,7 +266,7 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) { if((query_flag & QUERY_DEFENSE)) { if (atk_def.second != q_cache.defense) { q_cache.defense = atk_def.second; - buffer_write(p, atk_def.second); + buffer_write(p, atk_def.second); } else query_flag &= ~QUERY_DEFENSE; @@ -274,7 +274,7 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) { if((query_flag & QUERY_BASE_ATTACK)) { if (base_atk_def.first != q_cache.base_attack) { q_cache.base_attack = base_atk_def.first; - buffer_write(p, base_atk_def.first); + buffer_write(p, base_atk_def.first); } else query_flag &= ~QUERY_BASE_ATTACK; @@ -282,7 +282,7 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) { if((query_flag & QUERY_BASE_DEFENSE)) { if (base_atk_def.second != q_cache.base_defense) { q_cache.base_defense = base_atk_def.second; - buffer_write(p, base_atk_def.second); + buffer_write(p, base_atk_def.second); } else query_flag &= ~QUERY_BASE_DEFENSE; @@ -294,45 +294,45 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) { } if (query_flag & QUERY_REASON_CARD) { uint32 tdata = current.reason_card ? current.reason_card->get_info_location() : 0; - buffer_write(p, tdata); + buffer_write(p, tdata); } if(query_flag & QUERY_EQUIP_CARD) { if (equiping_target) { uint32 tdata = equiping_target->get_info_location(); - buffer_write(p, tdata); + buffer_write(p, tdata); } else query_flag &= ~QUERY_EQUIP_CARD; } if(query_flag & QUERY_TARGET_CARD) { - buffer_write(p, (int32)effect_target_cards.size()); + buffer_write(p, (int32_t)effect_target_cards.size()); for (auto& pcard : effect_target_cards) { uint32 tdata = pcard->get_info_location(); - buffer_write(p, tdata); + buffer_write(p, tdata); } } if(query_flag & QUERY_OVERLAY_CARD) { - buffer_write(p, (int32)xyz_materials.size()); + buffer_write(p, (int32_t)xyz_materials.size()); for (auto& xcard : xyz_materials) { - buffer_write(p, xcard->data.code); + buffer_write(p, xcard->data.code); } } if(query_flag & QUERY_COUNTERS) { - buffer_write(p, (int32)counters.size()); + buffer_write(p, (int32_t)counters.size()); for (const auto& cmit : counters) { int32 tdata = cmit.first + ((cmit.second[0] + cmit.second[1]) << 16); - buffer_write(p, tdata); + buffer_write(p, tdata); } } if (query_flag & QUERY_OWNER) { int32 tdata = owner; - buffer_write(p, tdata); + buffer_write(p, tdata); } if(query_flag & QUERY_STATUS) { uint32 tdata = status & (STATUS_DISABLED | STATUS_FORBIDDEN | STATUS_PROC_COMPLETE); if(!use_cache || (tdata != q_cache.status)) { q_cache.status = tdata; - buffer_write(p, tdata); + buffer_write(p, tdata); } else query_flag &= ~QUERY_STATUS; @@ -340,20 +340,20 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) { if(!use_cache) { if (query_flag & QUERY_LSCALE) { uint32 tdata = get_lscale(); - buffer_write(p, tdata); + buffer_write(p, tdata); q_cache.lscale = tdata; } if (query_flag & QUERY_RSCALE) { uint32 tdata = get_rscale(); - buffer_write(p, tdata); + buffer_write(p, tdata); q_cache.rscale = tdata; } if(query_flag & QUERY_LINK) { uint32 tdata = get_link(); - buffer_write(p, tdata); + buffer_write(p, tdata); q_cache.link = tdata; tdata = get_link_marker(); - buffer_write(p, tdata); + buffer_write(p, tdata); q_cache.link_marker = tdata; } } @@ -371,17 +371,17 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) { uint32 link_marker = get_link_marker(); if((link != q_cache.link) || (link_marker != q_cache.link_marker)) { q_cache.link = link; - buffer_write(p, link); + buffer_write(p, link); q_cache.link_marker = link_marker; - buffer_write(p, link_marker); + buffer_write(p, link_marker); } else query_flag &= ~QUERY_LINK; } } byte* finalize = buf; - buffer_write(finalize, (int32)(p - buf)); - buffer_write(finalize, query_flag); + buffer_write(finalize, p - buf); + buffer_write(finalize, query_flag); return (int32)(p - buf); } uint32 card::get_info_location() { diff --git a/duel.cpp b/duel.cpp index 1419a6e56..e2fbfd297 100644 --- a/duel.cpp +++ b/duel.cpp @@ -118,13 +118,13 @@ void duel::write_buffer(const void* data, int size) { vector_write_array(message_buffer, data, size); } void duel::write_buffer32(uint32 value) { - vector_write(message_buffer, value); + vector_write(message_buffer, value); } void duel::write_buffer16(uint16 value) { - vector_write(message_buffer, value); + vector_write(message_buffer, value); } void duel::write_buffer8(uint8 value) { - vector_write(message_buffer, value); + vector_write(message_buffer, value); } void duel::clear_buffer() { message_buffer.clear(); diff --git a/ocgapi.cpp b/ocgapi.cpp index 466903757..7295d8368 100644 --- a/ocgapi.cpp +++ b/ocgapi.cpp @@ -207,7 +207,7 @@ extern "C" DECL_DLLEXPORT int32 query_card(intptr_t pduel, uint8 playerid, uint8 return pcard->get_infos(buf, query_flag, use_cache); } else { - buffer_write(buf, LEN_EMPTY); + buffer_write(buf, LEN_EMPTY); return LEN_EMPTY; } } @@ -254,7 +254,7 @@ extern "C" DECL_DLLEXPORT int32 query_field_card(intptr_t pduel, uint8 playerid, int32 clen = pcard->get_infos(p, query_flag, use_cache); p += clen; } else { - buffer_write(p, LEN_EMPTY); + buffer_write(p, LEN_EMPTY); } } } @@ -264,7 +264,7 @@ extern "C" DECL_DLLEXPORT int32 query_field_card(intptr_t pduel, uint8 playerid, int32 clen = pcard->get_infos(p, query_flag, use_cache); p += clen; } else { - buffer_write(p, LEN_EMPTY); + buffer_write(p, LEN_EMPTY); } } } @@ -296,7 +296,7 @@ extern "C" DECL_DLLEXPORT int32 query_field_info(intptr_t pduel, byte* buf) { *p++ = ptduel->game_field->core.duel_rule; for(int playerid = 0; playerid < 2; ++playerid) { auto& player = ptduel->game_field->player[playerid]; - buffer_write(p, player.lp); + buffer_write(p, player.lp); for(auto& pcard : player.list_mzone) { if(pcard) { *p++ = 1; @@ -324,12 +324,12 @@ extern "C" DECL_DLLEXPORT int32 query_field_info(intptr_t pduel, byte* buf) { *p++ = (uint8)ptduel->game_field->core.current_chain.size(); for(const auto& ch : ptduel->game_field->core.current_chain) { effect* peffect = ch.triggering_effect; - buffer_write(p, peffect->get_handler()->data.code); - buffer_write(p, peffect->get_handler()->get_info_location()); + buffer_write(p, peffect->get_handler()->data.code); + buffer_write(p, peffect->get_handler()->get_info_location()); *p++ = ch.triggering_controler; *p++ = (uint8)ch.triggering_location; *p++ = ch.triggering_sequence; - buffer_write(p, peffect->description); + buffer_write(p, peffect->description); } return (int32)(p - buf); }