diff options
Diffstat (limited to 'engines/titanic/support')
22 files changed, 68 insertions, 68 deletions
diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp index 45c3ce94b3..9e465c705f 100644 --- a/engines/titanic/support/avi_surface.cpp +++ b/engines/titanic/support/avi_surface.cpp @@ -94,19 +94,19 @@ bool AVISurface::play(int startFrame, int endFrame, int initialFrame, uint flags me->_endFrame = endFrame; me->_initialFrame = 0; me->_gameObject = obj; - + info->addEvent(me); } _movieRangeInfo.push_back(info); - + if (_movieRangeInfo.size() == 1) { // First play call, so start the movie playing setReversed(info->_isReversed); return startAtFrame(initialFrame); } else { return true; - } + } } void AVISurface::stop() { @@ -181,7 +181,7 @@ bool AVISurface::handleEvents(CMovieEventList &events) { setReversed(info->_isReversed); seekToFrame(newFrame); } - + // Get any events for the given position info->getMovieFrame(events, newFrame); return renderFrame(); @@ -221,7 +221,7 @@ void AVISurface::setupDecompressor() { _decoder->getVideoTrack(idx).getPixelFormat()); bool flag = false; - if (idx == 0 && _videoSurface && + if (idx == 0 && _videoSurface && _videoSurface->getPitch() == _movieFrameSurface[idx]->pitch) { const uint bitCount = _decoder->getVideoTrack(0).getBitCount(); const int vDepth = _videoSurface->getPixelDepth(); @@ -300,7 +300,7 @@ bool AVISurface::renderFrame() { // Blit the frame directly to the video surface assert(_streamCount == 1); _videoSurface->blitFrom(Point(0, 0), &_movieFrameSurface[0]->rawSurface()); - + _videoSurface->unlock(); } } else { diff --git a/engines/titanic/support/avi_surface.h b/engines/titanic/support/avi_surface.h index 0bb14ceb27..b6231a646f 100644 --- a/engines/titanic/support/avi_surface.h +++ b/engines/titanic/support/avi_surface.h @@ -44,12 +44,12 @@ public: Video::AVIDecoder(soundType) {} AVIDecoder(const Common::Rational &frameRateOverride, Audio::Mixer::SoundType soundType = Audio::Mixer::kPlainSoundType) : Video::AVIDecoder(frameRateOverride, soundType) {} - + /** * Returns the number of video tracks the decoder has */ uint videoTrackCount() const { return _videoTracks.size(); } - + /** * Returns the specified video track */ diff --git a/engines/titanic/support/credit_text.cpp b/engines/titanic/support/credit_text.cpp index 009c3f4944..da6de6278e 100644 --- a/engines/titanic/support/credit_text.cpp +++ b/engines/titanic/support/credit_text.cpp @@ -67,7 +67,7 @@ void CCreditText::setup() { // Create a new group and line within it CCreditLineGroup *group = new CCreditLineGroup(); - CCreditLine *line = new CCreditLine(srcLine, + CCreditLine *line = new CCreditLine(srcLine, _screenManagerP->stringWidth(srcLine)); group->_lines.push_back(line); @@ -125,7 +125,7 @@ void CCreditText::handleDots(CCreditLineGroup *group) { // Figure out the maximum width of secondary lines for (CCreditLines::iterator i = second; i != group->_lines.end(); ++i) maxWidth = MAX(maxWidth, (*i)->_lineWidth); - + int charWidth = _screenManagerP->stringWidth("."); // Process the secondary lines diff --git a/engines/titanic/support/direct_draw.h b/engines/titanic/support/direct_draw.h index a7e9cc8d93..08ead6d798 100644 --- a/engines/titanic/support/direct_draw.h +++ b/engines/titanic/support/direct_draw.h @@ -70,7 +70,7 @@ public: * @param width Screen width * @param height Screen height * @param bpp Bits per pixel - * @param numBackSurfaces Number of back surfaces + * @param numBackSurfaces Number of back surfaces */ void initVideo(int width, int height, int bpp, int numBackSurfaces); diff --git a/engines/titanic/support/files_manager.cpp b/engines/titanic/support/files_manager.cpp index 22bff275d2..2882b8da85 100644 --- a/engines/titanic/support/files_manager.cpp +++ b/engines/titanic/support/files_manager.cpp @@ -75,7 +75,7 @@ bool CFilesManager::scanForFile(const CString &name) { CString filename = name; filename.toLowercase(); - + if (filename[0] == 'y' || filename[0] == 'z') return true; else if (filename[0] < 'a' || filename[0] > 'c') diff --git a/engines/titanic/support/files_manager.h b/engines/titanic/support/files_manager.h index a980ef1b25..45b067e86e 100644 --- a/engines/titanic/support/files_manager.h +++ b/engines/titanic/support/files_manager.h @@ -39,7 +39,7 @@ class CFilesManager { struct ResourceEntry { uint _offset; uint _size; - + ResourceEntry() : _offset(0), _size(0) {} ResourceEntry(uint offset, uint size) : _offset(offset), _size(size) {} }; diff --git a/engines/titanic/support/font.cpp b/engines/titanic/support/font.cpp index 45d593755e..625d03720b 100644 --- a/engines/titanic/support/font.cpp +++ b/engines/titanic/support/font.cpp @@ -80,7 +80,7 @@ int STFont::getTextBounds(const CString &str, int maxWidth, Point *sizeOut) cons if (_fontHeight == 0 || !_dataPtr) // No font, so return immediately return 0; - + // Loop through the characters of the string if (!str.empty()) { for (const char *strP = str.c_str(); *strP; ++strP) { @@ -331,7 +331,7 @@ void STFont::checkLineWrap(Point &textSize, int maxWidth, const char *&str) cons flag = true; } } - + if ((textSize.x + totalWidth) >= maxWidth && totalWidth < maxWidth) { // Word wrap textSize.x = 0; diff --git a/engines/titanic/support/font.h b/engines/titanic/support/font.h index 6c4fe8e9c3..685ab8ad73 100644 --- a/engines/titanic/support/font.h +++ b/engines/titanic/support/font.h @@ -50,13 +50,13 @@ private: * Copys a rectangle representing a character in the font data to * a given destination position in the surface */ - void copyRect(CVideoSurface *surface, const Common::Point &destPos, + void copyRect(CVideoSurface *surface, const Common::Point &destPos, Rect &srcRect); /** * Write a character */ - WriteCharacterResult writeChar(CVideoSurface *surface, unsigned char c, + WriteCharacterResult writeChar(CVideoSurface *surface, unsigned char c, const Common::Point &pt, const Rect &destRect, const Rect *srcRect); /** diff --git a/engines/titanic/support/image_decoders.cpp b/engines/titanic/support/image_decoders.cpp index 495d1d0982..2dba66fbb3 100644 --- a/engines/titanic/support/image_decoders.cpp +++ b/engines/titanic/support/image_decoders.cpp @@ -32,9 +32,9 @@ void CJPEGDecode::decode(OSVideoSurface &surface, const CString &name) { // Use the ScucmmVM deoder to decode it loadStream(*file.readStream()); const Graphics::Surface *srcSurf = getSurface(); - + // Resize the surface if necessary - if (!surface.hasSurface() || surface.getWidth() != srcSurf->w + if (!surface.hasSurface() || surface.getWidth() != srcSurf->w || surface.getHeight() != srcSurf->h) surface.recreate(srcSurf->w, srcSurf->h); diff --git a/engines/titanic/support/mouse_cursor.cpp b/engines/titanic/support/mouse_cursor.cpp index 665ead3056..4dd1ab4366 100644 --- a/engines/titanic/support/mouse_cursor.cpp +++ b/engines/titanic/support/mouse_cursor.cpp @@ -53,7 +53,7 @@ CMouseCursor::CursorEntry::~CursorEntry() { delete _transSurface; } -CMouseCursor::CMouseCursor(CScreenManager *screenManager) : +CMouseCursor::CMouseCursor(CScreenManager *screenManager) : _screenManager(screenManager), _cursorId(CURSOR_HOURGLASS), _setCursorCount(0), _fieldE4(0), _fieldE8(0) { loadCursorImages(); @@ -79,7 +79,7 @@ void CMouseCursor::loadCursorImages() { // Open the cursors video and move to the given frame OSMovie movie(key, surface); movie.setFrame(idx); - + Graphics::ManagedSurface *transSurface = movie.duplicateTransparency(); _cursors[idx]._transSurface = transSurface; surface->setTransparencySurface(transSurface); @@ -147,7 +147,7 @@ void CMouseCursor::unlockE4() { void CMouseCursor::setPosition(const Point &pt, double rate) { assert(rate >= 0.0 && rate <= 1.0); - + // TODO: Figure out use of the rate parameter g_system->warpMouse(pt.x, pt.y); } diff --git a/engines/titanic/support/mouse_cursor.h b/engines/titanic/support/mouse_cursor.h index 5bf6895a67..08de28e29d 100644 --- a/engines/titanic/support/mouse_cursor.h +++ b/engines/titanic/support/mouse_cursor.h @@ -86,12 +86,12 @@ public: * Hide the mouse cursor */ void hide(); - + /** * Set the cursor */ void setCursor(CursorId cursorId); - + /** * Updates the mouse cursor */ diff --git a/engines/titanic/support/movie.cpp b/engines/titanic/support/movie.cpp index eff0e0c754..aea51e1a1e 100644 --- a/engines/titanic/support/movie.cpp +++ b/engines/titanic/support/movie.cpp @@ -125,7 +125,7 @@ void OSMovie::play(uint startFrame, uint endFrame, uint initialFrame, uint flags void OSMovie::playCutscene(const Rect &drawRect, uint startFrame, uint endFrame) { if (!_movieSurface) _movieSurface = CScreenManager::_screenManagerPtr->createSurface(600, 340); - + bool widthLess = _videoSurface->getWidth() < 600; bool heightLess = _videoSurface->getHeight() < 340; Rect r(drawRect.left, drawRect.top, diff --git a/engines/titanic/support/movie.h b/engines/titanic/support/movie.h index be34244d96..acc647065f 100644 --- a/engines/titanic/support/movie.h +++ b/engines/titanic/support/movie.h @@ -72,7 +72,7 @@ public: * Starts playing the movie */ virtual void play(uint flags, CGameObject *obj) = 0; - + /** * Starts playing the movie */ @@ -82,13 +82,13 @@ public: * Starts playing the movie */ virtual void play(uint startFrame, uint endFrame, uint initialFrame, uint flags, CGameObject *obj) = 0; - + /** * Plays a sub-section of a movie, and doesn't return until either * the playback ends or a key has been pressed */ virtual void playCutscene(const Rect &drawRect, uint startFrame, uint endFrame) = 0; - + /** * Stops the movie */ @@ -103,12 +103,12 @@ public: * Set the current frame number */ virtual void setFrame(uint frameNumber) = 0; - + /** * Handle any pending movie events */ virtual bool handleEvents(CMovieEventList &events) = 0; - + /** * Return any movie range info associated with the movie */ @@ -171,17 +171,17 @@ public: * Starts playing the movie */ virtual void play(uint flags, CGameObject *obj); - + /** * Starts playing the movie */ virtual void play(uint startFrame, uint endFrame, uint flags, CGameObject *obj); - + /** * Starts playing the movie */ virtual void play(uint startFrame, uint endFrame, uint initialFrame, uint flags, CGameObject *obj); - + /** * Plays a sub-section of a movie, and doesn't return until either * the playback ends or a key has been pressed @@ -192,7 +192,7 @@ public: * Stops the movie */ virtual void stop(); - + /** * Add a playback event */ @@ -202,7 +202,7 @@ public: * Set the current frame number */ virtual void setFrame(uint frameNumber); - + /** * Handle any pending movie events */ diff --git a/engines/titanic/support/movie_clip.h b/engines/titanic/support/movie_clip.h index 513ed4a339..17c91b190c 100644 --- a/engines/titanic/support/movie_clip.h +++ b/engines/titanic/support/movie_clip.h @@ -27,7 +27,7 @@ namespace Titanic { -enum ClipFlag { +enum ClipFlag { CLIPFLAG_HAS_END_FRAME = 1, CLIPFLAG_4 = 4, CLIPFLAG_HAS_START_FRAME = 8, diff --git a/engines/titanic/support/movie_range_info.cpp b/engines/titanic/support/movie_range_info.cpp index d4d9fc0e2a..018ffd63b5 100644 --- a/engines/titanic/support/movie_range_info.cpp +++ b/engines/titanic/support/movie_range_info.cpp @@ -91,7 +91,7 @@ void CMovieRangeInfo::process(CGameObject *owner) { flags |= MOVIE_REPEAT; if (_startFrame) flags |= MOVIE_REVERSE; - + for (CMovieEventList::iterator i = _events.begin(); i != _events.end(); ++i) { CMovieEvent *movieEvent = *i; if (movieEvent->_type == MET_MOVIE_END) { diff --git a/engines/titanic/support/screen_manager.cpp b/engines/titanic/support/screen_manager.cpp index bcf43fc8cb..2e9bbcb6de 100644 --- a/engines/titanic/support/screen_manager.cpp +++ b/engines/titanic/support/screen_manager.cpp @@ -178,7 +178,7 @@ void OSScreenManager::blitFrom(SurfaceNum surfaceNum, CVideoSurface *src, destSurface = _backSurfaces[surfaceNum]._surface; if (!destSurface->hasSurface()) return; - + Point destPoint = destPos ? *destPos : Point(0, 0); Rect srcBounds = srcRect ? *srcRect : Rect(0, 0, src->getWidth(), src->getHeight()); Rect *bounds = &srcBounds; @@ -220,7 +220,7 @@ void OSScreenManager::blitFrom(SurfaceNum surfaceNum, const Rect *rect, CVideoSu destSurface->blitFrom(Point(rect->left, rect->top), src, rect); } -int OSScreenManager::writeString(int surfaceNum, const Rect &destRect, +int OSScreenManager::writeString(int surfaceNum, const Rect &destRect, int yOffset, const CString &str, CTextCursor *textCursor) { CVideoSurface *surface; Rect bounds; diff --git a/engines/titanic/support/screen_manager.h b/engines/titanic/support/screen_manager.h index cad6901b02..f88928af8b 100644 --- a/engines/titanic/support/screen_manager.h +++ b/engines/titanic/support/screen_manager.h @@ -78,7 +78,7 @@ public: virtual void setWindowHandle(int v); virtual bool resetWindowHandle(int v); - + /** * Sets the video mode */ @@ -88,17 +88,17 @@ public: * Handles drawing the cursors */ virtual void drawCursors() = 0; - + /** * Locks a specified surface number for access and returns a pointer to it */ virtual CVideoSurface *lockSurface(SurfaceNum surfaceNum) = 0; - + /** * Unlocks a previously locked surface */ virtual void unlockSurface(CVideoSurface *surface) = 0; - + /** * Gets a specified surface number */ @@ -108,7 +108,7 @@ public: * Return the front render surface */ virtual CVideoSurface *getFrontRenderSurface() const = 0; - + /** * Fill an area with a specific color */ @@ -191,7 +191,7 @@ public: * Creates a surface of a given size */ virtual CVideoSurface *createSurface(int w, int h) = 0; - + /** * Creates a surface from a specified resource */ @@ -213,7 +213,7 @@ public: * Show the mouse cursor */ virtual void showCursor() = 0; - + /** * Hide the mouse cursor */ @@ -272,12 +272,12 @@ public: * Locks a specified surface number for access and returns a pointer to it */ virtual CVideoSurface *lockSurface(SurfaceNum surfaceNum); - + /** * Unlocks a previously locked surface */ virtual void unlockSurface(CVideoSurface *surface); - + /** * Gets a specified surface number */ @@ -373,7 +373,7 @@ public: * Creates a surface of a given size */ virtual CVideoSurface *createSurface(int w, int h); - + /** * Creates a surface from a specified resource */ @@ -383,7 +383,7 @@ public: * Show the mouse cursor */ virtual void showCursor(); - + /** * Hide the mouse cursor */ diff --git a/engines/titanic/support/simple_file.cpp b/engines/titanic/support/simple_file.cpp index 35b2e28e4a..7e3cea35be 100644 --- a/engines/titanic/support/simple_file.cpp +++ b/engines/titanic/support/simple_file.cpp @@ -52,7 +52,7 @@ SimpleFile::~SimpleFile() { } void SimpleFile::open(Common::SeekableReadStream *stream) { - close(); + close(); _inStream = stream; } @@ -290,7 +290,7 @@ void SimpleFile::writeString(const CString &str) const { const char *msgP = str.c_str(); char c; - + while ((c = *msgP++) != '\0') { switch (c) { case '\r': @@ -422,8 +422,8 @@ bool SimpleFile::scanf(const char *format, ...) { while (!formatStr.empty()) { if (formatStr.hasPrefix(" ")) { formatStr.deleteChar(0); - - safeRead(&c, 1); + + safeRead(&c, 1); if (!Common::isSpace(c)) return false; @@ -434,7 +434,7 @@ bool SimpleFile::scanf(const char *format, ...) { formatStr = CString(formatStr.c_str() + 2); int *param = (int *)va_arg(va, int *); *param = readNumber(); - + if (!eos()) _inStream->seek(-1, SEEK_CUR); } else if (formatStr.hasPrefix("%s")) { @@ -488,7 +488,7 @@ bool StdCWadFile::open(const Common::String &filename) { CString resStr = name.mid(idx + 1, extPos - idx - 1); int resIndex = resStr.readInt(); - // Open up the index for access + // Open up the index for access f.open(fname); int indexSize = f.readUint32LE() / 4; assert(resIndex < indexSize); diff --git a/engines/titanic/support/string.cpp b/engines/titanic/support/string.cpp index 9961cfce59..cf1b29b6ec 100644 --- a/engines/titanic/support/string.cpp +++ b/engines/titanic/support/string.cpp @@ -41,7 +41,7 @@ CString CString::left(uint count) const { CString CString::right(uint count) const { uint strSize = size(); - return (count > strSize) ? CString() : + return (count > strSize) ? CString() : CString(c_str() + strSize - count, c_str() + strSize); } @@ -85,7 +85,7 @@ FileType CString::fileTypeSuffix() const { return FILETYPE_WAV; else if (ext == "2" || ext == "3") return FILETYPE_MOVIE; - + ext = right(3); if (ext == "tga" || ext == "jpg") return FILETYPE_IMAGE; diff --git a/engines/titanic/support/text_cursor.cpp b/engines/titanic/support/text_cursor.cpp index ad3fe4ed26..5c7593ba68 100644 --- a/engines/titanic/support/text_cursor.cpp +++ b/engines/titanic/support/text_cursor.cpp @@ -27,7 +27,7 @@ namespace Titanic { -CTextCursor::CTextCursor(CScreenManager *screenManager) : +CTextCursor::CTextCursor(CScreenManager *screenManager) : _screenManager(screenManager), _active(false), _blinkVisible(false), _backRenderSurface(nullptr), _frontRenderSurface(nullptr), _blinkDelay(300), _size(2, 10), _priorBlinkTime(0), @@ -70,7 +70,7 @@ void CTextCursor::draw() { if (_blinkVisible) { Rect cursorRect = getCursorBounds(); _surface->blitFrom(Common::Point(0, 0), _backRenderSurface, &cursorRect); - + if (!_screenBounds.isEmpty()) // Limit the cursor rect to only within designated screen area cursorRect.constrain(_screenBounds); @@ -80,7 +80,7 @@ void CTextCursor::draw() { _backRenderSurface->_ddSurface->fillRect(&cursorRect, _cursorR, _cursorG, _cursorB); } - + //_screenManager->blitFrom(SURFACE_BACKBUFFER, _surface, &_pos); } } diff --git a/engines/titanic/support/time_event_info.cpp b/engines/titanic/support/time_event_info.cpp index 0226223f1a..e088a8e0c2 100644 --- a/engines/titanic/support/time_event_info.cpp +++ b/engines/titanic/support/time_event_info.cpp @@ -90,7 +90,7 @@ void CTimeEventInfoList::setPersisent(uint id, bool flag) { uint CTimeEventInfo::_nextId; -CTimeEventInfo::CTimeEventInfo() : ListItem(), _lockCounter(0), +CTimeEventInfo::CTimeEventInfo() : ListItem(), _lockCounter(0), _repeated(false), _firstDuration(0), _repeatDuration(0), _target(nullptr), _actionVal(0), _timerCtr(0), _done(false), _lastTimerTicks(0), _relativeTicks(0), _persisent(true) { @@ -147,7 +147,7 @@ void CTimeEventInfo::load(SimpleFile *file) { void CTimeEventInfo::postLoad(uint ticks, CProjectItem *project) { if (!_persisent || _targetName.empty()) _done = true; - + // Get the timer's target if (project) _target = project->findByName(_targetName); diff --git a/engines/titanic/support/video_surface.cpp b/engines/titanic/support/video_surface.cpp index c71f898889..45813bb740 100644 --- a/engines/titanic/support/video_surface.cpp +++ b/engines/titanic/support/video_surface.cpp @@ -35,7 +35,7 @@ byte CVideoSurface::_palette2[32][32]; CVideoSurface::CVideoSurface(CScreenManager *screenManager) : _screenManager(screenManager), _rawSurface(nullptr), _movie(nullptr), _pendingLoad(false), _flipVertically(false), _fastBlitFlag(false), - _transparencySurface(nullptr), _transparencyMode(TRANS_DEFAULT), + _transparencySurface(nullptr), _transparencyMode(TRANS_DEFAULT), _freeTransparencySurface(DisposeAfterUse::NO), _hasFrame(true), _lockCount(0) { _videoSurfaceNum = _videoSurfaceCounter++; } @@ -256,7 +256,7 @@ void CVideoSurface::transBlitRect(const Rect &srcRect, const Rect &destRect, CVi } // Move to next line - srcPtr = flipFlag ? srcPtr + (src->getPitch() / 2) : + srcPtr = flipFlag ? srcPtr + (src->getPitch() / 2) : srcPtr - (src->getPitch() / 2); destPtr -= destArea.pitch / 2; } @@ -330,7 +330,7 @@ OSVideoSurface::OSVideoSurface(CScreenManager *screenManager, const CResourceKey CVideoSurface(screenManager) { _ddSurface = nullptr; _pendingLoad = pendingLoad; - + if (_pendingLoad) { loadResource(key); } else { @@ -453,7 +453,7 @@ void OSVideoSurface::recreate(int width, int height) { } void OSVideoSurface::resize(int width, int height) { - if (!_ddSurface || _ddSurface->getWidth() != width || + if (!_ddSurface || _ddSurface->getWidth() != width || _ddSurface->getHeight() != height) recreate(width, height); } @@ -467,7 +467,7 @@ int OSVideoSurface::getPixelDepth() { error("Could not load resource"); lock(); - + int result = _rawSurface->format.bytesPerPixel; if (result == 1) // Paletted 8-bit images don't store the color directly in the pixels |