diff options
| author | Adrian Frühwirth | 2018-05-07 09:46:27 +0200 |
|---|---|---|
| committer | Adrian Frühwirth | 2018-05-07 20:06:31 +0200 |
| commit | f58731cfae973c95a79520b2462ee991218509d2 (patch) | |
| tree | 3a5fd3623872f17e70b4e5b1ab324af4aca1b07c /engines | |
| parent | 0cbea68e760c299b03589105ad1798e3f28a4c43 (diff) | |
| download | scummvm-rg350-f58731cfae973c95a79520b2462ee991218509d2.tar.gz scummvm-rg350-f58731cfae973c95a79520b2462ee991218509d2.tar.bz2 scummvm-rg350-f58731cfae973c95a79520b2462ee991218509d2.zip | |
SAGA: Enforce code formatting guidelines
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/saga/isomap.cpp | 10 | ||||
| -rw-r--r-- | engines/saga/isomap.h | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/engines/saga/isomap.cpp b/engines/saga/isomap.cpp index 768fbd22ff..ae2b458461 100644 --- a/engines/saga/isomap.cpp +++ b/engines/saga/isomap.cpp @@ -740,7 +740,7 @@ void IsoMap::drawTile(uint16 tileIndex, const Point &point, const Location *loca if (location->z >= 16) { return; } else { - switch (_tilesTable[tileIndex].GetMaskRule()) { + switch (_tilesTable[tileIndex].getMaskRule()) { case kMaskRuleNever: return; case kMaskRuleAlways: @@ -1078,8 +1078,8 @@ void IsoMap::testPossibleDirections(int16 u, int16 v, uint16 terraComp[8], int s #define TEST_TILE_PROLOG(offsetU, offsetV) \ tile = getTile(u + offsetU, v + offsetV , _platformHeight); \ if (tile != NULL) { \ - fgdMask = tile->GetFGDMask(); \ - bgdMask = tile->GetBGDMask(); \ + fgdMask = tile->getFGDMask(); \ + bgdMask = tile->getBGDMask(); \ mask = tile->terrainMask; #define TEST_TILE_EPILOG(index) \ @@ -1368,8 +1368,8 @@ void IsoMap::findDragonTilePath(ActorData* actor, const Location &start, const L tile = getTile(u1, v1, _platformHeight); if (tile != NULL) { mask = tile->terrainMask; - if (((mask != 0) && (tile->GetFGDAttr() >= kTerrBlock)) || - ((mask != 0xFFFF) && (tile->GetBGDAttr() >= kTerrBlock))) { + if (((mask != 0 ) && (tile->getFGDAttr() >= kTerrBlock)) || + ((mask != 0xFFFF) && (tile->getBGDAttr() >= kTerrBlock))) { pcell->visited = 1; } } else { diff --git a/engines/saga/isomap.h b/engines/saga/isomap.h index 155d9b8d24..83dfd98b87 100644 --- a/engines/saga/isomap.h +++ b/engines/saga/isomap.h @@ -95,20 +95,20 @@ struct IsoTileData { byte *tilePointer; uint16 terrainMask; byte FGDBGDAttr; - int8 GetMaskRule() const { + int8 getMaskRule() const { return attributes & 0x0F; } - byte GetFGDAttr() const { + byte getFGDAttr() const { return FGDBGDAttr >> 4; } - byte GetBGDAttr() const { + byte getBGDAttr() const { return FGDBGDAttr & 0x0F; } - uint16 GetFGDMask() const { - return 1 << GetFGDAttr(); + uint16 getFGDMask() const { + return 1 << getFGDAttr(); } - uint16 GetBGDMask() const { - return 1 << GetBGDAttr(); + uint16 getBGDMask() const { + return 1 << getBGDAttr(); } }; |