mirror of
https://github.com/libretro/scummvm.git
synced 2025-02-03 09:23:37 +00:00
ZVISION: Remove trailing whitespace
This commit is contained in:
parent
66abcb4829
commit
e4f3f44c23
@ -79,7 +79,7 @@ void ZfsArchive::readHeaders(Common::SeekableReadStream *stream) {
|
||||
// Read in each entry header
|
||||
for (uint32 i = 0; i < _header.filesPerBlock; ++i) {
|
||||
ZfsEntryHeader entryHeader;
|
||||
|
||||
|
||||
entryHeader.name = readEntryName(stream);
|
||||
entryHeader.offset = stream->readUint32LE();
|
||||
entryHeader.id = stream->readUint32LE();
|
||||
|
@ -106,7 +106,7 @@ void SaveManager::autoSave() {
|
||||
void SaveManager::writeSaveGameData(Common::OutSaveFile *file) {
|
||||
// Create a thumbnail and save it
|
||||
Graphics::saveThumbnail(*file);
|
||||
|
||||
|
||||
// Write out the save date/time
|
||||
TimeDate td;
|
||||
g_system->getTimeAndDate(td);
|
||||
@ -171,7 +171,7 @@ bool SaveManager::readSaveGameHeader(Common::InSaveFile *in, SaveGameHeader &hea
|
||||
warning("File is not a ZVision save file. Aborting load");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
// Read in the version
|
||||
header.version = in->readByte();
|
||||
|
||||
|
@ -123,7 +123,7 @@ ActionDisableControl::ActionDisableControl(const Common::String &line) {
|
||||
|
||||
bool ActionDisableControl::execute(ZVision *engine) {
|
||||
debug("Disabling control %u", _key);
|
||||
|
||||
|
||||
ScriptManager *scriptManager = engine->getScriptManager();
|
||||
scriptManager->setStateFlags(_key, scriptManager->getStateFlags(_key) | ScriptManager::DISABLED);
|
||||
|
||||
@ -194,7 +194,7 @@ bool ActionMusic::execute(ZVision *engine) {
|
||||
} else {
|
||||
audioStream = makeRawZorkStream(_fileName, engine);
|
||||
}
|
||||
|
||||
|
||||
if (_loop) {
|
||||
Audio::LoopingAudioStream *loopingAudioStream = new Audio::LoopingAudioStream(audioStream, 0, DisposeAfterUse::YES);
|
||||
engine->_mixer->playStream(_soundType, 0, loopingAudioStream, -1, _volume);
|
||||
@ -327,7 +327,7 @@ ActionSetPartialScreen::ActionSetPartialScreen(const Common::String &line) {
|
||||
|
||||
bool ActionSetPartialScreen::execute(ZVision *engine) {
|
||||
RenderManager *renderManager = engine->getRenderManager();
|
||||
|
||||
|
||||
if (_backgroundColor > 0) {
|
||||
renderManager->clearWorkingWindowTo555Color(_backgroundColor);
|
||||
}
|
||||
|
@ -56,7 +56,7 @@ private:
|
||||
|
||||
private:
|
||||
uint32 _animationKey;
|
||||
|
||||
|
||||
union {
|
||||
RlfAnimation *rlf;
|
||||
Video::VideoDecoder *avi;
|
||||
|
@ -84,7 +84,7 @@ LeverControl::~LeverControl() {
|
||||
} else if (_fileType == RLF) {
|
||||
delete _animation.rlf;
|
||||
}
|
||||
|
||||
|
||||
delete[] _frameInfo;
|
||||
}
|
||||
|
||||
@ -194,7 +194,7 @@ void LeverControl::onMouseDown(const Common::Point &screenSpacePos, const Common
|
||||
if (!_enabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (_frameInfo[_currentFrame].hotspot.contains(backgroundImageSpacePos)) {
|
||||
_mouseIsCaptured = true;
|
||||
_lastMousePos = backgroundImageSpacePos;
|
||||
@ -205,7 +205,7 @@ void LeverControl::onMouseUp(const Common::Point &screenSpacePos, const Common::
|
||||
if (!_enabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (_mouseIsCaptured) {
|
||||
_mouseIsCaptured = false;
|
||||
_engine->getScriptManager()->setStateValue(_key, _currentFrame);
|
||||
@ -220,7 +220,7 @@ bool LeverControl::onMouseMove(const Common::Point &screenSpacePos, const Common
|
||||
if (!_enabled) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
bool cursorWasChanged = false;
|
||||
|
||||
if (_mouseIsCaptured) {
|
||||
@ -276,7 +276,7 @@ bool LeverControl::process(uint32 deltaTimeInMillis) {
|
||||
renderFrame(_returnRoutesCurrentFrame);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -387,7 +387,7 @@ void LeverControl::renderFrame(uint frameNumber) {
|
||||
// getFrameData() will automatically optimize to getNextFrame() / getPreviousFrame() if it can
|
||||
frameData = (const uint16 *)_animation.rlf->getFrameData(frameNumber)->getPixels();
|
||||
width = _animation.rlf->width(); // Use the animation width instead of _animationCoords.width()
|
||||
height = _animation.rlf->height(); // Use the animation height instead of _animationCoords.height()
|
||||
height = _animation.rlf->height(); // Use the animation height instead of _animationCoords.height()
|
||||
} else if (_fileType == AVI) {
|
||||
_animation.avi->seekToFrame(frameNumber);
|
||||
const Graphics::Surface *surface = _animation.avi->decodeNextFrame();
|
||||
|
@ -76,7 +76,7 @@ void PushToggleControl::onMouseUp(const Common::Point &screenSpacePos, const Com
|
||||
if (!_enabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (_hotspot.contains(backgroundImageSpacePos)) {
|
||||
_engine->getScriptManager()->setStateValue(_key, 1);
|
||||
}
|
||||
@ -86,7 +86,7 @@ bool PushToggleControl::onMouseMove(const Common::Point &screenSpacePos, const C
|
||||
if (!_enabled) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
if (_hotspot.contains(backgroundImageSpacePos)) {
|
||||
_engine->getCursorManager()->changeCursor(_hoverCursor);
|
||||
return true;
|
||||
|
@ -31,7 +31,7 @@
|
||||
|
||||
|
||||
namespace ZVision {
|
||||
|
||||
|
||||
TimerNode::TimerNode(ZVision *engine, uint32 key, uint timeInSeconds)
|
||||
: Control(engine, key) {
|
||||
if (_engine->getGameId() == GID_NEMESIS) {
|
||||
|
@ -236,7 +236,7 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
|
||||
} else if (line.matchString("*:ttytext*", true)) {
|
||||
// TODO: Implement ActionTTYText
|
||||
} else if (line.matchString("*:universe_music*", true)) {
|
||||
// TODO: Implement ActionUniverseMusic
|
||||
// TODO: Implement ActionUniverseMusic
|
||||
} else if (line.matchString("*:copy_file*", true)) {
|
||||
// Not used. Purposely left empty
|
||||
} else {
|
||||
|
@ -260,7 +260,7 @@ Control *ScriptManager::getControl(uint32 key) {
|
||||
void ScriptManager::focusControl(uint32 key) {
|
||||
for (ControlList::iterator iter = _activeControls.begin(); iter != _activeControls.end(); ++iter) {
|
||||
uint32 controlKey = (*iter)->getKey();
|
||||
|
||||
|
||||
if (controlKey == key) {
|
||||
(*iter)->focus();
|
||||
} else if (controlKey == _currentlyFocusedControl) {
|
||||
|
@ -203,7 +203,7 @@ void convertRawToWav(const Common::String &inputFile, ZVision *engine, const Com
|
||||
return;
|
||||
|
||||
Audio::AudioStream *audioStream = makeRawZorkStream(inputFile, engine);
|
||||
|
||||
|
||||
Common::DumpFile output;
|
||||
output.open(outputFile);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user