[Scummvm-git-logs] scummvm master -> b1a861b50d66c224b6c449681b1be0fedc469daa
fracturehill
noreply at scummvm.org
Mon Feb 19 20:49:28 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b1a861b50d NANCY: JANITORIAL: Fix trailing whitespace/tabs
Commit: b1a861b50d66c224b6c449681b1be0fedc469daa
https://github.com/scummvm/scummvm/commit/b1a861b50d66c224b6c449681b1be0fedc469daa
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2024-02-19T20:46:17+01:00
Commit Message:
NANCY: JANITORIAL: Fix trailing whitespace/tabs
Changed paths:
engines/nancy/action/actionmanager.cpp
engines/nancy/action/arfactory.cpp
engines/nancy/action/autotext.cpp
engines/nancy/action/conversation.cpp
engines/nancy/action/conversation.h
engines/nancy/action/datarecords.cpp
engines/nancy/action/interactivevideo.cpp
engines/nancy/action/miscrecords.cpp
engines/nancy/action/navigationrecords.cpp
engines/nancy/action/navigationrecords.h
engines/nancy/action/overlay.cpp
engines/nancy/action/puzzle/assemblypuzzle.cpp
engines/nancy/action/puzzle/assemblypuzzle.h
engines/nancy/action/puzzle/bballpuzzle.cpp
engines/nancy/action/puzzle/bulpuzzle.cpp
engines/nancy/action/puzzle/bulpuzzle.h
engines/nancy/action/puzzle/collisionpuzzle.cpp
engines/nancy/action/puzzle/collisionpuzzle.h
engines/nancy/action/puzzle/cubepuzzle.cpp
engines/nancy/action/puzzle/cubepuzzle.h
engines/nancy/action/puzzle/hamradiopuzzle.cpp
engines/nancy/action/puzzle/mazechasepuzzle.cpp
engines/nancy/action/puzzle/mazechasepuzzle.h
engines/nancy/action/puzzle/orderingpuzzle.cpp
engines/nancy/action/puzzle/peepholepuzzle.cpp
engines/nancy/action/puzzle/raycastpuzzle.cpp
engines/nancy/action/puzzle/rippedletterpuzzle.cpp
engines/nancy/action/puzzle/safedialpuzzle.cpp
engines/nancy/action/puzzle/setplayerclock.cpp
engines/nancy/action/puzzle/spigotpuzzle.cpp
engines/nancy/action/puzzle/tangrampuzzle.cpp
engines/nancy/action/puzzle/tangrampuzzle.h
engines/nancy/action/puzzle/telephone.cpp
engines/nancy/action/puzzle/turningpuzzle.cpp
engines/nancy/action/puzzle/twodialpuzzle.cpp
engines/nancy/action/soundrecords.h
engines/nancy/cif.cpp
engines/nancy/commontypes.cpp
engines/nancy/commontypes.h
engines/nancy/console.cpp
engines/nancy/cursor.cpp
engines/nancy/enginedata.cpp
engines/nancy/enginedata.h
engines/nancy/input.cpp
engines/nancy/misc/hypertext.cpp
engines/nancy/misc/mousefollow.cpp
engines/nancy/misc/mousefollow.h
engines/nancy/misc/specialeffect.cpp
engines/nancy/misc/specialeffect.h
engines/nancy/nancy.cpp
engines/nancy/puzzledata.h
engines/nancy/resource.cpp
engines/nancy/resource.h
engines/nancy/sound.cpp
engines/nancy/sound.h
engines/nancy/state/credits.h
engines/nancy/state/help.cpp
engines/nancy/state/loadsave.cpp
engines/nancy/state/mainmenu.cpp
engines/nancy/state/scene.cpp
engines/nancy/state/scene.h
engines/nancy/state/setupmenu.cpp
engines/nancy/ui/button.cpp
engines/nancy/ui/button.h
engines/nancy/video.cpp
diff --git a/engines/nancy/action/actionmanager.cpp b/engines/nancy/action/actionmanager.cpp
index 40924a6b58f..41e04499987 100644
--- a/engines/nancy/action/actionmanager.cpp
+++ b/engines/nancy/action/actionmanager.cpp
@@ -148,7 +148,7 @@ ActionRecord *ActionManager::createAndLoadNewRecord(Common::SeekableReadStream &
if (!newRecord) {
newRecord = new Unimplemented();
}
-
+
newRecord->_description = descBuf;
newRecord->_type = ARType;
newRecord->_execType = (ActionRecord::ExecutionType)execType;
@@ -168,7 +168,7 @@ ActionRecord *ActionManager::createAndLoadNewRecord(Common::SeekableReadStream &
newRecord->_description.c_str());
delete newRecord;
-
+
newRecord = new Unimplemented();
newRecord->_description = descBuf;
newRecord->_type = ARType;
@@ -256,7 +256,7 @@ void ActionManager::processActionRecords() {
if(record->_state == ActionRecord::kBegin) {
_activatedRecordsThisFrame.push_back(record);
}
-
+
record->execute();
_recordsWereExecuted = true;
}
@@ -309,7 +309,6 @@ void ActionManager::processDependency(DependencyRecord &dep, ActionRecord &recor
}
}
}
-
}
// If all children are satisfied, so is the parent
diff --git a/engines/nancy/action/arfactory.cpp b/engines/nancy/action/arfactory.cpp
index 600a419e30f..32c5980f0fe 100644
--- a/engines/nancy/action/arfactory.cpp
+++ b/engines/nancy/action/arfactory.cpp
@@ -183,7 +183,7 @@ ActionRecord *ActionManager::createActionRecord(uint16 type, Common::SeekableRea
return new ConversationCelTerse(); // nancy8 and up
}
case 63:
- return new ConversationSoundTerse();
+ return new ConversationSoundTerse();
case 65:
return new TableIndexOverlay();
case 66:
@@ -287,7 +287,7 @@ ActionRecord *ActionManager::createActionRecord(uint16 type, Common::SeekableRea
return new PlaySound(); // PlayStreamSound
} else {
return new PlayRandomSoundTerse();
- }
+ }
case 152:
return new PlaySoundFrameAnchor();
case 153:
diff --git a/engines/nancy/action/autotext.cpp b/engines/nancy/action/autotext.cpp
index 7fb1895057b..0839dc20e5d 100644
--- a/engines/nancy/action/autotext.cpp
+++ b/engines/nancy/action/autotext.cpp
@@ -126,7 +126,7 @@ void Autotext::execute() {
_hotspotScenes.insert_at(0, entry.sceneID);
}
}
-
+
if (!_textKey.empty() && stringID == _textKey) {
foundThisKey = true;
}
diff --git a/engines/nancy/action/conversation.cpp b/engines/nancy/action/conversation.cpp
index 59cceb0f6ef..1936b1da533 100644
--- a/engines/nancy/action/conversation.cpp
+++ b/engines/nancy/action/conversation.cpp
@@ -244,7 +244,7 @@ void ConversationSound::execute() {
// This fixes TVD scene 750
break;
}
-
+
// However, nancy6 scene 1299 requires us to fall through in order to get the correct caption.
// By that point Conversation scenes weren't the tangled mess they were in earlier games,
// so hopefully this won't break anything
@@ -457,7 +457,7 @@ void ConversationSound::addConditionalDialogue() {
newResponse.text = convo->texts[res.soundID];
}
-
+
newResponse.sceneChange.sceneID = res.sceneID;
newResponse.sceneChange.continueSceneSound = kContinueSceneSound;
newResponse.sceneChange.listenerFrontVector.set(0, 0, 1);
@@ -799,7 +799,7 @@ void ConversationCel::updateGraphics() {
void ConversationCel::readData(Common::SeekableReadStream &stream) {
Common::String xsheetName;
readFilename(stream, xsheetName);
-
+
readFilenameArray(stream, _treeNames, 4);
readXSheet(stream, xsheetName);
diff --git a/engines/nancy/action/conversation.h b/engines/nancy/action/conversation.h
index 5cc705f38f7..254cbd87544 100644
--- a/engines/nancy/action/conversation.h
+++ b/engines/nancy/action/conversation.h
@@ -103,7 +103,7 @@ protected:
// Functions for reading captions are virtual to allow easier support for the terse Conversation variants
virtual void readCaptionText(Common::SeekableReadStream &stream);
virtual void readResponseText(Common::SeekableReadStream &stream, ResponseStruct &response);
-
+
// Used in subclasses
void readTerseData(Common::SeekableReadStream &stream);
void readTerseCaptionText(Common::SeekableReadStream &stream);
@@ -174,7 +174,7 @@ public:
protected:
Common::String getRecordTypeName() const override { return "ConversationCel"; }
-
+
struct Cel {
Graphics::ManagedSurface surf;
Common::Rect src;
@@ -241,7 +241,7 @@ protected:
class ConversationSoundTerse : public ConversationSound {
public:
void readData(Common::SeekableReadStream &stream) override;
-
+
protected:
Common::String getRecordTypeName() const override { return "ConversationSoundTerse"; }
};
@@ -250,7 +250,7 @@ protected:
class ConversationCelTerse : public ConversationCel {
public:
void readData(Common::SeekableReadStream &stream) override;
-
+
protected:
Common::String getRecordTypeName() const override { return "ConversationCelTerse"; }
};
diff --git a/engines/nancy/action/datarecords.cpp b/engines/nancy/action/datarecords.cpp
index b66a508d0e2..4a2931985b6 100644
--- a/engines/nancy/action/datarecords.cpp
+++ b/engines/nancy/action/datarecords.cpp
@@ -79,7 +79,7 @@ void TableIndexSetValueHS::execute() {
if (playerTable->singleValues[_tableIndex - 1] == 0) {
playerTable->singleValues[_tableIndex - 1] = playerTable->singleValues.size();
}
-
+
break;
}
@@ -149,7 +149,7 @@ void SetValue::execute() {
void SetValueCombo::readData(Common::SeekableReadStream &stream) {
_valueIndex = stream.readByte();
-
+
_indices.resize(10);
_percentages.resize(10);
for (uint i = 0; i < 10; ++i) {
diff --git a/engines/nancy/action/interactivevideo.cpp b/engines/nancy/action/interactivevideo.cpp
index 2bbf50d8ff1..3f38e696f7e 100644
--- a/engines/nancy/action/interactivevideo.cpp
+++ b/engines/nancy/action/interactivevideo.cpp
@@ -64,7 +64,7 @@ void InteractiveVideo::readData(Common::SeekableReadStream &stream) {
frame.triggerOnNoHotspot = ivFile->readByte();
frame.noHSFlagID = ivFile->readSint16LE();
frame.noHSCursorID = ivFile->readSint16LE();
-
+
frame.hotspots.resize(numHotspots);
for (uint j = 0; j < numHotspots; ++j) {
ivFile->skip(4);
diff --git a/engines/nancy/action/miscrecords.cpp b/engines/nancy/action/miscrecords.cpp
index 02bded22ea4..a30695a517b 100644
--- a/engines/nancy/action/miscrecords.cpp
+++ b/engines/nancy/action/miscrecords.cpp
@@ -92,7 +92,7 @@ void SpecialEffect::execute() {
} else {
NancySceneState.specialEffect(_type, _totalTime, _fadeToBlackTime, _rect);
}
-
+
_isDone = true;
}
@@ -107,11 +107,11 @@ void TextBoxWrite::readData(Common::SeekableReadStream &stream) {
if (size > 10000) {
error("Action Record atTextboxWrite has too many text box chars: %d", size);
}
-
+
if (size == -1) {
Common::String stringID;
readFilename(stream, stringID);
-
+
const CVTX *autotext = (const CVTX *)g_nancy->getEngineData("AUTOTEXT");
assert(autotext);
diff --git a/engines/nancy/action/navigationrecords.cpp b/engines/nancy/action/navigationrecords.cpp
index 5b086b84743..45ac45e485a 100644
--- a/engines/nancy/action/navigationrecords.cpp
+++ b/engines/nancy/action/navigationrecords.cpp
@@ -110,7 +110,7 @@ void HotMultiframeMultisceneChange::readData(Common::SeekableReadStream &stream)
_onTrue.readData(stream, true);
_onFalse.readData(stream, true);
}
-
+
_condType = stream.readByte();
_conditionID = stream.readUint16LE();
_conditionPayload = stream.readByte();
@@ -182,7 +182,7 @@ void HotMultiframeMultisceneCursorTypeSceneChange::readData(Common::SeekableRead
stream.skip(2);
_defaultScene.readData(stream);
-
+
uint16 numHotspots = stream.readUint16LE();
_hotspots.resize(numHotspots);
for (uint i = 0; i < numHotspots; ++i) {
diff --git a/engines/nancy/action/navigationrecords.h b/engines/nancy/action/navigationrecords.h
index 35cd2835b72..03e7d9a46cf 100644
--- a/engines/nancy/action/navigationrecords.h
+++ b/engines/nancy/action/navigationrecords.h
@@ -82,7 +82,7 @@ public:
void readData(Common::SeekableReadStream &stream) override;
void execute() override;
-
+
CursorManager::CursorType getHoverCursor() const override { return _hoverCursor; }
HotspotDescription _hotspotDesc;
diff --git a/engines/nancy/action/overlay.cpp b/engines/nancy/action/overlay.cpp
index e7409d004d4..0af996c2a7e 100644
--- a/engines/nancy/action/overlay.cpp
+++ b/engines/nancy/action/overlay.cpp
@@ -41,7 +41,7 @@ void Overlay::init() {
if (_imageName.baseName().hasPrefix("USE_")) {
_usesAutotext = true;
}
-
+
g_nancy->_resource->loadImage(_imageName, _fullSurface);
_currentFrame = _firstFrame;
@@ -347,7 +347,7 @@ void Overlay::execute() {
if (_hasSceneChange == kPlayOverlaySceneChange) {
NancySceneState.changeScene(_sceneChange);
}
-
+
finishExecution();
break;
@@ -429,7 +429,7 @@ void TableIndexOverlay::execute() {
_lastIndexVal = playerTable->singleValues[_tableIndex - 1];
_srcRects.clear();
_srcRects.push_back(tabl->srcRects[_lastIndexVal - 1]);
- _currentViewportFrame = -1; // Force redraw
+ _currentViewportFrame = -1; // Force redraw
}
if (_state != kBegin) {
diff --git a/engines/nancy/action/puzzle/assemblypuzzle.cpp b/engines/nancy/action/puzzle/assemblypuzzle.cpp
index 50dec5db18b..af3b5b5f111 100644
--- a/engines/nancy/action/puzzle/assemblypuzzle.cpp
+++ b/engines/nancy/action/puzzle/assemblypuzzle.cpp
@@ -124,7 +124,7 @@ void AssemblyPuzzle::execute() {
g_nancy->_sound->loadSound(_rotateSound);
g_nancy->_sound->loadSound(_pickUpSound);
g_nancy->_sound->loadSound(_placeDownSound);
-
+
_state = kRun;
// fall through
case kRun:
@@ -151,7 +151,7 @@ void AssemblyPuzzle::execute() {
NancySceneState.changeScene(_solveScene._sceneChange);
} else {
_exitScene.execute();
- }
+ }
break;
}
@@ -161,7 +161,7 @@ void AssemblyPuzzle::handleInput(NancyInput &input) {
if (_state == kActionTrigger && _completed && g_nancy->_sound->isSoundPlaying(_solveSound)) {
return;
}
-
+
if (_pickedUpPiece == -1 && NancySceneState.getViewport().convertViewportToScreen(_exitHotspot).contains(input.mousePos)) {
g_nancy->_cursor->setCursorType(g_nancy->_cursor->_puzzleExitCursor);
@@ -224,7 +224,7 @@ void AssemblyPuzzle::handleInput(NancyInput &input) {
piece.registerGraphics();
}
}
-
+
_pieces[i].setZ(_z + _pieces.size() * 2);
_pieces[i].registerGraphics();
} else {
@@ -316,7 +316,7 @@ void AssemblyPuzzle::rotateBase(bool ccw) {
} else if (piece.curRotation == 1 || piece.curRotation == 3) {
base = 1;
}
-
+
piece.setZ(_z + base + 4 * (piece.layer - 1));
piece.registerGraphics();
diff --git a/engines/nancy/action/puzzle/assemblypuzzle.h b/engines/nancy/action/puzzle/assemblypuzzle.h
index db16ebcc643..6b301b67015 100644
--- a/engines/nancy/action/puzzle/assemblypuzzle.h
+++ b/engines/nancy/action/puzzle/assemblypuzzle.h
@@ -73,7 +73,7 @@ protected:
Common::Array<Piece> _pieces;
SoundDescription _rotateSound;
- SoundDescription _pickUpSound;
+ SoundDescription _pickUpSound;
SoundDescription _placeDownSound;
bool _allowWrongPieceHotspot = false;
@@ -94,7 +94,7 @@ protected:
int _curRotation = 0;
uint _layersAssembled = 0;
bool _completed = false;
-
+
AssemblyPuzzleData *_puzzleState = nullptr;
};
diff --git a/engines/nancy/action/puzzle/bballpuzzle.cpp b/engines/nancy/action/puzzle/bballpuzzle.cpp
index c2bcea97b3c..764dc3ef651 100644
--- a/engines/nancy/action/puzzle/bballpuzzle.cpp
+++ b/engines/nancy/action/puzzle/bballpuzzle.cpp
@@ -74,7 +74,7 @@ void BBallPuzzle::init() {
NancySceneState.setEventFlag(_playerPositionFlags[i], g_nancy->_false);
}
}
-
+
// Reset shot type flags
for (uint i = 0; i < _badShootFlags.size(); ++i) {
NancySceneState.setEventFlag(_badShootFlags[i], g_nancy->_false);
@@ -110,7 +110,7 @@ void BBallPuzzle::readData(Common::SeekableReadStream &stream) {
readRect(stream, _angleDest);
readRectArray(stream, _angleSliderHotspots, 3);
-
+
readRect(stream, _shootButtonSrc);
readRect(stream, _minusButtonSrc);
readRect(stream, _plusButtonSrc);
diff --git a/engines/nancy/action/puzzle/bulpuzzle.cpp b/engines/nancy/action/puzzle/bulpuzzle.cpp
index d665aba2753..0ef5047be48 100644
--- a/engines/nancy/action/puzzle/bulpuzzle.cpp
+++ b/engines/nancy/action/puzzle/bulpuzzle.cpp
@@ -89,7 +89,7 @@ void BulPuzzle::updateGraphics() {
} else {
_drawSurface.fillRect(_passButtonDest, _drawSurface.getTransparentColor());
}
-
+
_changeLight = false;
_needsRedraw = true;
}
@@ -218,9 +218,9 @@ void BulPuzzle::readData(Common::SeekableReadStream &stream) {
readRectArray(stream, _diceDestsPlayer, 4);
readRectArray(stream, _diceDestsEnemy, 4);
-
+
readRectArray(stream, _cellDests, _numCells, 15);
-
+
readRectArray(stream, _playerBarracksDests, 6);
readRectArray(stream, _playerJailDests, 6);
readRectArray(stream, _enemyBarracksDests, 6);
@@ -301,7 +301,7 @@ void BulPuzzle::execute() {
if (_state == kRun) {
break;
}
-
+
// fall through
case kActionTrigger:
SoundDescription &sound = _playerWon ? _solveSound : _loseSound;
@@ -449,7 +449,7 @@ void BulPuzzle::reset(bool capture) {
_drawSurface.blitFrom(_image, _enemyJailSrc, _playerJailDests[i - _enemyPieces + 1]);
}
}
-
+
// Draw disabled pass button
_drawSurface.blitFrom(_image, _passButtonDisabledSrc, _passButtonDest);
diff --git a/engines/nancy/action/puzzle/bulpuzzle.h b/engines/nancy/action/puzzle/bulpuzzle.h
index b121da285f0..f970031df70 100644
--- a/engines/nancy/action/puzzle/bulpuzzle.h
+++ b/engines/nancy/action/puzzle/bulpuzzle.h
@@ -60,12 +60,12 @@ protected:
Common::Array<Common::Rect> _diceDestsPlayer;
Common::Array<Common::Rect> _diceDestsEnemy;
-
+
Common::Array<Common::Rect> _cellDests;
-
+
Common::Array<Common::Rect> _playerBarracksDests;
Common::Array<Common::Rect> _playerJailDests;
-
+
Common::Array<Common::Rect> _enemyBarracksDests;
Common::Array<Common::Rect> _enemyJailDests;
diff --git a/engines/nancy/action/puzzle/collisionpuzzle.cpp b/engines/nancy/action/puzzle/collisionpuzzle.cpp
index 6d56ed8604b..8be39073b4a 100644
--- a/engines/nancy/action/puzzle/collisionpuzzle.cpp
+++ b/engines/nancy/action/puzzle/collisionpuzzle.cpp
@@ -197,7 +197,7 @@ void CollisionPuzzle::readData(Common::SeekableReadStream &stream) {
_tileMoveExitPos.x = stream.readUint16LE();
_tileMoveExitSize = stream.readUint16LE();
numPieces = 6;
- }
+ }
_grid.resize(height, Common::Array<uint16>(width));
for (uint y = 0; y < height; ++y) {
@@ -211,14 +211,14 @@ void CollisionPuzzle::readData(Common::SeekableReadStream &stream) {
if (_puzzleType == kCollision) {
_startLocations.resize(numPieces);
for (uint i = 0; i < numPieces; ++i) {
- _startLocations[i].x = stream.readUint16LE();
+ _startLocations[i].x = stream.readUint16LE();
_startLocations[i].y = stream.readUint16LE();
}
stream.skip((5 - numPieces) * 4);
readRectArray(stream, _pieceSrcs, numPieces, 5);
readRectArray(stream, _homeSrcs, numPieces, 5);
-
+
readRect(stream, _verticalWallSrc);
readRect(stream, _horizontalWallSrc);
readRect(stream, _blockSrc);
@@ -250,7 +250,7 @@ void CollisionPuzzle::readData(Common::SeekableReadStream &stream) {
}
stream.skip((10 - numTimerGraphics) * 2);
readRect(stream, _timerDest);
- }
+ }
_moveSound.readNormal(stream);
if (_puzzleType == kCollision) {
@@ -321,7 +321,7 @@ void CollisionPuzzle::execute() {
if (g_nancy->getTotalPlayTime() < _solveSoundPlayTime) {
return;
}
-
+
g_nancy->_sound->loadSound(_solveSound);
g_nancy->_sound->playSound(_solveSound);
NancySceneState.setEventFlag(_solveScene._flag);
@@ -333,7 +333,7 @@ void CollisionPuzzle::execute() {
}
NancySceneState.changeScene(_solveScene._sceneChange);
- }
+ }
} else {
if (g_nancy->_sound->isSoundPlaying(_exitButtonSound)) {
return;
@@ -438,7 +438,7 @@ Common::Point CollisionPuzzle::movePiece(uint pieceID, WallType direction) {
} else {
newPos.y = i;
}
-
+
break;
} else if (evalVal == preStopWallType || evalVal == kBlock) {
break;
@@ -471,7 +471,7 @@ Common::Rect CollisionPuzzle::getScreenPosition(Common::Point gridPos) {
Common::Rect dest = _pieceSrcs[0];
dest.moveTo(0, 0);
-
+
dest.right -= 1;
dest.bottom -= 1;
diff --git a/engines/nancy/action/puzzle/collisionpuzzle.h b/engines/nancy/action/puzzle/collisionpuzzle.h
index 29cda0e24ad..485d5489721 100644
--- a/engines/nancy/action/puzzle/collisionpuzzle.h
+++ b/engines/nancy/action/puzzle/collisionpuzzle.h
@@ -61,7 +61,7 @@ protected:
Common::Point _gridPos;
uint _w = 1;
uint _h = 1;
-
+
protected:
bool isViewportRelative() const override { return true; }
};
@@ -126,7 +126,7 @@ protected:
uint32 _puzzleStartTime = 0;
int _currentTimerGraphic = -1;
-
+
PuzzleType _puzzleType;
};
diff --git a/engines/nancy/action/puzzle/cubepuzzle.cpp b/engines/nancy/action/puzzle/cubepuzzle.cpp
index 2c86841a02e..c3f2d7ad488 100644
--- a/engines/nancy/action/puzzle/cubepuzzle.cpp
+++ b/engines/nancy/action/puzzle/cubepuzzle.cpp
@@ -63,7 +63,7 @@ void CubePuzzle::readData(Common::SeekableReadStream &stream) {
readRect(stream, _cwCursorDest);
readRect(stream, _ccwCursorDest);
-
+
readRect(stream, _placedDest);
// four pieces on the side, 1 on top
@@ -106,14 +106,14 @@ void CubePuzzle::execute() {
g_nancy->_sound->loadSound(_rotateSound);
g_nancy->_sound->loadSound(_pickUpSound);
g_nancy->_sound->loadSound(_placeDownSound);
-
+
_state = kRun;
// fall through
case kRun:
for (uint i = 0; i < 5; ++i) {
if (!_placedPieces[i]) {
return;
- }
+ }
}
g_nancy->_sound->loadSound(_solveSound);
@@ -184,7 +184,7 @@ void CubePuzzle::handleInput(NancyInput &input) {
if (_pickedUpPiece == -1 && _placedPieces[i]) {
return;
}
-
+
g_nancy->_cursor->setCursorType(CursorManager::kHotspot);
if (input.input & NancyInput::kLeftMouseButtonUp) {
diff --git a/engines/nancy/action/puzzle/cubepuzzle.h b/engines/nancy/action/puzzle/cubepuzzle.h
index c92a4008a44..ec52eb98120 100644
--- a/engines/nancy/action/puzzle/cubepuzzle.h
+++ b/engines/nancy/action/puzzle/cubepuzzle.h
@@ -74,7 +74,7 @@ protected:
uint16 _startRotation = 0;
SoundDescription _rotateSound;
- SoundDescription _pickUpSound;
+ SoundDescription _pickUpSound;
SoundDescription _placeDownSound;
// Multiple solve scenes, one for each cube orientation
diff --git a/engines/nancy/action/puzzle/hamradiopuzzle.cpp b/engines/nancy/action/puzzle/hamradiopuzzle.cpp
index 0f4afa2dc62..5ea096f246a 100644
--- a/engines/nancy/action/puzzle/hamradiopuzzle.cpp
+++ b/engines/nancy/action/puzzle/hamradiopuzzle.cpp
@@ -338,7 +338,7 @@ void HamRadioPuzzle::execute() {
NancySceneState.getTextbox().addTextLine(_curCharString);
NancySceneState.getTextbox().drawTextbox();
}
-
+
if (_isOnCorrectFrequency) {
// When transmitting on right frequency, check password/code word
if (!_solvedPassword) {
@@ -459,7 +459,7 @@ void HamRadioPuzzle::handleInput(NancyInput &input) {
g_nancy->_sound->playSound(soundToPlay->sound);
}
}
-
+
break;
}
}
diff --git a/engines/nancy/action/puzzle/mazechasepuzzle.cpp b/engines/nancy/action/puzzle/mazechasepuzzle.cpp
index 57f7869f27c..d4c1ae9165c 100644
--- a/engines/nancy/action/puzzle/mazechasepuzzle.cpp
+++ b/engines/nancy/action/puzzle/mazechasepuzzle.cpp
@@ -126,7 +126,7 @@ void MazeChasePuzzle::updateGraphics() {
enemyMovement(_currentAnimFrame);
}
}
-
+
if (_currentAnimFrame == 1) {
// Clear the buttons
Common::Rect fill = _upButtonDest;
@@ -138,14 +138,14 @@ void MazeChasePuzzle::updateGraphics() {
_needsRedraw = true;
} else if (_currentAnimFrame >= _framesPerMove + 1) {
_currentAnimFrame = -1;
- }
+ }
}
}
}
void MazeChasePuzzle::readData(Common::SeekableReadStream &stream) {
readFilename(stream, _imageName);
-
+
uint width = stream.readUint16LE();
uint height = stream.readUint16LE();
uint numEnemies = stream.readUint16LE();
@@ -358,7 +358,7 @@ void MazeChasePuzzle::handleInput(NancyInput &input) {
buttonHotspot = _resetButtonDest;
buttonHotspot.grow(-10);
-
+
if (NancySceneState.getViewport().convertViewportToScreen(buttonHotspot).contains(input.mousePos)) {
g_nancy->_cursor->setCursorType(CursorManager::kHotspot);
@@ -378,7 +378,7 @@ Common::Rect MazeChasePuzzle::getScreenPosition(Common::Point gridPos) {
Common::Rect dest = _playerSrc;
dest.moveTo(0, 0);
-
+
dest.right -= 1;
dest.bottom -= 1;
@@ -507,7 +507,7 @@ bool MazeChasePuzzle::canMove(uint pieceID, WallType direction) {
}
}
}
-
+
return true;
case kWallUp :
if ( piece._gridPos.y == 0 ||
diff --git a/engines/nancy/action/puzzle/mazechasepuzzle.h b/engines/nancy/action/puzzle/mazechasepuzzle.h
index 6d39536d658..f7d3ccb6256 100644
--- a/engines/nancy/action/puzzle/mazechasepuzzle.h
+++ b/engines/nancy/action/puzzle/mazechasepuzzle.h
@@ -55,7 +55,7 @@ protected:
Common::Point _gridPos;
Common::Point _lastPos;
-
+
protected:
bool isViewportRelative() const override { return true; }
};
@@ -70,7 +70,7 @@ protected:
void reset();
Common::Path _imageName;
-
+
Common::Point _exitPos = Common::Point(-1, -1);
Common::Array<Common::Array<uint16>> _grid;
diff --git a/engines/nancy/action/puzzle/orderingpuzzle.cpp b/engines/nancy/action/puzzle/orderingpuzzle.cpp
index 6834b5910ee..93fdbab40ff 100644
--- a/engines/nancy/action/puzzle/orderingpuzzle.cpp
+++ b/engines/nancy/action/puzzle/orderingpuzzle.cpp
@@ -507,7 +507,7 @@ void OrderingPuzzle::handleInput(NancyInput &input) {
// Later games added an array of sound names
_pushDownSound.name = _pianoSoundNames[i];
}
-
+
g_nancy->_sound->loadSound(_pushDownSound);
}
diff --git a/engines/nancy/action/puzzle/peepholepuzzle.cpp b/engines/nancy/action/puzzle/peepholepuzzle.cpp
index c259253567c..1f2fb1b9f8f 100644
--- a/engines/nancy/action/puzzle/peepholepuzzle.cpp
+++ b/engines/nancy/action/puzzle/peepholepuzzle.cpp
@@ -93,7 +93,7 @@ void PeepholePuzzle::execute() {
case kRun:
break;
case kActionTrigger:
-
+
finishExecution();
}
}
@@ -270,7 +270,7 @@ void PeepholePuzzle::checkButtons() {
if (!_buttonDisabledSrcs[0].isEmpty()) {
_drawSurface.blitFrom(_buttonsImage, _buttonDisabledSrcs[0], _buttonDests[0]);
}
-
+
if (!_buttonDisabledSrcs[1].isEmpty()) {
_drawSurface.blitFrom(_buttonsImage, _buttonDisabledSrcs[1], _buttonDests[1]);
}
@@ -278,7 +278,7 @@ void PeepholePuzzle::checkButtons() {
if (_innerBounds.width() <= _dest.width()) {
_disabledButtons[2] = _disabledButtons[3] = true;
-
+
if (!_buttonDisabledSrcs[2].isEmpty()) {
_drawSurface.blitFrom(_buttonsImage, _buttonDisabledSrcs[2], _buttonDests[2]);
}
diff --git a/engines/nancy/action/puzzle/raycastpuzzle.cpp b/engines/nancy/action/puzzle/raycastpuzzle.cpp
index 07d9bfdb775..82e91c312a7 100644
--- a/engines/nancy/action/puzzle/raycastpuzzle.cpp
+++ b/engines/nancy/action/puzzle/raycastpuzzle.cpp
@@ -898,7 +898,7 @@ bool RaycastDeferredLoader::loadInner() {
case kInitDrawSurface : {
auto *viewportData = GetEngineData(VIEW);
assert(viewportData);
-
+
Common::Rect viewport = viewportData->bounds;
_owner.moveTo(viewport);
_owner._drawSurface.create(viewport.width(), viewport.height(), g_nancy->_graphics->getInputPixelFormat());
@@ -998,7 +998,7 @@ bool RaycastDeferredLoader::loadInner() {
if (_x >= _owner._mapFullWidth) {
_x = 0;
}
-
+
for (; _x < _owner._mapFullWidth && !shouldBreak; ++_x) {
uint32 wallMapVal = _owner._wallMap[_y * _owner._mapFullHeight + _x];
@@ -1052,7 +1052,7 @@ bool RaycastDeferredLoader::loadInner() {
}
}
- _owner.validateMap();
+ _owner.validateMap();
_isDone = true;
}
@@ -1144,7 +1144,7 @@ void RaycastPuzzle::handleInput(NancyInput &input) {
if (input.input & NancyInput::kRaycastMap) {
_map.setVisible(!_map.isVisible());
}
-
+
uint32 time = g_nancy->getTotalPlayTime();
uint32 deltaTime = time - _lastMovementTime;
_lastMovementTime = time;
@@ -1312,7 +1312,7 @@ void RaycastPuzzle::handleInput(NancyInput &input) {
// Make sure the player doesn't clip diagonally into a wall
// Improvement: in the original engine the player just gets stuck when hitting a corner;
- // instead, we move along smoothly
+ // instead, we move along smoothly
if (cellTopLeft && !cellLeft && !cellTop && (yCell < collisionSize) && (xCell < collisionSize)) {
if (yCell > xCell) {
newX = (((int32)newX) & 0xFF80) + collisionSize;
@@ -1486,7 +1486,7 @@ void RaycastPuzzle::createTextureLightSourcing(Common::Array<Graphics::ManagedSu
((uint16 *)(*array)[i].getPixels())[offset] = format.RGBToColor(r, g, b);
}
}
-
+
}
}
}
diff --git a/engines/nancy/action/puzzle/rippedletterpuzzle.cpp b/engines/nancy/action/puzzle/rippedletterpuzzle.cpp
index 709079357a3..26a9f3503ac 100644
--- a/engines/nancy/action/puzzle/rippedletterpuzzle.cpp
+++ b/engines/nancy/action/puzzle/rippedletterpuzzle.cpp
@@ -314,7 +314,7 @@ void RippedLetterPuzzle::handleInput(NancyInput &input) {
_pickedUpPiece._drawSurface.clear(g_nancy->_graphics->getTransColor());
_pickedUpPiece._drawSurface.blitFrom(_drawSurface, _destRects[i], Common::Point());
}
-
+
_pickedUpPiece.setVisible(true);
_pickedUpPiece.setTransparent(true);
_pickedUpPiece.pickUp();
@@ -355,7 +355,7 @@ void RippedLetterPuzzle::handleInput(NancyInput &input) {
_pickedUpPiece._drawSurface.clear(g_nancy->_graphics->getTransColor());
_pickedUpPiece._drawSurface.blitFrom(_drawSurface, _destRects[i], Common::Point());
}
-
+
_pickedUpPiece.setVisible(true);
_pickedUpPiece.setTransparent(true);
}
diff --git a/engines/nancy/action/puzzle/safedialpuzzle.cpp b/engines/nancy/action/puzzle/safedialpuzzle.cpp
index 91ef060c1bd..27484201211 100644
--- a/engines/nancy/action/puzzle/safedialpuzzle.cpp
+++ b/engines/nancy/action/puzzle/safedialpuzzle.cpp
@@ -195,7 +195,7 @@ void SafeDialPuzzle::execute() {
g_nancy->_sound->stopSound(_resetSound);
finishExecution();
-
+
break;
}
}
@@ -264,7 +264,7 @@ void SafeDialPuzzle::handleInput(NancyInput &input) {
if (g_nancy->_sound->isSoundPlaying(_selectSound) || _animState == kReset || _animState == kResetAnim || _nextAnim > g_nancy->getTotalPlayTime()) {
return;
}
-
+
if (NancySceneState.getViewport().convertViewportToScreen(_arrowDest).contains(input.mousePos)) {
g_nancy->_cursor->setCursorType(CursorManager::kHotspot);
@@ -292,7 +292,7 @@ void SafeDialPuzzle::handleInput(NancyInput &input) {
}
return;
- }
+ }
}
void SafeDialPuzzle::drawDialFrame(uint frame) {
diff --git a/engines/nancy/action/puzzle/setplayerclock.cpp b/engines/nancy/action/puzzle/setplayerclock.cpp
index fc5b0ef8122..e57f2fe92c9 100644
--- a/engines/nancy/action/puzzle/setplayerclock.cpp
+++ b/engines/nancy/action/puzzle/setplayerclock.cpp
@@ -169,7 +169,7 @@ void SetPlayerClock::execute() {
finishExecution();
}
}
-
+
} else {
// Cancel button pressed, go to exit scene
g_nancy->_sound->stopSound(_buttonSound);
diff --git a/engines/nancy/action/puzzle/spigotpuzzle.cpp b/engines/nancy/action/puzzle/spigotpuzzle.cpp
index b225bcdfdaa..79eaacf3857 100644
--- a/engines/nancy/action/puzzle/spigotpuzzle.cpp
+++ b/engines/nancy/action/puzzle/spigotpuzzle.cpp
@@ -108,7 +108,7 @@ void SpigotPuzzle::updateGraphics() {
g_nancy->_sound->playSound(_letterSound);
_drawSurface.blitFrom(_image, _letterSrcs[_animatingLetterID][_currentAnimOrder[_animatingLetterID]], _letterDests[_animatingLetterID]);
_needsRedraw = true;
-
+
--_frameID;
} else {
// Clear the number
@@ -205,7 +205,7 @@ void SpigotPuzzle::execute() {
g_nancy->_sound->loadSound(_buttonSound);
g_nancy->_sound->loadSound(_letterSound);
g_nancy->_sound->loadSound(_spigotSound);
-
+
_currentOrder = _startOrder;
_currentAnimOrder.resize(_currentOrder.size());
for (uint i = 0; i < _currentAnimOrder.size(); ++i) {
diff --git a/engines/nancy/action/puzzle/tangrampuzzle.cpp b/engines/nancy/action/puzzle/tangrampuzzle.cpp
index 7a7eb5542cd..e7bc5b2cc15 100644
--- a/engines/nancy/action/puzzle/tangrampuzzle.cpp
+++ b/engines/nancy/action/puzzle/tangrampuzzle.cpp
@@ -192,7 +192,7 @@ void TangramPuzzle::execute() {
g_nancy->_sound->stopSound(_rotateSound);
finishExecution();
-
+
break;
}
}
@@ -253,7 +253,7 @@ void TangramPuzzle::handleInput(NancyInput &input) {
g_nancy->_sound->playSound(_putDownSound);
return;
}
-
+
tileHolding.handleInput(input);
bool rotated = false;
@@ -315,7 +315,7 @@ void TangramPuzzle::pickUpTile(uint id) {
void TangramPuzzle::putDownTile(uint id) {
Tile &tile = _tiles[id];
_pickedUpTile = -1;
-
+
drawToBuffer(tile);
tile.putDown();
@@ -330,7 +330,7 @@ void TangramPuzzle::rotateTile(uint id) {
assert(id < _tiles.size() && id != 0);
Tile &tileToRotate = _tiles[id];
-
+
if (tileToRotate._rotation == 3) {
tileToRotate._rotation = 0;
} else {
@@ -346,7 +346,7 @@ void TangramPuzzle::rotateTile(uint id) {
} else {
tileToRotate.setHighlighted(false);
}
-
+
Common::Rect newPos = tileToRotate._drawSurface.getBounds();
newPos.moveTo(oldPos.left + oldPos.width() / 2 - newPos.width() / 2, oldPos.top + oldPos.height() / 2 - newPos.height() / 2);
tileToRotate.moveTo(newPos);
@@ -370,7 +370,7 @@ void TangramPuzzle::moveToTop(uint id) {
tile.registerGraphics();
}
}
-
+
_tiles[id].setZ(_z + _tiles.size());
_tiles[id].registerGraphics();
}
diff --git a/engines/nancy/action/puzzle/tangrampuzzle.h b/engines/nancy/action/puzzle/tangrampuzzle.h
index cd7d4149d3b..c067ced8ced 100644
--- a/engines/nancy/action/puzzle/tangrampuzzle.h
+++ b/engines/nancy/action/puzzle/tangrampuzzle.h
@@ -62,7 +62,7 @@ protected:
byte _id;
byte _rotation;
bool _isHighlighted;
-
+
protected:
bool isViewportRelative() const override { return true; }
};
diff --git a/engines/nancy/action/puzzle/telephone.cpp b/engines/nancy/action/puzzle/telephone.cpp
index 57e1a7bbd94..3c537b85ba5 100644
--- a/engines/nancy/action/puzzle/telephone.cpp
+++ b/engines/nancy/action/puzzle/telephone.cpp
@@ -75,7 +75,7 @@ void Telephone::readData(Common::SeekableReadStream &stream) {
if (_isNewPhone) {
readRect(stream, _dirHighlightSrc);
readRect(stream, _dialHighlightSrc);
-
+
_upDirButtonID = stream.readUint16LE();
_downDirButtonID = stream.readUint16LE();
_dialButtonID = stream.readUint16LE();
@@ -110,11 +110,11 @@ void Telephone::readData(Common::SeekableReadStream &stream) {
} else {
_dialAgainSound.readNormal(stream);
}
-
+
stream.read(textBuf, 200);
textBuf[199] = '\0';
_dialAgainString = textBuf;
-
+
_reloadScene.readData(stream);
stream.skip(1);
_exitScene.readData(stream);
@@ -144,7 +144,7 @@ void Telephone::readData(Common::SeekableReadStream &stream) {
} else {
readRect(stream, call.displaySrc);
}
-
+
call.sceneChange.readData(stream);
stream.skip(1);
}
@@ -245,7 +245,7 @@ void Telephone::execute() {
NancySceneState.getTextbox().clear();
NancySceneState.getTextbox().addTextLine(g_nancy->getStaticData().ringingText);
}
-
+
g_nancy->_sound->loadSound(_ringSound);
g_nancy->_sound->playSound(_ringSound);
}
@@ -286,7 +286,7 @@ void Telephone::execute() {
// Old phone, go directly to call
NancySceneState.getTextbox().clear();
NancySceneState.getTextbox().addTextLine(_calls[_selected].text);
-
+
_genericDialogueSound.name = _calls[_selected].soundName;
g_nancy->_sound->loadSound(_genericDialogueSound);
g_nancy->_sound->playSound(_genericDialogueSound);
@@ -331,7 +331,7 @@ void Telephone::execute() {
NancySceneState.getTextbox().clear();
NancySceneState.getTextbox().addTextLine(_calls[_selected].text);
}
-
+
_genericDialogueSound.name = _calls[_selected].soundName;
g_nancy->_sound->loadSound(_genericDialogueSound);
g_nancy->_sound->playSound(_genericDialogueSound);
@@ -496,7 +496,7 @@ void Telephone::handleInput(NancyInput &input) {
if (_calledNumber.size() > 11) {
_calledNumber.clear();
-
+
if (_hasDisplay) {
_drawSurface.fillRect(_displayDest, _drawSurface.getTransparentColor());
} else if (_isNewPhone) {
@@ -550,7 +550,7 @@ void Telephone::handleInput(NancyInput &input) {
_displayedDirectory += dirEntryDelta;
} while (_displayedDirectory != start);
}
-
+
_genericButtonSound.name = _buttonSoundNames[buttonNr];
g_nancy->_sound->loadSound(_genericButtonSound);
g_nancy->_sound->playSound(_genericButtonSound);
diff --git a/engines/nancy/action/puzzle/turningpuzzle.cpp b/engines/nancy/action/puzzle/turningpuzzle.cpp
index 301d1363b70..c9574bc46a1 100644
--- a/engines/nancy/action/puzzle/turningpuzzle.cpp
+++ b/engines/nancy/action/puzzle/turningpuzzle.cpp
@@ -73,7 +73,7 @@ void TurningPuzzle::updateGraphics() {
drawObject(i, faceID, _turnFrameID);
}
-
+
if ((int)_solveAnimFace >= _numFaces - 1) {
_solveAnimFace = 0;
++_solveAnimLoop;
@@ -94,7 +94,7 @@ void TurningPuzzle::updateGraphics() {
if (g_nancy->getTotalPlayTime() > _nextTurnTime) {
_nextTurnTime = g_nancy->getTotalPlayTime() + (_solveDelayBetweenTurns * 1000 / _currentOrder.size());
++_turnFrameID;
-
+
uint faceID = _currentOrder[_objectCurrentlyTurning];
uint frameID = _turnFrameID;
@@ -132,7 +132,7 @@ void TurningPuzzle::readData(Common::SeekableReadStream &stream) {
uint numSpindles = stream.readUint16LE();
_numFaces = stream.readUint16LE();
_numFramesPerTurn = stream.readUint16LE();
-
+
_startPositions.resize(numSpindles);
for (uint i = 0; i < numSpindles; ++i) {
_startPositions[i] = stream.readUint16LE();
@@ -148,7 +148,7 @@ void TurningPuzzle::readData(Common::SeekableReadStream &stream) {
_startPos.y = stream.readSint32LE();
_srcIncrement.x = stream.readSint16LE();
_srcIncrement.y = stream.readSint16LE();
-
+
_links.resize(numSpindles);
for (uint i = 0; i < numSpindles; ++i) {
for (uint j = 0; j < 4; ++j) {
@@ -236,7 +236,7 @@ void TurningPuzzle::execute() {
NancySceneState.setEventFlag(_solveScene._flag);
_solveState = kWaitForSound;
}
-
+
return;
case kWaitForSound :
if (g_nancy->_sound->isSoundPlaying(_solveSound) || g_nancy->_sound->isSoundPlaying(_turnSound)) {
@@ -278,7 +278,7 @@ void TurningPuzzle::handleInput(NancyInput &input) {
g_nancy->_sound->playSound(_turnSound);
_objectCurrentlyTurning = i;
}
-
+
// fixes nancy4 scene 4308
input.eatMouseInput();
@@ -293,7 +293,7 @@ void TurningPuzzle::drawObject(uint objectID, uint faceID, uint frameID) {
Common::Point inc(_srcIncrement.x == 1 ? srcRect.width() : _srcIncrement.x, _srcIncrement.y == -2 ? srcRect.height() : _srcIncrement.y);
srcRect.translate( inc.x * frameID + inc.x * _numFramesPerTurn * faceID,
_separateRows ? inc.y * objectID : 0);
-
+
_drawSurface.blitFrom(_image, srcRect, _destRects[objectID]);
_needsRedraw = true;
}
diff --git a/engines/nancy/action/puzzle/twodialpuzzle.cpp b/engines/nancy/action/puzzle/twodialpuzzle.cpp
index b0b4cfb73d2..8b74dbbf96e 100644
--- a/engines/nancy/action/puzzle/twodialpuzzle.cpp
+++ b/engines/nancy/action/puzzle/twodialpuzzle.cpp
@@ -99,7 +99,7 @@ void TwoDialPuzzle::execute() {
if (g_nancy->_sound->isSoundPlaying(_rotateSounds[0]) || g_nancy->_sound->isSoundPlaying(_rotateSounds[1])) {
return;
}
-
+
if ((uint)_currentPositions[0] == _correctPositions[0] && (uint)_currentPositions[1] == _correctPositions[1]) {
_state = kActionTrigger;
_isSolved = true;
@@ -156,7 +156,7 @@ void TwoDialPuzzle::handleInput(NancyInput &input) {
if (canClick && input.input & NancyInput::kLeftMouseButtonUp) {
_currentPositions[i] += _isClockwise[i] ? -1 : 1;
-
+
if (_currentPositions[i] < 0) {
_currentPositions[i] = _srcs[i].size() - 1;
} else if ((uint)_currentPositions[i] >= _srcs[i].size()) {
diff --git a/engines/nancy/action/soundrecords.h b/engines/nancy/action/soundrecords.h
index d3ab18868c6..85762a8eaf6 100644
--- a/engines/nancy/action/soundrecords.h
+++ b/engines/nancy/action/soundrecords.h
@@ -47,7 +47,7 @@ class PlaySound : public ActionRecord {
public:
PlaySound() {}
~PlaySound() { delete _soundEffect; }
-
+
void readData(Common::SeekableReadStream &stream) override;
void execute() override;
@@ -165,7 +165,7 @@ public:
uint _selectedSound = 0;
protected:
- Common::String getRecordTypeName() const override { return "PlayRandomSoundTerse"; }
+ Common::String getRecordTypeName() const override { return "PlayRandomSoundTerse"; }
};
// Same as PlaySound, except it discards the filename provided in the data.
diff --git a/engines/nancy/cif.cpp b/engines/nancy/cif.cpp
index 7c46bb511cc..6c570625cd3 100644
--- a/engines/nancy/cif.cpp
+++ b/engines/nancy/cif.cpp
@@ -39,7 +39,7 @@ static void syncCifInfo(Common::Serializer &ser, CifInfo &info, bool tree) {
readRect(ser, info.src, kGameTypeNancy2);
readRect(ser, info.dest, kGameTypeNancy2);
ser.setVersion(ver);
-
+
ser.syncAsUint16LE(info.width);
ser.syncAsUint16LE(info.pitch);
ser.syncAsUint16LE(info.height);
@@ -70,7 +70,7 @@ static void syncCiftreeInfo(Common::Serializer &ser, CifInfo &info) {
memcpy(name, info.name.toString('/').c_str(), nameSize);
name[nameSize] = 0;
}
-
+
ser.syncBytes(name, nameSize);
name[nameSize] = 0;
info.name = (char *)name;
@@ -124,14 +124,14 @@ Common::SeekableReadStream *CifFile::createReadStream() const {
success = false;
}
}
-
+
if (!success) {
warning("Failed to read data for CifFile '%s'", _info.name.toString().c_str());
delete[] buf;
_stream->clearErr();
return nullptr;
}
-
+
return new Common::MemoryReadStream(buf, _info.size, DisposeAfterUse::YES);
}
@@ -142,7 +142,7 @@ Common::SeekableReadStream *CifFile::createReadStreamRaw() const {
if (!_stream->seek(_info.dataOffset) || _stream->read(buf, size) < size) {
warning("Failed to read data for CifFile '%s'", _info.name.toString().c_str());
}
-
+
return new Common::MemoryReadStream(buf, size, DisposeAfterUse::YES);
}
@@ -234,14 +234,14 @@ Common::SeekableReadStream *CifTree::createReadStreamForMember(const Common::Pat
success = false;
}
}
-
+
if (!success) {
warning("Failed to read data for '%s' from CifTree '%s'", info.name.toString().c_str(), _name.toString().c_str());
delete[] buf;
_stream->clearErr();
return nullptr;
}
-
+
return new Common::MemoryReadStream(buf, info.size, DisposeAfterUse::YES);
}
@@ -257,7 +257,7 @@ Common::SeekableReadStream *CifTree::createReadStreamRaw(const Common::Path &pat
if (!_stream->seek(info.dataOffset) || _stream->read(buf, size) < size) {
warning("Failed to read data for '%s' from CifTree '%s'", info.name.toString().c_str(), _name.toString().c_str());
}
-
+
return new Common::MemoryReadStream(buf, size, DisposeAfterUse::YES);
}
@@ -306,7 +306,7 @@ bool CifTree::sync(Common::Serializer &ser) {
if (g_nancy->getGameType() >= kGameTypeNancy6) {
++ver; // nancy6 made changes to the CifTree structure, but didn't bump the file version
}
-
+
ser.setVersion(ver);
uint16 infoBlockCount = _writeFileMap.size();
@@ -325,7 +325,7 @@ bool CifTree::sync(Common::Serializer &ser) {
}
} else {
syncCiftreeInfo(ser, _writeFileMap[i]);
- }
+ }
}
return true;
@@ -344,7 +344,7 @@ bool PatchTree::hasFile(const Common::Path &path) const {
bool satisfied = true;
for (uint i = 0; i < confManProps.size(); ++i) {
- // Check all
+ // Check all
if (ConfMan.get(confManProps[i].first, ConfMan.getActiveDomainName()) != confManProps[i].second) {
satisfied = false;
break;
diff --git a/engines/nancy/commontypes.cpp b/engines/nancy/commontypes.cpp
index a573f18b423..3cb6f2b0ee5 100644
--- a/engines/nancy/commontypes.cpp
+++ b/engines/nancy/commontypes.cpp
@@ -95,7 +95,7 @@ void HotspotDescription::readData(Common::SeekableReadStream &stream) {
void FrameBlitDescription::readData(Common::SeekableReadStream &stream, bool longFormat) {
frameID = stream.readUint16LE();
-
+
if (longFormat) {
// In static mode Overlays, this is the id of the _srcRect to be used
staticRectID = stream.readUint16LE();
@@ -178,7 +178,7 @@ void SoundDescription::readNormal(Common::SeekableReadStream &stream) {
s.skip(2, kGameTypeVampire, kGameTypeNancy2);
s.syncAsUint32LE(numLoops);
-
+
s.skip(2, kGameTypeVampire, kGameTypeNancy2);
s.syncAsUint16LE(volume);
@@ -389,7 +389,7 @@ void StaticData::readData(Common::SeekableReadStream &stream, Common::Language l
numCursorTypes /= (g_nancy->getGameType() == kGameTypeVampire ? 2 : 3);
stream.skip(2);
}
-
+
logoEndAfter = stream.readUint32LE();
if (minorVersion == 1) {
wonGameFlagID = stream.readUint16LE();
@@ -409,7 +409,7 @@ void StaticData::readData(Common::SeekableReadStream &stream, Common::Language l
soundChannelInfo.readData(stream);
break;
- case MKTAG('L', 'A', 'N', 'G') :
+ case MKTAG('L', 'A', 'N', 'G') :
// Order of languages inside game data
num = stream.readUint16LE();
languageID = -1;
diff --git a/engines/nancy/commontypes.h b/engines/nancy/commontypes.h
index fdc5c0be905..34b6ad43328 100644
--- a/engines/nancy/commontypes.h
+++ b/engines/nancy/commontypes.h
@@ -313,7 +313,7 @@ struct SoundChannelInfo {
Common::Array<byte> speechChannels;
Common::Array<byte> musicChannels;
Common::Array<byte> sfxChannels;
-
+
void readData(Common::SeekableReadStream &stream);
};
diff --git a/engines/nancy/console.cpp b/engines/nancy/console.cpp
index b1cb70bdb11..b17ed36c6aa 100644
--- a/engines/nancy/console.cpp
+++ b/engines/nancy/console.cpp
@@ -699,7 +699,7 @@ bool NancyConsole::Cmd_scanForActionRecordType(int argc, const char **argv) {
} else {
vals.push_back(insertVal + 0x32);
}
-
+
} else {
debugPrintf("Invalid input: %s\n", argv[i]);
return true;
@@ -879,7 +879,7 @@ bool NancyConsole::Cmd_getInventory(int argc, const char **argv) {
bool NancyConsole::Cmd_setInventory(int argc, const char **argv) {
auto *inventoryData = GetEngineData(INV);
assert(inventoryData);
-
+
if (g_nancy->_gameFlow.curState != NancyState::kScene) {
debugPrintf("Not in the kScene state\n");
return true;
@@ -1010,7 +1010,7 @@ bool NancyConsole::Cmd_soundInfo(int argc, const char **argv) {
Common::Array<byte> channelIDs;
if (argc == 1) {
debugPrintf("Currently playing sounds:\n\n");
-
+
for (uint i = 0; i < g_nancy->getStaticData().soundChannelInfo.numChannels; ++i) {
channelIDs.push_back(i);
}
@@ -1027,7 +1027,7 @@ bool NancyConsole::Cmd_soundInfo(int argc, const char **argv) {
debugPrintf("Channel %u, filename %s\n", channelID, chan.name.c_str());
debugPrintf("Source rate %i, playing at %i\n", chan.stream->getRate(), g_nancy->_sound->_mixer->getChannelRate(chan.handle));
debugPrintf("Volume: %u, pan: %i, numLoops: %u\n\n", chan.volume, g_nancy->_sound->_mixer->getChannelBalance(chan.handle), chan.numLoops);
-
+
if (chan.playCommands != SoundManager::kPlaySequential) {
debugPrintf("\tPlay commands 0x%08x\n", chan.playCommands);
diff --git a/engines/nancy/cursor.cpp b/engines/nancy/cursor.cpp
index 058aef34cf8..f83367a0dd2 100644
--- a/engines/nancy/cursor.cpp
+++ b/engines/nancy/cursor.cpp
@@ -60,7 +60,7 @@ void CursorManager::init(Common::SeekableReadStream *chunkStream) {
// The only frame cursors used are the first two: the classic arrow cursor, and its hotspot variant, which is slightly shorter
// The same applies to the menu cursors; however, we completely ignore those (technically the arrow cursor has sliiiiightly
// different shading from the one in the frame array, but I don't care enough to implement it).
-
+
// Following those are the ITEM arrays; these cursors are used to indicate that the player is holding an item.
// Their number is the same as the number of items described in INV, and their size is also _numCursorTypes.
// Out of those arrays, the only cursors that get used are the kNormal and kHotspot ones. The first few games also
@@ -138,7 +138,7 @@ void CursorManager::setCursor(CursorType type, int16 itemID) {
_curCursorID = kInvertedRotateLeft;
return;
}
-
+
// fall through
case kRotateLeft:
// Only valid for nancy6 and up
diff --git a/engines/nancy/enginedata.cpp b/engines/nancy/enginedata.cpp
index 4d253fada34..9de80e91e77 100644
--- a/engines/nancy/enginedata.cpp
+++ b/engines/nancy/enginedata.cpp
@@ -64,7 +64,7 @@ BSUM::BSUM(Common::SeekableReadStream *chunkStream) : EngineData(chunkStream) {
// Parner logos were introduced with nancy4, but at least one nancy3 release
// had one as well. For some reason they didn't port over the code from the
// later games, but implemented it the same way the other BSUM images work.
- // Hence, we skip an extra byte indicating the number of partner logos.
+ // Hence, we skip an extra byte indicating the number of partner logos.
s.skip(1);
}
@@ -408,7 +408,7 @@ SET::SET(Common::SeekableReadStream *chunkStream) : EngineData(chunkStream) {
if (g_nancy->getGameType() >= kGameTypeNancy2) {
readRect(*chunkStream, _doneButtonHighlightSrc);
}
-
+
readRectArray(*chunkStream, _scrollbarSrcs, 3);
_scrollbarsCenterYPos.resize(3);
@@ -514,7 +514,7 @@ LOAD_v2::LOAD_v2(Common::SeekableReadStream *chunkStream) :
_highlightFontID = chunkStream->readSint16LE();
_fontXOffset = chunkStream->readSint16LE();
_fontYOffset = chunkStream->readSint16LE();
-
+
chunkStream->skip(16); // src rect for dash in font
_blinkingTimeDelay = chunkStream->readUint16LE();
diff --git a/engines/nancy/enginedata.h b/engines/nancy/enginedata.h
index 627a7ba0e61..600c80dae31 100644
--- a/engines/nancy/enginedata.h
+++ b/engines/nancy/enginedata.h
@@ -255,7 +255,7 @@ struct SET : public EngineData {
Common::Array<SoundDescription> _sounds;
};
-// Contains data for the Save/Load screen. Used up to nancy7
+// Contains data for the Save/Load screen. Used up to nancy7
struct LOAD : public EngineData {
LOAD(Common::SeekableReadStream *chunkStream);
@@ -297,7 +297,7 @@ struct LOAD : public EngineData {
// Common::Rect _gameSavedBounds
};
-// Contains data for the new Save/Load screen. Used in nancy8 and up
+// Contains data for the new Save/Load screen. Used in nancy8 and up
struct LOAD_v2 : public EngineData {
LOAD_v2(Common::SeekableReadStream *chunkStream);
@@ -329,7 +329,7 @@ struct LOAD_v2 : public EngineData {
struct SDLG : public EngineData {
struct Dialog {
Dialog(Common::SeekableReadStream *chunkStream);
-
+
Common::Path imageName;
Common::Rect yesDest;
@@ -472,7 +472,7 @@ struct ImageChunk : public EngineData {
// Contains text data. Every string is tagged with a key via which
// it can be accessed. Used to store dialogue and journal (autotext) strings.
// NOT found inside BOOT; these are stored in their own cifs, the names of which
-// can be found inside BSUM. Introduced in nancy6.
+// can be found inside BSUM. Introduced in nancy6.
struct CVTX : public EngineData {
CVTX(Common::SeekableReadStream *chunkStream);
diff --git a/engines/nancy/input.cpp b/engines/nancy/input.cpp
index a02b17d62fd..92e5a0a869e 100644
--- a/engines/nancy/input.cpp
+++ b/engines/nancy/input.cpp
@@ -229,7 +229,7 @@ void InputManager::initKeymaps(Common::KeymapArray &keymaps, const char *target)
mainKeymap->addAction(act);
keymaps.push_back(mainKeymap);
-
+
if (gameId == "nancy3" || gameId == "nancy6") {
Keymap *mazeKeymap = new Keymap(Keymap::kKeymapTypeGame, _mazeKeymapID, _("Nancy Drew - Maze"));
diff --git a/engines/nancy/misc/hypertext.cpp b/engines/nancy/misc/hypertext.cpp
index 535be263920..d239973151d 100644
--- a/engines/nancy/misc/hypertext.cpp
+++ b/engines/nancy/misc/hypertext.cpp
@@ -101,7 +101,7 @@ void HypertextParser::drawAllText(const Common::Rect &textBounds, uint leftOffse
if (curToken.size() != 1) {
break;
}
-
+
continue;
case 'e' :
// End conversation. Originally used for quickly ending dialogue when debugging, but
@@ -165,7 +165,7 @@ void HypertextParser::drawAllText(const Common::Rect &textBounds, uint leftOffse
if (curToken.size() != 2) {
break;
}
-
+
metaInfo.push({MetaInfo::kColor, numNonSpaceChars, (byte)(curToken[1] - '0')});
continue;
case 'f' :
@@ -209,7 +209,7 @@ void HypertextParser::drawAllText(const Common::Rect &textBounds, uint leftOffse
currentLine += curToken;
}
-
+
font = g_nancy->_graphics->getFont(curFontID);
highlightFont = g_nancy->_graphics->getFont(highlightFontID);
assert(font && highlightFont);
@@ -310,7 +310,7 @@ void HypertextParser::drawAllText(const Common::Rect &textBounds, uint leftOffse
Common::Rect markSrc = mark->_markSrcs[change.index];
Common::Rect markDest = markSrc;
markDest.moveTo(textBounds.left + horizontalOffset + (newLineStart ? 0 : leftOffsetNonNewline) + 1,
- lineNumber == 0 ?
+ lineNumber == 0 ?
textBounds.top - ((font->getFontHeight() + 1) / 2) + _imageVerticalOffset + 4 :
textBounds.top + _numDrawnLines * font->getFontHeight() + _imageVerticalOffset - 4);
@@ -385,7 +385,7 @@ void HypertextParser::drawAllText(const Common::Rect &textBounds, uint leftOffse
++totalCharsDrawn;
}
}
-
+
// Add to the width/height of the hotspot
if (hasHotspot) {
hotspot.setWidth(MAX<int16>(hotspot.width(), font->getStringWidth(stringToDraw)));
@@ -451,7 +451,7 @@ void HypertextParser::drawAllText(const Common::Rect &textBounds, uint leftOffse
_drawnTextHeight += font->getFontHeight();
}
- // Add a line's height at end of text to replicate original behavior
+ // Add a line's height at end of text to replicate original behavior
if (font) {
_drawnTextHeight += font->getFontHeight();
}
diff --git a/engines/nancy/misc/mousefollow.cpp b/engines/nancy/misc/mousefollow.cpp
index cdcc6757478..6ccbe20b533 100644
--- a/engines/nancy/misc/mousefollow.cpp
+++ b/engines/nancy/misc/mousefollow.cpp
@@ -27,7 +27,7 @@
namespace Nancy {
namespace Misc {
-MouseFollowObject::MouseFollowObject()
+MouseFollowObject::MouseFollowObject()
: RenderObject(8) {
_viewportData = GetEngineData(VIEW);
}
diff --git a/engines/nancy/misc/mousefollow.h b/engines/nancy/misc/mousefollow.h
index 197b1f720cb..3d1289b345c 100644
--- a/engines/nancy/misc/mousefollow.h
+++ b/engines/nancy/misc/mousefollow.h
@@ -43,7 +43,7 @@ class MouseFollowObject : public RenderObject {
public:
MouseFollowObject();
virtual ~MouseFollowObject() {}
-
+
virtual void pickUp() { _isPickedUp = true; }
virtual void putDown() { _isPickedUp = false; }
@@ -56,7 +56,7 @@ protected:
bool _isPickedUp = false;
byte _rotation = 0;
- const VIEW *_viewportData = nullptr;
+ const VIEW *_viewportData = nullptr;
};
} // End of namespace Misc
diff --git a/engines/nancy/misc/specialeffect.cpp b/engines/nancy/misc/specialeffect.cpp
index 3ee199e23cb..6908a0f52d0 100644
--- a/engines/nancy/misc/specialeffect.cpp
+++ b/engines/nancy/misc/specialeffect.cpp
@@ -39,7 +39,7 @@ void SpecialEffect::init() {
// We use the type definitions in nancy7, which are 1-indexed
++_type;
}
-
+
// nancy7 got rid of the SPEC chunk, and the data now contains the total amount of time
// that the effect should run for instead.
if (_rect.isEmpty()) {
@@ -49,7 +49,7 @@ void SpecialEffect::init() {
} else {
const VIEW *viewportData = (const VIEW *)g_nancy->getEngineData("VIEW");
assert(viewportData);
-
+
_rect = viewportData->screenPosition;
}
}
diff --git a/engines/nancy/misc/specialeffect.h b/engines/nancy/misc/specialeffect.h
index 75ba696ee60..3992261ad38 100644
--- a/engines/nancy/misc/specialeffect.h
+++ b/engines/nancy/misc/specialeffect.h
@@ -42,7 +42,7 @@ public:
_type(type),
_fadeToBlackTime(fadeToBlackTime),
_frameTime(frameTime) {}
-
+
SpecialEffect(byte type, uint32 totalTime, uint16 fadeToBlackTime, Common::Rect rect) :
RenderObject(16),
_type(type),
diff --git a/engines/nancy/nancy.cpp b/engines/nancy/nancy.cpp
index ab9cebef5e4..c344e6d88af 100644
--- a/engines/nancy/nancy.cpp
+++ b/engines/nancy/nancy.cpp
@@ -254,7 +254,7 @@ void NancyEngine::addDeferredLoader(Common::SharedPtr<DeferredLoader> &loaderPtr
Common::Error NancyEngine::run() {
setDebugger(new NancyConsole());
-
+
// Set the default number of saves for earlier games
if (!ConfMan.hasKey("nancy_max_saves", ConfMan.getActiveDomainName())) {
if (getGameType() <= kGameTypeNancy7) {
diff --git a/engines/nancy/puzzledata.h b/engines/nancy/puzzledata.h
index 672ce77b478..a49113780b1 100644
--- a/engines/nancy/puzzledata.h
+++ b/engines/nancy/puzzledata.h
@@ -141,7 +141,7 @@ struct TableData : public PuzzleData {
void setSingleValue(uint16 index, int16 value);
int16 getSingleValue(uint16 index) const;
-
+
void setComboValue(uint16 index, float value);
float getComboValue(uint16 index) const;
diff --git a/engines/nancy/resource.cpp b/engines/nancy/resource.cpp
index 663eca3dde1..98e94087b32 100644
--- a/engines/nancy/resource.cpp
+++ b/engines/nancy/resource.cpp
@@ -65,7 +65,7 @@ bool ResourceManager::loadImage(const Common::Path &name, Graphics::ManagedSurfa
return true;
}
}
-
+
CifInfo info;
Common::SeekableReadStream *stream = nullptr;
@@ -85,7 +85,7 @@ bool ResourceManager::loadImage(const Common::Path &name, Graphics::ManagedSurfa
// .cifs/ciftrees were introduced with nancy1. We also don't need to flip endianness, since the BMP decoder should handle that by itself
return false;
}
-
+
// Check for loose .cif images. This bypasses tree search even with a provided treeName
if (!stream) {
stream = SearchMan.createReadStreamForMember(name.append(".cif"));
@@ -201,7 +201,7 @@ IFF *ResourceManager::loadIFF(const Common::Path &name) {
if (stream) {
return new IFF(stream);
}
-
+
return nullptr;
}
diff --git a/engines/nancy/resource.h b/engines/nancy/resource.h
index d5c242ad39b..70e460c814d 100644
--- a/engines/nancy/resource.h
+++ b/engines/nancy/resource.h
@@ -44,7 +44,7 @@ public:
// Ciftree images may have additional data dictating how they need to be blitted on screen (see ConversationCel).
// This is accessed via the outSrc/outDest parameters.
bool loadImage(const Common::Path &name, Graphics::ManagedSurface &surf, const Common::String &treeName = Common::String(), Common::Rect *outSrc = nullptr, Common::Rect *outDest = nullptr);
-
+
// Loads a single IFF file. These can either be inside standalone .cif files, or embedded inside a ciftree
IFF *loadIFF(const Common::Path &name);
diff --git a/engines/nancy/sound.cpp b/engines/nancy/sound.cpp
index bdbac095a46..da9eb4b4d1b 100644
--- a/engines/nancy/sound.cpp
+++ b/engines/nancy/sound.cpp
@@ -324,7 +324,7 @@ void SoundManager::playSound(uint16 channelID) {
// Init 3D sound
if (chan.playCommands & ~kPlaySequential && chan.effectData) {
uint16 playCommands = chan.playCommands;
-
+
if (playCommands & kPlayRandomPosition) {
auto *rand = g_nancy->_randomSource;
chan.position.set(
@@ -351,12 +351,12 @@ void SoundManager::playSound(uint16 channelID) {
rand->getRandomNumberRngSigned(chan.effectData->randomMoveMinX, chan.effectData->randomMoveMaxX),
rand->getRandomNumberRngSigned(chan.effectData->randomMoveMinY, chan.effectData->randomMoveMaxY),
rand->getRandomNumberRngSigned(chan.effectData->randomMoveMinZ, chan.effectData->randomMoveMaxZ));
-
+
chan.positionDelta.set(
rand->getRandomNumberRngSigned(chan.effectData->randomMoveMinX, chan.effectData->randomMoveMaxX),
rand->getRandomNumberRngSigned(chan.effectData->randomMoveMinY, chan.effectData->randomMoveMaxY),
rand->getRandomNumberRngSigned(chan.effectData->randomMoveMinZ, chan.effectData->randomMoveMaxZ));
-
+
chan.positionDelta -= chan.position;
chan.positionDelta /= chan.effectData->numMoveSteps;
chan.nextStepTime = g_nancy->getTotalPlayTime() + chan.effectData->moveStepTime;
@@ -502,7 +502,7 @@ byte SoundManager::getVolume(const SoundDescription &description) {
if (description.name != "NO SOUND") {
return getVolume(description.channelID);
}
-
+
return 0;
}
@@ -530,7 +530,7 @@ void SoundManager::setVolume(const Common::String &chunkName, uint16 volume) {
uint32 SoundManager::getRate(uint16 channelID) {
if (channelID >= _channels.size())
return 0;
-
+
return _mixer->getChannelRate(_channels[channelID].handle);
}
@@ -549,7 +549,7 @@ uint32 SoundManager::getRate(const Common::String &chunkName) {
uint32 SoundManager::getBaseRate(uint16 channelID) {
if (channelID >= _channels.size() || !_channels[channelID].stream)
return 0;
-
+
return _channels[channelID].stream->getRate();
}
@@ -621,7 +621,7 @@ void SoundManager::recalculateSoundEffects() {
quat.transform(rotatedFrontVector);
_orientation = rotatedFrontVector;
-
+
for (uint i = 0; i < 3; ++i) {
if (abs(_orientation.getValue(i)) < Math::epsilon) {
_orientation.setValue(i, 0);
@@ -737,7 +737,7 @@ void SoundManager::soundEffectMaintenance(uint16 channelID, bool force) {
channelID,
chan.volume * 255 / 100,
0, DisposeAfterUse::NO);
-
+
--chan.numLoops;
chan.nextRepeatTime = 0;
}
@@ -762,7 +762,7 @@ void SoundManager::soundEffectMaintenance(uint16 channelID, bool force) {
case kRotateAroundZ:
quat = Math::Quaternion::zAxis(360.0 / chan.effectData->numMoveSteps);
break;
- }
+ }
quat.transform(chan.position);
} else {
@@ -776,7 +776,7 @@ void SoundManager::soundEffectMaintenance(uint16 channelID, bool force) {
if (!State::Scene::hasInstance() || (!_shouldRecalculate && !hasStepped && _positionLerp == 0)) {
return;
}
-
+
uint16 viewportFrameID = NancySceneState.getSceneInfo().frameID;
// Old panning algorithm, used in The Vampire Diaries
@@ -834,7 +834,7 @@ void SoundManager::soundEffectMaintenance(uint16 channelID, bool force) {
if (g_nancy->getGameType() >= 3 && chan.effectData &&
(chan.playCommands & ~kPlaySequential) & (kPlaySequentialFrameAnchor | kPlayRandomPosition | kPlayMoveLinear)) {
- // Interpolate position when we've changed scenes
+ // Interpolate position when we've changed scenes
Math::Vector3d listenerPos = Math::Vector3d::interpolate(_position, NancySceneState.getSceneSummary().listenerPosition, (float)_positionLerp / 10.0);
float dist = listenerPos.getDistanceTo(chan.position);
float volume;
diff --git a/engines/nancy/sound.h b/engines/nancy/sound.h
index a7e10da3ec3..1121b593a4c 100644
--- a/engines/nancy/sound.h
+++ b/engines/nancy/sound.h
@@ -45,7 +45,7 @@ class SoundManager {
friend class NancyConsole;
public:
// Settings for playing a sound, used in nancy3 and up
- // Older versions had a different, non-bitflag enum, but testing
+ // Older versions had a different, non-bitflag enum, but testing
// indicates those were never actually implemented
enum PlayCommandFlags {
kPlaySequential = 0x0001, // Play normally
@@ -59,7 +59,7 @@ public:
kPlayMoveCircular = 0x0300, // Move sound position in a circular direction (see SoundRotationAxis)
kPlayRandomMove = 0x0500 // Move along random vector. Does not combine with kPlayMoveCircular
};
-
+
SoundManager();
~SoundManager();
diff --git a/engines/nancy/state/credits.h b/engines/nancy/state/credits.h
index a2eae4d6032..ae179a00ce5 100644
--- a/engines/nancy/state/credits.h
+++ b/engines/nancy/state/credits.h
@@ -52,7 +52,7 @@ protected:
void drawTextSurface(uint id);
const CRED *_creditsData;
-
+
State _state;
UI::FullScreenImage _background;
RenderObject _textSurface;
diff --git a/engines/nancy/state/help.cpp b/engines/nancy/state/help.cpp
index 79f9a105195..3ad26e591dc 100644
--- a/engines/nancy/state/help.cpp
+++ b/engines/nancy/state/help.cpp
@@ -82,7 +82,7 @@ bool Help::onStateExit(const NancyState::NancyState nextState) {
void Help::init() {
auto *helpData = GetEngineData(HELP);
assert(helpData);
-
+
_image.init(helpData->imageName);
_button = new UI::Button(5, _image._drawSurface, helpData->buttonSrc, helpData->buttonDest, helpData->buttonHoverSrc);
diff --git a/engines/nancy/state/loadsave.cpp b/engines/nancy/state/loadsave.cpp
index eb463877429..e48099c9515 100644
--- a/engines/nancy/state/loadsave.cpp
+++ b/engines/nancy/state/loadsave.cpp
@@ -229,7 +229,7 @@ void LoadSaveMenu::init() {
_cancelButton = new UI::Button(3, _background._drawSurface,
_loadSaveData->_cancelButtonDownSrc, Common::Rect(),
_loadSaveData->_cancelButtonHighlightSrc, _loadSaveData->_cancelButtonDisabledSrc);
-
+
// Load the blinking cursor graphic that appears while typing a filename
_blinkingCursorOverlay._drawSurface.create(_loadSaveData->_blinkingCursorSrc.width(),
_loadSaveData->_blinkingCursorSrc.height(),
@@ -245,7 +245,7 @@ void LoadSaveMenu::init() {
g_nancy->_resource->loadImage(_loadSaveData->_gameSavedPopup, _successOverlay._drawSurface);
Common::Rect destBounds = Common::Rect(0,0, _successOverlay._drawSurface.w, _successOverlay._drawSurface.h);
destBounds.moveTo(640 / 2 - destBounds.width() / 2,
- 480 / 2 - destBounds.height() / 2);
+ 480 / 2 - destBounds.height() / 2);
_successOverlay.moveTo(destBounds);
_successOverlay.setVisible(false);
}
@@ -282,7 +282,7 @@ void LoadSaveMenu::run() {
_exitButton->setDisabled(false);
_enteredString.clear();
_successOverlay.setVisible(false);
-
+
_selectedSave = -1;
_enteringNewState = false;
}
@@ -305,7 +305,7 @@ void LoadSaveMenu::run() {
g_nancy->_sound->playSound("BUDE");
_enteringNewState = true;
}
-
+
return;
}
}
@@ -325,7 +325,7 @@ void LoadSaveMenu::run() {
g_nancy->_sound->playSound("BUDE");
_enteringNewState = true;
}
-
+
return;
}
}
@@ -441,7 +441,7 @@ void LoadSaveMenu::enterFilename() {
_blinkingCursorOverlay.moveTo(Common::Point(tbPosition.left + textWidthInPixels,
tbPosition.bottom - _blinkingCursorOverlay._drawSurface.h + _loadSaveData->_fontYOffset));
}
-
+
_cancelButton->handleInput(input);
if (_cancelButton->_isClicked) {
_state = kRun;
@@ -497,7 +497,7 @@ void LoadSaveMenu::save() {
}
}
}
-
+
// Improvement: not providing a name doesn't result in the
// savefile being named "--- Empty ---" or "Nothing Saved Here".
// Instead, we use ScummVM's built-in save name generator
@@ -524,7 +524,7 @@ void LoadSaveMenu::save() {
}
}
}
-
+
finalDesc = _loadSaveData->_defaultSaveNamePrefix + ('0' + suffixNum);
} else {
finalDesc = _filenameStrings[_selectedSave];
diff --git a/engines/nancy/state/mainmenu.cpp b/engines/nancy/state/mainmenu.cpp
index 1e18c49347b..ca40da14ff0 100644
--- a/engines/nancy/state/mainmenu.cpp
+++ b/engines/nancy/state/mainmenu.cpp
@@ -102,7 +102,7 @@ void MainMenu::init() {
_menuData->_buttonDownSrcs[i], _menuData->_buttonDests[i],
_menuData->_buttonHighlightSrcs.size() ? _menuData->_buttonHighlightSrcs[i] : Common::Rect(),
_menuData->_buttonDisabledSrcs.size() ? _menuData->_buttonDisabledSrcs[i] : Common::Rect()));
-
+
_buttons.back()->init();
_buttons.back()->setVisible(false);
}
@@ -223,7 +223,7 @@ void MainMenu::stop() {
case 1 :
// "No" quits the game
g_nancy->quitGame();
-
+
// fall through
case 2 :
// "Cancel" keeps us in the main menu
@@ -250,7 +250,7 @@ void MainMenu::stop() {
_state = kRun;
break;
}
-
+
break;
case 7:
// Help
diff --git a/engines/nancy/state/scene.cpp b/engines/nancy/state/scene.cpp
index 4e3d740d57c..99e76e79d4b 100644
--- a/engines/nancy/state/scene.cpp
+++ b/engines/nancy/state/scene.cpp
@@ -250,7 +250,7 @@ void Scene::pushScene(int16 itemID) {
// the player will never be able to exit
_sceneState.pushedInvScene = _sceneState.currentScene;
}
-
+
_sceneState.isInvScenePushed = true;
_sceneState.pushedInvItemID = itemID;
}
@@ -327,7 +327,7 @@ void Scene::addItemToInventory(int16 id) {
if (_flags.heldItem == id) {
setHeldItem(-1);
}
-
+
g_nancy->_sound->playSound("BUOK");
_inventoryBox.addItem(id);
@@ -347,7 +347,7 @@ void Scene::removeItemFromInventory(int16 id, bool pickUp) {
} else if (getHeldItem() == id) {
setHeldItem(-1);
}
-
+
g_nancy->_sound->playSound("BUOK");
_inventoryBox.removeItem(id);
@@ -628,7 +628,7 @@ void Scene::synchronize(Common::Serializer &ser) {
ser.syncAsUint16LE(_sceneState.pushedInvScene.frameID);
ser.syncAsUint16LE(_sceneState.pushedInvScene.verticalOffset);
ser.syncAsByte(_sceneState.isInvScenePushed);
- ser.syncAsUint16LE(_sceneState.pushedInvItemID);
+ ser.syncAsUint16LE(_sceneState.pushedInvItemID);
}
// hardcoded number of logic conditions, check if there can ever be more/less
@@ -1119,7 +1119,7 @@ void Scene::handleInput() {
_actionManager.handleInput(input);
// Menu/help are disabled when a movie is active
- if (!_activeMovie) {
+ if (!_activeMovie) {
if (_menuButton) {
_menuButton->handleInput(input);
diff --git a/engines/nancy/state/scene.h b/engines/nancy/state/scene.h
index 04358e2578a..bc2fb5ecd11 100644
--- a/engines/nancy/state/scene.h
+++ b/engines/nancy/state/scene.h
@@ -81,11 +81,11 @@ public:
// Default values set to match those applied when loading from a TSUM chunk
Common::String description;
Common::Path videoFile;
-
+
uint16 videoFormat = kLargeVideoFormat;
Common::Array<Common::Path> palettes;
SoundDescription sound;
-
+
byte panningType = kPan360;
uint16 numberOfVideoFrames = 0;
uint16 degreesPerRotation = 18;
@@ -96,7 +96,7 @@ public:
uint16 verticalEdgeSize = 15;
Time slowMoveTimeDelta = 400;
Time fastMoveTimeDelta = 66;
-
+
// Sound start vectors, used in nancy3 and up
Math::Vector3d listenerPosition;
@@ -120,7 +120,7 @@ public:
void changeScene(const SceneChangeDescription &sceneDescription);
void pushScene(int16 itemID = -1);
void popScene(bool inventory = false);
-
+
void setPlayerTime(Time time, byte relative);
Time getPlayerTime() const { return _timers.playerTime; }
Time getTimerTime() const { return _timers.timerIsActive ? _timers.timerTime : 0; }
diff --git a/engines/nancy/state/setupmenu.cpp b/engines/nancy/state/setupmenu.cpp
index af2139800f5..60965fd4503 100644
--- a/engines/nancy/state/setupmenu.cpp
+++ b/engines/nancy/state/setupmenu.cpp
@@ -91,7 +91,7 @@ void SetupMenu::registerGraphics() {
const Common::String SetupMenu::getToggleConfManKey(uint id) {
GameType gameType = g_nancy->getGameType();
-
+
if (gameType == kGameTypeVampire) {
// Note that toggle id 1 (interlaced video) is ignored since we don't support that option
switch (id) {
@@ -156,7 +156,7 @@ void SetupMenu::init() {
for (uint i = 0; i < _setupData->_buttonDests.size() - 1; ++i) {
_toggles.push_back(new UI::Toggle(5, _background._drawSurface,
_setupData->_buttonDownSrcs[i], _setupData->_buttonDests[i]));
-
+
_toggles.back()->init();
}
@@ -216,7 +216,7 @@ void SetupMenu::run() {
default:
break;
}
-
+
g_system->getMixer()->setVolumeForSoundType(type, endPos * 255);
}
}
diff --git a/engines/nancy/ui/button.cpp b/engines/nancy/ui/button.cpp
index 4d5ae291d5e..5b1e5af4b22 100644
--- a/engines/nancy/ui/button.cpp
+++ b/engines/nancy/ui/button.cpp
@@ -49,7 +49,7 @@ void Button::handleInput(NancyInput &input) {
if (_isDisabled && !_disabledSrc.isEmpty()) {
return;
}
-
+
if (_screenPosition.contains(input.mousePos)) {
g_nancy->_cursor->setCursorType(CursorManager::kHotspotArrow);
diff --git a/engines/nancy/ui/button.h b/engines/nancy/ui/button.h
index 5ee31dbd012..eef9c464c73 100644
--- a/engines/nancy/ui/button.h
+++ b/engines/nancy/ui/button.h
@@ -47,7 +47,7 @@ public:
Common::Rect _clickSrc;
Common::Rect _hoverSrc;
Common::Rect _disabledSrc;
-
+
bool _isClicked;
bool _isDisabled;
};
diff --git a/engines/nancy/video.cpp b/engines/nancy/video.cpp
index ed420e87b9f..159b9631978 100644
--- a/engines/nancy/video.cpp
+++ b/engines/nancy/video.cpp
@@ -328,7 +328,7 @@ const Graphics::Surface *AVFDecoder::AVFVideoTrack::decodeFrame(uint frameNr) {
if (info.type != 0) {
delete[] decompBuf;
}
-
+
return nullptr;
}
} else {
@@ -339,7 +339,7 @@ const Graphics::Surface *AVFDecoder::AVFVideoTrack::decodeFrame(uint frameNr) {
if (info.type != 0) {
if (info.type == 2 && frameNr != 0) {
// Type 2 frames are incomplete, and only contain the pixels
- // that are different from the last valid frame. Thus, we need
+ // that are different from the last valid frame. Thus, we need
// to decode the previous frame and copy its contents to the new one's
const Graphics::Surface *refFrame = decodeFrame(frameNr - 1);
if (refFrame) {
More information about the Scummvm-git-logs
mailing list