cpp/openttd-patchpack/source Changeset - r8155:6c799d129f75

Changeset - r8155:6c799d129f75

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

smatz - 17 years ago 2007-12-28 18:25:30
smatz@openttd.org

(svn r11717) -Fix [FS#1590]: make sure invalid players have all shares owned by PLAYER_SPECTATOR

3 files changed with 25 insertions and 2 deletions:

src/economy.cpp

src/openttd.cpp

src/players.cpp

0 comments (0 inline, 0 general)

src/economy.cpp

➞

Show inline comments

@@ @@ -285,6 +285,7 @@ void ChangeOwnershipOfPlayerItems(Player @@
 		/* See if the old_player had shares in other companies */
 		_current_player = old_player;
 		FOR_ALL_PLAYERS(p) {
 			if (!p->is_active) continue;
 			for (i = 0; i < 4; i++) {
 				if (p->share_owners[i] == old_player) {
 					/* Sell his shares */

src/openttd.cpp

➞

Show inline comments

@@ @@ -2239,14 +2239,33 @@ bool AfterLoadGame() @@
+		}
+	}
 	/* Update go to buoy orders because they are just waypoints */
 	if (CheckSavegameVersion(84)) {
 		/* Update go to buoy orders because they are just waypoints */
 		Order *order;
 		FOR_ALL_ORDERS(order) {
 			if (order->type == OT_GOTO_STATION && GetStation(order->dest)->IsBuoy()) {
 				order->flags = 0;
+			}
+		}
 		/* Set all share owners to PLAYER_SPECTATOR for
 		 * 1) all inactive players
 		 *     (when inactive players were stored in the savegame - TTD, TTDP and some
 		 *      *really* old revisions of OTTD; else it is already set in InitializePlayers())
 		 * 2) shares that are owned by inactive players or self
 		 *     (caused by cheating players in earlier revisions) */
 		Player *p;
 		FOR_ALL_PLAYERS(p) {
 			if (!p->is_active) {
 				for (uint i = 0; i < 4; i++) { p->share_owners[i] = PLAYER_SPECTATOR; }
 			} else {
 				for (uint i = 0; i < 4; i++) {
 					PlayerID o = p->share_owners[i];
 					if (o == PLAYER_SPECTATOR) continue;
 					if (!IsValidPlayer(o) || o == p->index || !GetPlayer(o)->is_active) p->share_owners[i] = PLAYER_SPECTATOR;
+				}
+			}
+		}
+	}
 	return InitializeWindowsAndCaches();

src/players.cpp

➞

Show inline comments

@@ @@ -544,7 +544,10 @@ static void MaybeStartNewPlayer() @@
 void InitializePlayers()
+{
 	memset(_players, 0, sizeof(_players));
 	for (PlayerID i = PLAYER_FIRST; i != MAX_PLAYERS; i++) _players[i].index = i;
 	for (PlayerID i = PLAYER_FIRST; i != MAX_PLAYERS; i++) {
 		_players[i].index = i;
 		for (uint j = 0; j < 4; j++) _players[i].share_owners[j] = PLAYER_SPECTATOR;
+	}
 	_cur_player_tick_index = 0;
+}

0 comments (0 inline, 0 general)