aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/video
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2012-07-09 04:09:15 +0200
committerEinar Johan Trøan Sømåen2012-07-09 04:09:15 +0200
commit7c984d24a8cd2ebe5a7860e21cda392edada34b3 (patch)
tree36d6cd53884107f29a451ffe1b06370e3fdc7f67 /engines/wintermute/video
parent1eea9ad1a3ae577195363abe475cfbbee33d153b (diff)
downloadscummvm-rg350-7c984d24a8cd2ebe5a7860e21cda392edada34b3.tar.gz
scummvm-rg350-7c984d24a8cd2ebe5a7860e21cda392edada34b3.tar.bz2
scummvm-rg350-7c984d24a8cd2ebe5a7860e21cda392edada34b3.zip
WINTERMUTE: Change RECT -> Common::Rect and POINT-> Common::Point, completing the removal of Windows-specifics in wintypes.h
Diffstat (limited to 'engines/wintermute/video')
-rw-r--r--engines/wintermute/video/VidPlayer.cpp4
-rw-r--r--engines/wintermute/video/VidTheoraPlayer.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/wintermute/video/VidPlayer.cpp b/engines/wintermute/video/VidPlayer.cpp
index 51453fb34b..7fa8e6e218 100644
--- a/engines/wintermute/video/VidPlayer.cpp
+++ b/engines/wintermute/video/VidPlayer.cpp
@@ -128,7 +128,7 @@ ERRORCODE CVidPlayer::initialize(const char *inFilename, const char *SubtitleFil
#if 0
cleanup();
- char Filename[MAX_PATH];
+ char Filename[MAX_PATH_LENGTH];
Game->_fileManager->GetFullPath(inFilename, filename);
// open file
@@ -382,7 +382,7 @@ ERRORCODE CVidPlayer::loadSubtitles(const char *filename, const char *SubtitleFi
#if 0
if (!Filename) return STATUS_OK;
- char NewFile[MAX_PATH];
+ char NewFile[MAX_PATH_LENGTH];
char drive[_MAX_DRIVE];
char dir[_MAX_DIR];
char fname[_MAX_FNAME];
diff --git a/engines/wintermute/video/VidTheoraPlayer.cpp b/engines/wintermute/video/VidTheoraPlayer.cpp
index 6b71c2a2fd..c57049e177 100644
--- a/engines/wintermute/video/VidTheoraPlayer.cpp
+++ b/engines/wintermute/video/VidTheoraPlayer.cpp
@@ -652,7 +652,7 @@ void CVidTheoraPlayer::writeAlpha() {
//////////////////////////////////////////////////////////////////////////
ERRORCODE CVidTheoraPlayer::display(uint32 alpha) {
- RECT rc;
+ Common::Rect rc;
ERRORCODE res;
if (_texture && _videoFrameReady) {