Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cloaked ships do mass lock the player now.

Browse Source
This commit is contained in:
AnotherCommander 2020-07-18 13:49:20 +02:00
parent 94d89fdd55
commit 4f19c982fe
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Core/Entities/PlayerEntity.m
View File

@ -3289,6 +3289,7 @@ NSComparisonResult marketSorterByMassUnit(id a, id b, void *market);
- (BOOL) checkEntityForMassLock:(Entity *)ent withScanClass:(int)theirClass - (BOOL) checkEntityForMassLock:(Entity *)ent withScanClass:(int)theirClass
{ {
BOOL massLocked = NO; BOOL massLocked = NO;
BOOL entIsCloakedShip = [ent isShip] && [(ShipEntity *)ent isCloaked];
if (EXPECT_NOT([ent isStellarObject])) if (EXPECT_NOT([ent isStellarObject]))
{ {
@ -3308,8 +3309,7 @@ NSComparisonResult marketSorterByMassUnit(id a, id b, void *market);
} }
else if (theirClass != CLASS_NO_DRAW) else if (theirClass != CLASS_NO_DRAW)
{ {
// cloaked ships do not mass lock! if (EXPECT_NOT (entIsCloakedShip)
if (EXPECT_NOT ([ent isShip] && [(ShipEntity *)ent isCloaked]))
{ {
theirClass = CLASS_NO_DRAW; theirClass = CLASS_NO_DRAW;
} }
@ -3320,6 +3320,12 @@ NSComparisonResult marketSorterByMassUnit(id a, id b, void *market);
switch (theirClass) switch (theirClass)
{ {
case CLASS_NO_DRAW: case CLASS_NO_DRAW:
// cloaked ships do mass lock! - Nikos 20200718
if (entIsCloakedShip && ![ent isPlayer])
{
massLocked = YES;
}
break;
case CLASS_PLAYER: case CLASS_PLAYER:
case CLASS_BUOY: case CLASS_BUOY:
case CLASS_ROCK: case CLASS_ROCK: