Merge pull request #1629 from GriffinRichards/connection-dir

Add missing direction constant usage
This commit is contained in:
GriffinR
2022-02-14 23:50:06 -05:00
committed by GitHub
+4 -4
View File
@@ -403,25 +403,25 @@ static bool8 IsHiddenItemPresentInConnection(struct MapConnection *connection, i
switch (connection->direction) switch (connection->direction)
{ {
// same weird temp variable behavior seen in IsHiddenItemPresentAtCoords // same weird temp variable behavior seen in IsHiddenItemPresentAtCoords
case 2: case CONNECTION_NORTH:
localOffset = connection->offset + MAP_OFFSET; localOffset = connection->offset + MAP_OFFSET;
localX = x - localOffset; localX = x - localOffset;
localLength = mapHeader->mapLayout->height - MAP_OFFSET; localLength = mapHeader->mapLayout->height - MAP_OFFSET;
localY = localLength + y; // additions are reversed for some reason localY = localLength + y; // additions are reversed for some reason
break; break;
case 1: case CONNECTION_SOUTH:
localOffset = connection->offset + MAP_OFFSET; localOffset = connection->offset + MAP_OFFSET;
localX = x - localOffset; localX = x - localOffset;
localLength = gMapHeader.mapLayout->height + MAP_OFFSET; localLength = gMapHeader.mapLayout->height + MAP_OFFSET;
localY = y - localLength; localY = y - localLength;
break; break;
case 3: case CONNECTION_WEST:
localLength = mapHeader->mapLayout->width - MAP_OFFSET; localLength = mapHeader->mapLayout->width - MAP_OFFSET;
localX = localLength + x; // additions are reversed for some reason localX = localLength + x; // additions are reversed for some reason
localOffset = connection->offset + MAP_OFFSET; localOffset = connection->offset + MAP_OFFSET;
localY = y - localOffset; localY = y - localOffset;
break; break;
case 4: case CONNECTION_EAST:
localLength = gMapHeader.mapLayout->width + MAP_OFFSET; localLength = gMapHeader.mapLayout->width + MAP_OFFSET;
localX = x - localLength; localX = x - localLength;
localOffset = connection->offset + MAP_OFFSET; localOffset = connection->offset + MAP_OFFSET;