- Added 'ininventory item, amount' option to SBARINFO to check for a minimum

amount instead of mere presence in the inventory.
- Fixed: Door lock messages were overwritten by remote messages.

SVN r1346 (trunk)
This commit is contained in:
Christoph Oelckers 2009-01-02 17:49:48 +00:00
commit 35edd15386
4 changed files with 16 additions and 1 deletions

View file

@ -291,7 +291,7 @@ static void ParseLock(FScanner &sc)
{
lock->RemoteMsg = lock->Message;
}
if (!lock->Message.IsEmpty() && lock->RemoteMsg.IsNotEmpty())
if (lock->Message.IsEmpty() && lock->RemoteMsg.IsNotEmpty())
{
lock->Message = lock->RemoteMsg;
}