Skip to content

Commit

Permalink
Add oil barrels on all clients.
Browse files Browse the repository at this point in the history
Fixes desynch 10 minutes after picking up an oil barrel.

Introduced in 29966c5.

Fixes ticket:3396 and ticket:3413.
  • Loading branch information
Cyp committed Apr 22, 2012
1 parent dfae0b1 commit b6834d1
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/move.cpp
Expand Up @@ -2282,9 +2282,8 @@ static bool pickupOilDrum(int toPlayer, int fromPlayer)
CONPRINTF(ConsoleString, (ConsoleString, _("You found %u power in an oil drum."), OILDRUM_POWER));
}

// TODO This code is weird. When should new oil drums actually be added?
// fromPlayer == ANYPLAYER seems to mean that the drum was not pre-placed on the map.
if (bMultiPlayer && fromPlayer == ANYPLAYER && toPlayer == selectedPlayer)
if (bMultiPlayer && fromPlayer == ANYPLAYER)
{
// when player finds oil, we init the timer, and flag that we need a drum
if (!oilTimer)
Expand Down

0 comments on commit b6834d1

Please sign in to comment.