[Freeciv-Dev] (PR#2730) Allied victory isn't looking at aliveness
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
Hi,
it should be if all alive players are allied, not all players.
Thomas
--
Thomas Strub *** eMail ue80@xxxxxxxxxxxxxxxxxxxxx
Nur weil das Aufzeichnen, Kopieren und Schnüffeln bei elektronischem
Datenverkehr leichter als bei der klassischen Post ist, darf man es nicht
einfach tun.
Index: server/srv_main.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/srv_main.c,v
retrieving revision 1.110
diff -u -r1.110 srv_main.c
--- server/srv_main.c 2002/12/18 17:36:20 1.110
+++ server/srv_main.c 2003/01/05 12:43:35
@@ -253,15 +254,17 @@
/* quit if all players are allied to each other */
all_allied = TRUE;
players_iterate(pplayer) {
- players_iterate(aplayer) {
- if (!pplayers_allied(pplayer, aplayer)) {
- all_allied = FALSE;
+ if (pplayer->is_alive) {
+ players_iterate(aplayer) {
+ if (!pplayers_allied(pplayer, aplayer) && aplayer->is_alive) {
+ all_allied = FALSE;
+ break;
+ }
+ } players_iterate_end;
+ if (!all_allied) {
break;
}
- } players_iterate_end;
- if (!all_allied) {
- break;
- }
+ }
} players_iterate_end;
if (all_allied) {
notify_conn(&game.est_connections, _("Game ended in allied victory"));
- [Freeciv-Dev] (PR#2730) Allied victory isn't looking at aliveness,
ue80@xxxxxxxxxxxxxxxxxxxxx via RT <=
|
|