make servers independent. Fix crash. bm: hyper bomber eog detection

Split servers into 4 services (bootstrap, outtrigger, propeller arena,
bomberman) running the same binary with different roles.
Fix crash when joining a room that has been deleted.
bm: Fix end of game detection in hyper bomber mode.
bm: better map info parsing and checking

Author: flyinghead

.gitignore

@@ -10,3 +10,5 @@ ot_dissect
 /.project
 /propellerarena.db
 /pa_dissect
+/kage@.service
+/bm_dissect

Makefile

@@ -32,22 +32,26 @@ bm_dissect: bm_dissect.o
 	$(CXX) $(CXXFLAGS) -o $@ bm_dissect.o
 
 clean:
-	rm -f *.o kageserver ot_dissect pa_dissect bm_dissect kage.service
+	rm -f *.o kageserver ot_dissect pa_dissect bm_dissect kage@.service
 
 install: all
 	mkdir -p $(DESTDIR)$(sbindir)
 	install kageserver $(DESTDIR)$(sbindir)
 	mkdir -p $(DESTDIR)$(sysconfdir)
 	cp -n kage.cfg $(DESTDIR)$(sysconfdir)
 
-kage.service: kage.service.in Makefile
-	cp kage.service.in kage.service
+kage@.service: kage@.service.in Makefile
+	cp kage@.service.in kage@.service
 	sed -e "s/INSTALL_USER/$(USER)/g" -e "s:SBINDIR:$(sbindir):g" -e "s:SYSCONFDIR:$(sysconfdir):g" -e "s:LOCALSTATEDIR:$(localstatedir):g" < $< > $@
 
-installservice: kage.service
+installservice: kage@.service
 	mkdir -p /usr/lib/systemd/system/
 	cp $< /usr/lib/systemd/system/
-	mkdir -p $(localstatedir)/log/
+	mkdir -p $(localstatedir)/log/kage
 	mkdir -p $(localstatedir)/lib/kage
 	chown $(USER):$(USER) $(localstatedir)/lib/kage
-	systemctl enable kage.service
+	systemctl daemon-reload
+	systemctl enable kage@bs.service
+	systemctl enable kage@ot.service
+	systemctl enable kage@pa.service
+	systemctl enable kage@bm.service

bomberman.cpp

@@ -377,7 +377,6 @@ void BMRoom::savePowerUps(Player *player, const uint8_t *data)
 	//   hidden -> appearing -> visible
 	// Successful pick up
 	//   claimed -> (granted) -> owned
-	// TODO: Denied pick up
 	// Hyper bomber death sequence:
 	//   owned -> released (with coords, unk1=1) -> (lost) -> appearing -> visible
 	for (unsigned i = 0; i < powerUps.size(); i++)
@@ -431,8 +430,10 @@ void BMRoom::savePowerUps(Player *player, const uint8_t *data)
 						releaseBombSlot(pup.slot, i);
 				}
 				else if (pup.state != PowerUp::Owned) {
-					WARN_LOG(game, "PowerUp transitioning from owned to %x? slot %d",
+					DEBUG_LOG(game, "PowerUp transitioning from owned to %x? slot %d",
 							pup.state, pup.slot);
+					// end of game?
+					powerUps[i] = pup;
 				}
 			}
 			break;
@@ -480,10 +481,8 @@ void BMRoom::savePowerUps(Player *player, const uint8_t *data)
 			break;
 
 		default:
-			if (powerUps[i].param == 0)
+			if (powerUps[i].param == 0 || pup.slot == powerUps[i].slot)
 				powerUps[i] = pup;
-			else
-				WARN_LOG(game, "PowerUp current state not handled: %x -> %x", curState, pup.state);
 			break;
 		}
 	}
@@ -718,13 +717,13 @@ void BMRoom::releaseBombSlot(int slot, int powerUpIdx)
 
 bool BMRoom::checkEndOfGame(Player *player, uint8_t command, uint8_t mark)
 {
-	if (mark == 0)
-		return false;
 	State& playerState = states[getPlayerIndex(player)];
 	if (playerState.status != State::InGame)
 		return false;
-	DEBUG_LOG(game, "[%s] Game end", player->getName().c_str());
-	playerState.endOfGameMask |= 1 << (command - 1);
+	if (mark != 0)
+		playerState.endOfGameMask |= 1 << (command - 1);
+	if (playerState.endOfGameMask == 7)
+		DEBUG_LOG(game, "[%s] Game end", player->getName().c_str());
 	return playerState.endOfGameMask == 7;
 }
 
@@ -737,9 +736,27 @@ void BMRoom::sendEndOfGame(Player *player, Packet& reply, Packet& relay)
 		return;
 	state.status = State::GameEnding;
 	inGame = false;
-	for (unsigned i = 0; i < players.size(); i++)
-		if (states[i].endOfGameMask != 7)
+	if (rules[0] == 0)
+	{
+		// survival mode: wait until all players have agreed on the end of game
+		for (unsigned i = 0; i < players.size(); i++)
+			if (states[i].endOfGameMask != 7)
+				return;
+	}
+	else
+	{
+		// hyper bomber mode: one player is enough
+		bool allPlayersDone = true;
+		for (unsigned i = 0; i < players.size(); i++)
+		{
+			if (states[i].endOfGameMask != 7) {
+				states[i].endOfGameMask = 7;
+				allPlayersDone = false;
+			}
+		}
+		if (!allPlayersDone)
 			return;
+	}
 	if (!reply.empty()) {
 		player->send(reply);
 		reply.reset();
@@ -1174,10 +1191,20 @@ bool Map::append(const uint8_t *data, unsigned size)
 	if (this->data.size() < blockCount * sizeof(Block))
 		return false;
 
-	this->data.reserve(blockCount);
+	blocks.clear();
+	blocks.reserve(blockCount);
 	for (unsigned i = 0; i < blockCount; i++)
 		blocks.emplace_back(&this->data[i * sizeof(Block)]);
 
+	for (unsigned i = 0; i < blockCount; i++)
+	{
+		if (blocks[i].type != Wall && blocks[i].type != Brick
+				&& blocks[i].type != PowerUp && blocks[i].type != Gate
+				 && blocks[i].type != TargetPanel)
+			WARN_LOG(Game::Bomberman, "Unknown map block type %d at index %d pos %d,%d",
+					blocks[i].type, i, blocks[i].col, blocks[i].row);
+	}
+
 	return true;
 }
 
@@ -1187,6 +1214,26 @@ std::array<uint8_t, 16> Map::getBrickMap() const
 	for (const Block& block : blocks)
 		if (block.type == Brick)
 			map[block.order / 8] |= 1 << (block.order % 8);
+	bool ones = true;
+	for (uint8_t v : map)
+		if (v == 0) {
+			ones = false;
+		}
+		else
+		{
+			if (!ones) {
+				WARN_LOG(Game::Bomberman, "Brick map has holes");
+				break;
+			}
+			if (v != 0xff)
+			{
+				if (((v + 1) & v) != 0) {
+					WARN_LOG(Game::Bomberman, "Brick map ones don't end properly: %02x", v);
+					break;
+				}
+				ones = false;
+			}
+		}
 	return map;
 }
 
@@ -1196,15 +1243,23 @@ std::array<PowerUp, 28> Map::getPowerUps() const
 	indexes.fill(-1);
 	for (unsigned i = 0; i < blocks.size(); i++)
 		if (blocks[i].type == PowerUp)
+		{
+			if (indexes[blocks[i].order] != -1)
+				WARN_LOG(Game::Bomberman, "PowerUp[%d] already used by block %d", indexes[blocks[i].order]);
 			indexes[blocks[i].order] = i;
+		}
 	std::array<::PowerUp, 28> pups {};
+	unsigned pupMap = 0;
 	for (unsigned i = 0; i < pups.size(); i++)
 		if (indexes[i] != -1)
 		{
 			const Block& block = blocks[indexes[i]];
 			pups[i].pos.x = block.col;
 			pups[i].pos.y = block.row;
 			pups[i].state = PowerUp::Hidden;
+			pupMap |= 1 << i;
 		}
+	if (((pupMap + 1) & pupMap) != 0)
+		WARN_LOG(Game::Bomberman, "PowerUp list has holes: %07x", pupMap);
 	return pups;
 }

bomberman.h

@@ -269,6 +269,8 @@ class Map
 		Wall = 2,
 		Brick = 3,
 		PowerUp = 4,
+		Gate = 8,
+		TargetPanel = 102,
 	};
 
 	struct Block

kage.service.in kage@.service.inkage.service.in renamed to kage@.service.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=Kage Server
+Description=Kage Server role %i
 After=network.target
 StartLimitIntervalSec=0
 
@@ -8,8 +8,8 @@ Type=simple
 Restart=always
 RestartSec=1
 User=INSTALL_USER
-ExecStart=SBINDIR/kageserver SYSCONFDIR/kage.cfg
-StandardOutput=append:LOCALSTATEDIR/log/kage.log
+ExecStart=SBINDIR/kageserver -c SYSCONFDIR/kage.cfg -r %i
+StandardOutput=append:LOCALSTATEDIR/log/kage/%i.log
 
 [Install]
 WantedBy=multi-user.target