mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

🚚 Rename 'PkPlayerStruct' to 'PlayerPack'

pull/2741/head
Juliano Leal Goncalves 5 years ago committed by Anders Jenbo
parent
01823e1324
commit
28134d099c
5 changed files with 19 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      Source/multi.cpp
  2. 4
      Source/pack.cpp
  3. 6
      Source/pack.h
  4. 12
      Source/pfile.cpp
  5. 6
      test/writehero_test.cpp

10
Source/multi.cpp
Unescape View File

@ -32,7 +32,7 @@ bool gbSomebodyWonGameKludge;
TBuffer sgHiPriBuf; TBuffer sgHiPriBuf;
char szPlayerDescript[128]; char szPlayerDescript[128];
uint16_t sgwPackPlrOffsetTbl[MAX_PLRS]; uint16_t sgwPackPlrOffsetTbl[MAX_PLRS];
PkPlayerStruct netplr[MAX_PLRS]; PlayerPack netplr[MAX_PLRS];
bool sgbPlayerTurnBitTbl[MAX_PLRS]; bool sgbPlayerTurnBitTbl[MAX_PLRS];
bool sgbPlayerLeftGameTbl[MAX_PLRS]; bool sgbPlayerLeftGameTbl[MAX_PLRS];
bool gbShouldValidatePackage; bool gbShouldValidatePackage;
@ -315,11 +315,11 @@ void ProcessTmsgs()
void SendPlayerInfo(int pnum, _cmd_id cmd) void SendPlayerInfo(int pnum, _cmd_id cmd)
{ {
static_assert(alignof(PkPlayerStruct) == 1, "Fix pkplr alignment"); static_assert(alignof(PlayerPack) == 1, "Fix pkplr alignment");
std::unique_ptr<byte[]> pkplr { new byte[sizeof(PkPlayerStruct)] }; std::unique_ptr<byte[]> pkplr { new byte[sizeof(PlayerPack)] };
PackPlayer(reinterpret_cast<PkPlayerStruct *>(pkplr.get()), Players[MyPlayerId], true); PackPlayer(reinterpret_cast<PlayerPack *>(pkplr.get()), Players[MyPlayerId], true);
dthread_send_delta(pnum, cmd, std::move(pkplr), sizeof(PkPlayerStruct)); dthread_send_delta(pnum, cmd, std::move(pkplr), sizeof(PlayerPack));
} }
dungeon_type InitLevelType(int l) dungeon_type InitLevelType(int l)

4
Source/pack.cpp
Unescape View File

@ -74,7 +74,7 @@ void PackItem(PkItemStruct *id, const ItemStruct *is)
} }
} }
void PackPlayer(PkPlayerStruct *pPack, const Player &player, bool manashield) void PackPlayer(PlayerPack *pPack, const Player &player, bool manashield)
{ {
memset(pPack, 0, sizeof(*pPack)); memset(pPack, 0, sizeof(*pPack));
pPack->destAction = player.destAction; pPack->destAction = player.destAction;
@ -197,7 +197,7 @@ void UnPackItem(const PkItemStruct *is, ItemStruct *id, bool isHellfire)
*id = item; *id = item;
} }
void UnPackPlayer(const PkPlayerStruct *pPack, Player &player, bool netSync) void UnPackPlayer(const PlayerPack *pPack, Player &player, bool netSync)
{ {
player.position.tile = { pPack->px, pPack->py }; player.position.tile = { pPack->px, pPack->py };
player.position.future = { pPack->px, pPack->py }; player.position.future = { pPack->px, pPack->py };

6
Source/pack.h
Unescape View File

@ -27,7 +27,7 @@ struct PkItemStruct {
int32_t dwBuff; int32_t dwBuff;
}; };
struct PkPlayerStruct { struct PlayerPack {
uint32_t dwLowDateTime; uint32_t dwLowDateTime;
uint32_t dwHighDateTime; uint32_t dwHighDateTime;
int8_t destAction; int8_t destAction;
@ -79,8 +79,8 @@ struct PkPlayerStruct {
}; };
#pragma pack(pop) #pragma pack(pop)
void PackPlayer(PkPlayerStruct *pPack, const Player &player, bool manashield); void PackPlayer(PlayerPack *pPack, const Player &player, bool manashield);
void UnPackPlayer(const PkPlayerStruct *pPack, Player &player, bool netSync); void UnPackPlayer(const PlayerPack *pPack, Player &player, bool netSync);
void PackItem(PkItemStruct *id, const ItemStruct *is); void PackItem(PkItemStruct *id, const ItemStruct *is);
void UnPackItem(const PkItemStruct *is, ItemStruct *id, bool isHellfire); void UnPackItem(const PkItemStruct *is, ItemStruct *id, bool isHellfire);

12
Source/pfile.cpp
Unescape View File

@ -139,7 +139,7 @@ std::unique_ptr<byte[]> ReadArchive(HANDLE archive, const char *pszName, size_t
return buf; return buf;
} }
bool ReadHero(HANDLE archive, PkPlayerStruct *pPack) bool ReadHero(HANDLE archive, PlayerPack *pPack)
{ {
size_t read; size_t read;
@ -156,7 +156,7 @@ bool ReadHero(HANDLE archive, PkPlayerStruct *pPack)
return ret; return ret;
} }
void EncodeHero(const PkPlayerStruct *pack) void EncodeHero(const PlayerPack *pack)
{ {
size_t packedLen = codec_get_encoded_len(sizeof(*pack)); size_t packedLen = codec_get_encoded_len(sizeof(*pack));
std::unique_ptr<byte[]> packed { new byte[packedLen] }; std::unique_ptr<byte[]> packed { new byte[packedLen] };
@ -272,7 +272,7 @@ void pfile_write_hero(bool writeGameData, bool clearTables)
SaveGameData(); SaveGameData();
RenameTempToPerm(); RenameTempToPerm();
} }
PkPlayerStruct pkplr; PlayerPack pkplr;
auto &myPlayer = Players[MyPlayerId]; auto &myPlayer = Players[MyPlayerId];
PackPlayer(&pkplr, myPlayer, !gbIsMultiplayer); PackPlayer(&pkplr, myPlayer, !gbIsMultiplayer);
@ -290,7 +290,7 @@ bool pfile_ui_set_hero_infos(bool (*uiAddHeroInfo)(_uiheroinfo *))
for (uint32_t i = 0; i < MAX_CHARACTERS; i++) { for (uint32_t i = 0; i < MAX_CHARACTERS; i++) {
HANDLE archive = OpenSaveArchive(i); HANDLE archive = OpenSaveArchive(i);
if (archive != nullptr) { if (archive != nullptr) {
PkPlayerStruct pkplr; PlayerPack pkplr;
if (ReadHero(archive, &pkplr)) { if (ReadHero(archive, &pkplr)) {
_uiheroinfo uihero; _uiheroinfo uihero;
uihero.saveNumber = i; uihero.saveNumber = i;
@ -337,7 +337,7 @@ uint32_t pfile_ui_get_first_unused_save_num()
bool pfile_ui_save_create(_uiheroinfo *heroinfo) bool pfile_ui_save_create(_uiheroinfo *heroinfo)
{ {
PkPlayerStruct pkplr; PlayerPack pkplr;
uint32_t saveNum = heroinfo->saveNumber; uint32_t saveNum = heroinfo->saveNumber;
if (saveNum >= MAX_CHARACTERS) if (saveNum >= MAX_CHARACTERS)
@ -378,7 +378,7 @@ bool pfile_delete_save(_uiheroinfo *heroInfo)
void pfile_read_player_from_save(uint32_t saveNum, Player &player) void pfile_read_player_from_save(uint32_t saveNum, Player &player)
{ {
HANDLE archive; HANDLE archive;
PkPlayerStruct pkplr; PlayerPack pkplr;
archive = OpenSaveArchive(saveNum); archive = OpenSaveArchive(saveNum);
if (archive == nullptr) if (archive == nullptr)

6
test/writehero_test.cpp
Unescape View File

@ -130,7 +130,7 @@ static void PackItemFullRejuv(PkItemStruct *id, int i)
id->bMCh = 0; id->bMCh = 0;
} }
static int PrepareInvSlot(PkPlayerStruct *pPack, int pos, int size, int start = 0) static int PrepareInvSlot(PlayerPack *pPack, int pos, int size, int start = 0)
{ {
static char ret = 0; static char ret = 0;
if (start) if (start)
@ -160,7 +160,7 @@ static int PrepareInvSlot(PkPlayerStruct *pPack, int pos, int size, int start =
return ret - 1; return ret - 1;
} }
static void PackPlayerTest(PkPlayerStruct *pPack) static void PackPlayerTest(PlayerPack *pPack)
{ {
memset(pPack, 0, 0x4F2); memset(pPack, 0, 0x4F2);
pPack->destAction = -1; pPack->destAction = -1;
@ -337,7 +337,7 @@ TEST(Writehero, pfile_write_hero)
strcpy(info.name, "TestPlayer"); strcpy(info.name, "TestPlayer");
info.heroclass = HeroClass::Rogue; info.heroclass = HeroClass::Rogue;
pfile_ui_save_create(&info); pfile_ui_save_create(&info);
PkPlayerStruct pks; PlayerPack pks;
PackPlayerTest(&pks); PackPlayerTest(&pks);
UnPackPlayer(&pks, Players[MyPlayerId], true); UnPackPlayer(&pks, Players[MyPlayerId], true);
AssertPlayer(Players[0]); AssertPlayer(Players[0]);

Write Preview
Loading…
Cancel
Save