[Warzone2100-commits] [Warzone2100/warzone2100] cff886: walls: Fix walls alignment with 2x2 fortresses and...

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

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100

  Commit: cff886cc3630ffd8374d6cfea5fd77b0ffb60acb
      https://github.com/Warzone2100/warzone2100/commit/cff886cc3630ffd8374d6cfea5fd77b0ffb60acb
  Author: Cyp <cy...@wz...>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M src/structure.cpp

  Log Message:
  -----------
  walls: Fix walls alignment with 2x2 fortresses and allied walls.

Don't search through all structures on the map when looking for nearby structures.


  Commit: 0898e56847e583500d418feade5688b6d27eadd1
      https://github.com/Warzone2100/warzone2100/commit/0898e56847e583500d418feade5688b6d27eadd1
  Author: Cyp <cy...@wz...>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M src/structure.cpp

  Log Message:
  -----------
  walls: Do not destroy and recreate walls when changing to corner type.

This would cause trucks to stop building the wall that was changed.


  Commit: 7e449bf18b53dab54797b1851df2bc68701abb92
      https://github.com/Warzone2100/warzone2100/commit/7e449bf18b53dab54797b1851df2bc68701abb92
  Author: Cyp <cy...@wz...>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M src/display3d.cpp

  Log Message:
  -----------
  Simplify blueprint logic, first plan all blueprints, then render them.


  Commit: 42f57b6116429c0a94c570fc6996429b5b666229
      https://github.com/Warzone2100/warzone2100/commit/42f57b6116429c0a94c570fc6996429b5b666229
  Author: Cyp <cy...@wz...>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M src/display.cpp
  M src/display3d.cpp
  M src/display3d.h
  M src/structure.cpp
  M src/structure.h
  M src/structuredef.h

  Log Message:
  -----------
  walls: Make blueprint walls match each other, and match real walls.

Fixes ticket:2581.


  Commit: 312b4a21c949a8296cf0eb798563f0fc071b4d7b
      https://github.com/Warzone2100/warzone2100/commit/312b4a21c949a8296cf0eb798563f0fc071b4d7b
  Author: Cyp <cy...@wz...>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M src/structure.cpp

  Log Message:
  -----------
  walls: Adjust wall orientation next to new hardpoints.

Wall orientation should no longer depend on whether the wall or the hardpoint was built first.


  Commit: 233ee5e711469ab491c3eaac0a2a681b94207fcd
      https://github.com/Warzone2100/warzone2100/commit/233ee5e711469ab491c3eaac0a2a681b94207fcd
  Author: Cyp <cy...@wz...>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M src/display3d.cpp
  M src/structure.cpp
  M src/structuredef.h

  Log Message:
  -----------
  walls: Make walls rotate to visually block narrow passages.

Single walls should look less weird, when blocking narrow passages, now.


  Commit: 116afd08c5b7e520ce9aaaf1a850245b76ffd797
      https://github.com/Warzone2100/warzone2100/commit/116afd08c5b7e520ce9aaaf1a850245b76ffd797
  Author: Cyp <cy...@wz...>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M src/action.cpp

  Log Message:
  -----------
  walls: If building a corner wall with two trucks, don't cancel the second truck's order when it arrives.


  Commit: a7b2a5b45fa2634f225d9ae9c823fc62ef946f59
      https://github.com/Warzone2100/warzone2100/commit/a7b2a5b45fa2634f225d9ae9c823fc62ef946f59
  Author: Cyp <cy...@wz...>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M src/action.cpp
  M src/structure.cpp

  Log Message:
  -----------
  walls: Allow building gates on top of walls.


  Commit: 54080cc5561a65c5cda0939b8a766c44475211f2
      https://github.com/Warzone2100/warzone2100/commit/54080cc5561a65c5cda0939b8a766c44475211f2
  Author: Cyp <cy...@wz...>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M data/base/multiplay/maps/4c-pyramidal/droid.ini

  Log Message:
  -----------
  Fix 3 extra trucks belonging to host on 4c-pyramidal.

The 3 extra trucks belonged to player 4, 5 and 6, and triggered an assertion.

Fixes ticket:2945.


  Commit: a4ac61551c7d7ff8f92a599ef9f1df8028137ea2
      https://github.com/Warzone2100/warzone2100/commit/a4ac61551c7d7ff8f92a599ef9f1df8028137ea2
  Author: Cyp <cy...@wz...>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M src/order.cpp

  Log Message:
  -----------
  Do not cancel order queue, if trying to build an unresearched module.

Fixes ticket:2797.


  Commit: a6c307920bd721230b54c3cc92d0999d2eb99a1d
      https://github.com/Warzone2100/warzone2100/commit/a6c307920bd721230b54c3cc92d0999d2eb99a1d
  Author: Cyp <cy...@wz...>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M src/order.cpp

  Log Message:
  -----------
  Display order arrow, when queueing modules to be built.

Also, simplified
  if (!bOrderEffectDisplayed && (psOrder->order != DORDER_BUILD || psOrder->order != DORDER_LINEBUILD || psOrder->order != DORDER_BUILDMODULE || psOrder->order != DORDER_HELPBUILD))
to
  if (!bOrderEffectDisplayed)
since psOrder could never be all of DORDER_BUILD, DORDER_LINEBUILD, DORDER_BUILDMODULE and DORDER_HELPBUILD simultaneously. The original condition was
  if (!bOrderEffectDisplayed AND (psOrder->order != DORDER_BUILD OR
       psOrder->order != DORDER_LINEBUILD OR psOrder->order !=
       DORDER_BUILDMODULE OR psOrder->order != DORDER_HELPBUILD))
which uses AND and OR, instead of && and ||, but didn't make much sense, either.

Fixes ticket:2602. Fixes ticket:2732.


Compare: https://github.com/Warzone2100/warzone2100/compare/3bc7cdc...a6c3079