From 8b5370313dcc00a45ea5c3e8b4c497bc00fd8e13 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 11 Jun 2013 21:55:13 -0700 Subject: Allegedly remove all manual memory management --- src/char/int_party.cpp | 54 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 17 deletions(-) (limited to 'src/char/int_party.cpp') diff --git a/src/char/int_party.cpp b/src/char/int_party.cpp index 8566f3c..7e6f8b6 100644 --- a/src/char/int_party.cpp +++ b/src/char/int_party.cpp @@ -625,40 +625,60 @@ int inter_party_parse_frommap(int fd) switch (RFIFOW(fd, 0)) { case 0x3020: - mapif_parse_CreateParty(fd, RFIFOL(fd, 2), (const char *)RFIFOP(fd, 6), - (const char *)RFIFOP(fd, 30), (const char *)RFIFOP(fd, 54), - RFIFOW(fd, 70)); + mapif_parse_CreateParty(fd, + RFIFOL(fd, 2), + static_cast(RFIFOP(fd, 6)), + static_cast(RFIFOP(fd, 30)), + static_cast(RFIFOP(fd, 54)), + RFIFOW(fd, 70)); break; case 0x3021: mapif_parse_PartyInfo(fd, RFIFOL(fd, 2)); break; case 0x3022: - mapif_parse_PartyAddMember(fd, RFIFOL(fd, 2), RFIFOL(fd, 6), - (const char *)RFIFOP(fd, 10), (const char *)RFIFOP(fd, 34), - RFIFOW(fd, 50)); + mapif_parse_PartyAddMember(fd, + RFIFOL(fd, 2), + RFIFOL(fd, 6), + static_cast(RFIFOP(fd, 10)), + static_cast(RFIFOP(fd, 34)), + RFIFOW(fd, 50)); break; case 0x3023: - mapif_parse_PartyChangeOption(fd, RFIFOL(fd, 2), RFIFOL(fd, 6), - RFIFOW(fd, 10), RFIFOW(fd, 12)); + mapif_parse_PartyChangeOption(fd, + RFIFOL(fd, 2), + RFIFOL(fd, 6), + RFIFOW(fd, 10), + RFIFOW(fd, 12)); break; case 0x3024: - mapif_parse_PartyLeave(fd, RFIFOL(fd, 2), RFIFOL(fd, 6)); + mapif_parse_PartyLeave(fd, + RFIFOL(fd, 2), + RFIFOL(fd, 6)); break; case 0x3025: - mapif_parse_PartyChangeMap(fd, RFIFOL(fd, 2), RFIFOL(fd, 6), - (const char *)RFIFOP(fd, 10), RFIFOB(fd, 26), - RFIFOW(fd, 27)); + mapif_parse_PartyChangeMap(fd, + RFIFOL(fd, 2), + RFIFOL(fd, 6), + static_cast(RFIFOP(fd, 10)), + RFIFOB(fd, 26), + RFIFOW(fd, 27)); break; case 0x3026: - mapif_parse_BreakParty(fd, RFIFOL(fd, 2)); + mapif_parse_BreakParty(fd, + RFIFOL(fd, 2)); break; case 0x3027: - mapif_parse_PartyMessage(fd, RFIFOL(fd, 4), RFIFOL(fd, 8), - (const char *)RFIFOP(fd, 12), RFIFOW(fd, 2) - 12); + mapif_parse_PartyMessage(fd, + RFIFOL(fd, 4), + RFIFOL(fd, 8), + static_cast(RFIFOP(fd, 12)), + RFIFOW(fd, 2) - 12); break; case 0x3028: - mapif_parse_PartyCheck(fd, RFIFOL(fd, 2), RFIFOL(fd, 6), - (const char *)RFIFOP(fd, 10)); + mapif_parse_PartyCheck(fd, + RFIFOL(fd, 2), + RFIFOL(fd, 6), + static_cast(RFIFOP(fd, 10))); break; default: return 0; -- cgit v1.2.3-60-g2f50