[Warzone2100-commits] [Warzone2100/warzone2100] 4b5378: Update secondary order in UI before synchronisatio...

[GitHub <no...@gi...>]

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 4b53782254727fc92333325fd33ba9c9b1dbe114
      https://github.com/Warzone2100/warzone2100/commit/4b53782254727fc92333325fd33ba9c9b1dbe114
  Author: Cyp <cy...@wz...>
  Date:   2012-01-29 (Sun, 29 Jan 2012)

  Changed paths:
    M src/droid.cpp
  M src/droiddef.h
  M src/game.cpp
  M src/intorder.cpp
  M src/multibot.cpp
  M src/multisync.cpp
  M src/order.cpp
  M src/order.h

  Log Message:
  -----------
  Update secondary order in UI before synchronisation.

Fixes confusion over whether orders were accepted or not.

Clicking patrol and circle in the UI now makes the next order a patrol or circle
order, even if clicking before the patrol and circle secondary orders are
synchronised. Although, patrol and circle really shouldn't be secondary orders,
in the first place. Previous behaviour was to just go to the destination without
patrolling or circling, on clicking and then giving the order fast when in laggy
games.


  Commit: 1fc057644d3e5cea6895d04deff811c5a9fb3b05
      https://github.com/Warzone2100/warzone2100/commit/1fc057644d3e5cea6895d04deff811c5a9fb3b05
  Author: Cyp <cy...@wz...>
  Date:   2012-01-29 (Sun, 29 Jan 2012)

  Changed paths:
    M src/multiint.cpp

  Log Message:
  -----------
  Make [Password required] [No Tanks] [No Cyborgs] [No VTOLs] display more consistent.

Reported by Emdek.


  Commit: cbb6a05769fff09803bbfb1f020725fef9d461b3
      https://github.com/Warzone2100/warzone2100/commit/cbb6a05769fff09803bbfb1f020725fef9d461b3
  Author: Guangcong Luo <za...@wz...>
  Date:   2012-01-29 (Sun, 29 Jan 2012)

  Changed paths:
    M src/droid.cpp

  Log Message:
  -----------
  Remove CB functionality from WSS droids - it was causing several bugs.

(cherry picked from commit 5dc9817159e28ff50f316d757e4763e5ac864b50)

Fixes ticket:3057.


  Commit: 1a08636d33cf6edc54e8cbe7c1dd5d2fffd62dbb
      https://github.com/Warzone2100/warzone2100/commit/1a08636d33cf6edc54e8cbe7c1dd5d2fffd62dbb
  Author: Cyp <cy...@wz...>
  Date:   2012-01-29 (Sun, 29 Jan 2012)

  Changed paths:
    M src/projectile.cpp

  Log Message:
  -----------
  Skip dead objects when applying splash and incendary damage.

Fixes an assertion due to re-destroying dead structures.

Introduced in 4657de6ee74b3e6c2906b421dec658be10ed2560.


Compare: https://github.com/Warzone2100/warzone2100/compare/6e00044...1a08636