bm: broadcast ready mask at end of battle. Fix packet sizes

Owner now sees the room unlocked. Get rid of player list hack.
Broadcast ready mask when game ack the end battle response.
Fix all packet sizes.

Author: flyinghead

bm_dissect.cpp

@@ -291,12 +291,8 @@ int main(int argc, char *argv[])
 									bomb.readFrom(p);
 									if (bomb.type != 0 && bomb.type != 1 && bomb.type != 4)
 										printf("      [%d] Unknown type %d\n", i, bomb.type);
-									if (bomb.slot > 7)
-										printf("      [%d] INVALID SLOT %d\n", i, bomb.slot);
 									if (bomb.pos.x == 0 && bomb.pos.y == 0)
 										continue;
-									if (bomb.type == 4 && bomb.slot != i)
-										printf("      SLOT HIJACK!\n");
 									printf("    BOMB[%d]: %d %d type %d slot %d size %d unknown %d  %04x\n",
 											i, bomb.pos.x, bomb.pos.y, bomb.type, bomb.slot,
 											bomb.size, bomb.unk2, bomb.param2);
@@ -327,7 +323,8 @@ int main(int argc, char *argv[])
 										// 00 00 30 00
 										// 00 00 b1 01
 										// 00 00 31 01
-										printf("    POWER-UP[%d]: %d %d state %X slot %d unk %x %x\n", i, pup.pos.x, pup.pos.y, pup.state, pup.slot, pup.unk1, pup.unk2);
+										printf("    POWER-UP[%d]: %d %d state %X slot %d bombUp %d bombSlot %d\n", i, pup.pos.x, pup.pos.y, pup.state,
+												pup.slot, pup.bombUp, (pup.bombSlotHigh << 2) | pup.bombSlotLow);
 										//dumpData(data + 0x10, size - 0x10, "        ");
 										//break;
 									}

bomberman.cpp

@@ -65,7 +65,7 @@ uint32_t BMRoom::getPlayerCount() const {
 
 void BMRoom::sendRosterList(Packet& packet)
 {
-	BMCmd cmd { BMCmd::ROSTER_LIST, 0 };
+	BMCmd cmd { BMCmd::ROSTER_LIST, (uint16_t)(4 + 8 * players.size() + 4 * getPlayerCount()) };
 	packet.init(Packet::REQ_CHAT);
 	packet.flags |= Packet::FLAG_RUDP;
 	packet.writeData(cmd.full);
@@ -86,8 +86,8 @@ void BMRoom::sendRosterList(Packet& packet)
 
 void BMRoom::makeRoomJoin(Packet& packet, const Player *player)
 {
-	BMCmd cmd{};
-	cmd.command = BMCmd::ROOM_JOIN;
+	const uint32_t slots = getSlotCount(player);
+	BMCmd cmd { BMCmd::ROOM_JOIN, (uint16_t)(24 + 4 * slots) };
 	packet.init(Packet::REQ_CHAT);
 	packet.flags |= Packet::FLAG_RUDP;
 	packet.writeData(cmd.full);
@@ -96,7 +96,6 @@ void BMRoom::makeRoomJoin(Packet& packet, const Player *player)
 	packet.writeData((uint32_t)getPlayerIndex(player));		// FIXME [915] [0-F]? client id?
 	uint32_t pos = (uint32_t)getPlayerPosition(player);
 	packet.writeData(pos); 					// player pos [916]
-	uint32_t slots = getSlotCount(player);
 	packet.writeData(slots - 1);				// guest count [911]
 	packet.writeData(owner->getId());		// room owner kage id [912]
 	packet.writeData((uint32_t)getPlayerPosition(owner)); // room owner player pos [913]
@@ -148,8 +147,7 @@ void BMRoom::broadcastKeyholder() const
 {
 
 	Packet packet;
-	BMCmd cmd{};
-	cmd.command = BMCmd::NEW_MASTER;
+	BMCmd cmd { BMCmd::NEW_MASTER, 8 };
 	packet.init(Packet::REQ_CHAT);
 	packet.flags |= Packet::FLAG_RUDP;
 	packet.writeData(cmd.full);
@@ -187,9 +185,7 @@ uint8_t BMRoom::getSlotMask(const Player *player) const
 void BMRoom::broadcastReadySlotMask() const
 {
 	Packet packet;
-	BMCmd cmd{};
-	cmd.command = BMCmd::READY_MASK;
-	cmd.size = 4;
+	BMCmd cmd { BMCmd::READY_MASK, 4 };
 	packet.init(Packet::REQ_CHAT);
 	packet.flags |= Packet::FLAG_RUDP;
 	packet.writeData(cmd.full);
@@ -204,9 +200,7 @@ void BMRoom::sendGameStarting(Packet& packet, uint16_t clientId, uint32_t random
 {
 	gameStarting = true;
 	this->random = random;
-	BMCmd cmd {};
-	cmd.command = BMCmd::GAME_STARTING;
-	cmd.size = 4;
+	BMCmd cmd { BMCmd::GAME_STARTING, 4 };
 	packet.init(Packet::REQ_CHAT);
 	packet.flags |= Packet::FLAG_RUDP;
 	packet.writeData(cmd.full);
@@ -229,6 +223,10 @@ void BMRoom::rudpAcked(Player *player)
 		if (!packet.empty())
 			player->send(packet);
 	}
+	else {
+		// end of battle
+		broadcastReadySlotMask();
+	}
 }
 
 int BMRoom::getSlotCount(const Player *player) const
@@ -281,8 +279,7 @@ void BMRoom::sendRules(Packet& packet)
 	if (rules[8] == 0)
 		// rules not set
 		return;
-	BMCmd cmd {};
-	cmd.command = BMCmd::ACCEPT_RULES;	// means "new rules" when sent to game
+	BMCmd cmd {	BMCmd::ACCEPT_RULES, (uint16_t)rules.size() };	// means "new rules" when sent to game
 	packet.init(Packet::REQ_CHAT);
 	packet.flags |= Packet::FLAG_RUDP;
 	packet.writeData(cmd.full);
@@ -379,7 +376,7 @@ void BMRoom::savePowerUps(Player *player, const uint8_t *data)
 	// Successful pick up
 	//   claimed -> (granted) -> owned
 	// Hyper bomber death sequence:
-	//   owned -> released (with coords, unk1=1) -> (lost) -> appearing -> visible
+	//   owned -> released (with coords) -> (lost) -> appearing -> visible
 	for (unsigned i = 0; i < powerUps.size(); i++)
 	{
 		PowerUp pup(data + i * sizeof(pup));
@@ -426,13 +423,13 @@ void BMRoom::savePowerUps(Player *player, const uint8_t *data)
 					// Item has been lost. Happens when a player dies and releases his items
 					pup.state = PowerUp::Lost;
 					powerUps[i] = pup;
-					DEBUG_LOG(game, "PowerUp Owned -> Released (Lost). Slot %d coords %d %d", pup.slot, pup.pos.x, pup.pos.y);
-					if (pup.unk1 != 0)
+					DEBUG_LOG(game, "PowerUp[%d] Owned -> Released (Lost). Slot %d coords %d %d", i, pup.slot, pup.pos.x, pup.pos.y);
+					if (pup.bombUp == 1)
 						releaseBombSlot(pup.slot, i);
 				}
 				else if (pup.state != PowerUp::Owned) {
-					DEBUG_LOG(game, "PowerUp transitioning from owned to %x? slot %d",
-							pup.state, pup.slot);
+					DEBUG_LOG(game, "PowerUp[%d] transitioning from owned to %x? slot %d",
+							i, pup.state, pup.slot);
 					// end of game?
 					powerUps[i] = pup;
 				}
@@ -448,12 +445,12 @@ void BMRoom::savePowerUps(Player *player, const uint8_t *data)
 				{
 					DEBUG_LOG(game, "PowerUp[%d] Judge -> Granted. pos %d %d slot %d unk %02x", i, pup.pos.x, pup.pos.y, pup.slot, pup.param & 0xff);
 					pup.state = PowerUp::Granted;
-					if (pup.unk1 == 1)
+					if (pup.bombUp == 1)
 					{
 						// Bomb-up item -> assign bomb slot for new bomb
 						int idx = assignBombSlot(pup.slot, i);
-						pup.unk1 = (pup.unk1 & 9) | ((idx & 3) << 1);
-						pup.unk2 = idx >> 2;
+						pup.bombSlotLow = idx & 3;
+						pup.bombSlotHigh = idx >> 2;
 					}
 					powerUpClaims[i] = 0;
 					powerUps[i] = pup;
@@ -469,7 +466,7 @@ void BMRoom::savePowerUps(Player *player, const uint8_t *data)
 					&& pup.state != PowerUp::Claimed
 					&& pup.state != 9 // TODO what is this?
 					&& pup.slot == powerUps[i].slot)
-				WARN_LOG(game, "PowerUp current state not handled: Granted -> %x", pup.state);
+				WARN_LOG(game, "PowerUp[%d] current state not handled: Granted -> %x", i, pup.state);
 			break;
 
 		case PowerUp::Lost:
@@ -1092,29 +1089,12 @@ bool BombermanServer::handlePacket(Player *player, const uint8_t *data, size_t l
 				// a8 14 00 11 00 00 10 02 00 00 00 10 00 00 00 00 ................
 				// 26 00 80 00                                     &...
 				INFO_LOG(game, "%s: END BATTLE", player->getName().c_str());
-				if (player == room->getOwner())
-				{
-					// Hack to avoid disconnection error by the room owner
-					replyPacket.init(Packet::REQ_QRY_USERS);
-					replyPacket.writeData(0u);
-					replyPacket.writeData(0u);
-					const std::vector<Player *>& players = room->getPlayers();
-					replyPacket.writeData((uint32_t)players.size());
-					for (Player *pl : players)
-					{
-						replyPacket.writeData(pl->getName().c_str(), 0x10);
-						replyPacket.writeData(pl->getId());
-						const auto& extra = pl->getExtraData();
-						replyPacket.writeData((uint32_t)extra.size());
-						replyPacket.writeData(extra.data(), extra.size());
-					}
-					player->send(replyPacket);
-					replyPacket.reset();
-				}
 				room->endBattle(player);
 
 				replyPacket.init(Packet::REQ_NOP);
+				replyPacket.flags |= Packet::FLAG_RUDP;
 				player->ackPacket(replyPacket, data);
+				player->notifyRoomOnAck();
 				break;
 			}
 
@@ -1169,7 +1149,7 @@ bool BombermanServer::handlePacket(Player *player, const uint8_t *data, size_t l
 		DEBUG_LOG(game, "%s: ping", player->getName().c_str());
 		replyPacket.init(Packet::REQ_CHAT);
 		replyPacket.writeData(cmd.full);
-		replyPacket.writeData((uint16_t)data[0x12]); // Client ID
+		replyPacket.writeData(read16(data, 0x12)); // Client ID
 		replyPacket.writeData(data + 0x14, 5);
 		break;
 

bomberman.h

@@ -164,8 +164,10 @@ struct PowerUp
 	union {
 		uint16_t param;
 		struct {
-			uint16_t unk1:4;	// set to 1 for bomb-up items
-			uint16_t unk2:4;
+			uint16_t bombUp:1;
+			uint16_t bombSlotLow:2;
+			uint16_t unk:1;
+			uint16_t bombSlotHigh:4;
 			uint16_t slot:4;
 			uint16_t state:4;
 		};