widelands

Merge lp://staging/~widelands-dev/widelands/message_expired into lp://staging/widelands

message_expired
Merge into trunk

Proposed by cghislai on 2013-08-06

Status:

Merged

Merged at revision:

6710

Proposed branch:

lp://staging/~widelands-dev/widelands/message_expired

Merge into:

lp://staging/widelands

Diff against target:

98 lines (+10/-3)

6 files modified

src/logic/building.cc (+4/-1)
src/logic/building.h (+1/-0)
src/logic/militarysite.cc (+2/-2)
src/logic/production_program.cc (+1/-0)
src/logic/worker.cc (+1/-0)
src/scripting/lua_game.cc (+1/-0)

To merge this branch:

bzr merge lp://staging/~widelands-dev/widelands/message_expired

Related bugs:

Bug #1207477: Assertion `it != end()' failed in message queue	High	Fix Released
Bug #1208440: Some messages directly expired and still play sound	Undecided	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
SirVer		2013-08-06	Approve on 2013-08-07
Review via email: mp+178836@code.staging.launchpad.net

Description of the change

This branch introduces a new parameter in the Building::send_message method to prevent linking the message to the immovable, so the message will not expire once the building is destroyed. This is used by the "military site lost" message.
Also thanks to the tests the lua method has been updated as well, which was previously forgotten.

Revision history for this message

SirVer (sirver) wrote on 2013-08-07:

keep_when_removed is a bad name choice. how about calling it link_lifetime_to_msgsender. It would then be the inverse of what it is now, but easier to understand. Please change the name to something different and then merge it to trunk yourself?

Approved, but please fix this one issue.

review: Approve