aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wintermute')
-rw-r--r--engines/wintermute/Ad/AdGame.cpp2
-rw-r--r--engines/wintermute/Ad/AdInventoryBox.cpp4
-rw-r--r--engines/wintermute/Ad/AdObject.cpp2
-rw-r--r--engines/wintermute/Base/BImage.cpp6
-rw-r--r--engines/wintermute/Base/BRenderSDL.cpp8
-rw-r--r--engines/wintermute/PlatformSDL.cpp1
-rw-r--r--engines/wintermute/utils/StringUtil.cpp4
-rw-r--r--engines/wintermute/video/VidTheoraPlayer.cpp10
-rw-r--r--engines/wintermute/video/VidTheoraPlayer.h2
-rw-r--r--engines/wintermute/wintermute.cpp3
10 files changed, 20 insertions, 22 deletions
diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp
index 23d144a426..adcae6a4bd 100644
--- a/engines/wintermute/Ad/AdGame.cpp
+++ b/engines/wintermute/Ad/AdGame.cpp
@@ -1457,7 +1457,7 @@ HRESULT CAdGame::LoadItemsBuffer(byte *Buffer, bool Merge) {
CAdSceneState *CAdGame::GetSceneState(const char *Filename, bool Saving) {
char *FilenameCor = new char[strlen(Filename) + 1];
strcpy(FilenameCor, Filename);
- for (int i = 0; i < strlen(FilenameCor); i++) {
+ for (uint32 i = 0; i < strlen(FilenameCor); i++) {
if (FilenameCor[i] == '/') FilenameCor[i] = '\\';
}
diff --git a/engines/wintermute/Ad/AdInventoryBox.cpp b/engines/wintermute/Ad/AdInventoryBox.cpp
index e4da8e975c..100d4f8d8e 100644
--- a/engines/wintermute/Ad/AdInventoryBox.cpp
+++ b/engines/wintermute/Ad/AdInventoryBox.cpp
@@ -103,8 +103,8 @@ HRESULT CAdInventoryBox::Display() {
if (!_visible) return S_OK;
int ItemsX, ItemsY;
- ItemsX = floor((float)((_itemsArea.right - _itemsArea.left + _spacing) / (_itemWidth + _spacing)));
- ItemsY = floor((float)((_itemsArea.bottom - _itemsArea.top + _spacing) / (_itemHeight + _spacing)));
+ ItemsX = (int)floor((float)((_itemsArea.right - _itemsArea.left + _spacing) / (_itemWidth + _spacing)));
+ ItemsY = (int)floor((float)((_itemsArea.bottom - _itemsArea.top + _spacing) / (_itemHeight + _spacing)));
if (_window) {
_window->EnableWidget("prev", _scrollOffset > 0);
diff --git a/engines/wintermute/Ad/AdObject.cpp b/engines/wintermute/Ad/AdObject.cpp
index 85a6ad49b3..816821568e 100644
--- a/engines/wintermute/Ad/AdObject.cpp
+++ b/engines/wintermute/Ad/AdObject.cpp
@@ -816,7 +816,7 @@ int CAdObject::GetHeight() {
if (_zoomable) {
float zoom = ((CAdGame *)Game)->_scene->GetZoomAt(_posX, _posY);
- ret = ret * zoom / 100;
+ ret = (int)(ret * zoom / 100);
}
return ret;
}
diff --git a/engines/wintermute/Base/BImage.cpp b/engines/wintermute/Base/BImage.cpp
index 2504850887..eadf845109 100644
--- a/engines/wintermute/Base/BImage.cpp
+++ b/engines/wintermute/Base/BImage.cpp
@@ -142,7 +142,7 @@ HRESULT CBImage::Resize(int NewWidth, int NewHeight) {
//////////////////////////////////////////////////////////////////////////
bool CBImage::writeBMPToStream(Common::WriteStream *stream) {
- if (!_surface) return NULL;
+ if (!_surface) return false;
/* The following is just copied over and inverted to write-ops from the BMP-decoder */
stream->writeByte('B');
@@ -164,7 +164,7 @@ bool CBImage::writeBMPToStream(Common::WriteStream *stream) {
uint32 width = _surface->w;
int32 height = _surface->h;
stream->writeUint32LE(width);
- stream->writeUint32LE(height);
+ stream->writeUint32LE((uint32)height);
if (width == 0 || height == 0)
return false;
@@ -240,7 +240,7 @@ bool CBImage::writeBMPToStream(Common::WriteStream *stream) {
return Buffer;
#endif
- return NULL;
+ return false;
}
diff --git a/engines/wintermute/Base/BRenderSDL.cpp b/engines/wintermute/Base/BRenderSDL.cpp
index 54119d3a7a..80c3372c62 100644
--- a/engines/wintermute/Base/BRenderSDL.cpp
+++ b/engines/wintermute/Base/BRenderSDL.cpp
@@ -120,11 +120,11 @@ HRESULT CBRenderSDL::InitRenderer(int width, int height, bool windowed) {
ratio = (float)_realWidth / (float)_width;
}
- _borderLeft = (_realWidth - (_width * ratio)) / 2;
- _borderRight = _realWidth - (_width * ratio) - _borderLeft;
+ _borderLeft = (int)((_realWidth - (_width * ratio)) / 2);
+ _borderRight = (int)(_realWidth - (_width * ratio) - _borderLeft);
- _borderTop = (_realHeight - (_height * ratio)) / 2;
- _borderBottom = _realHeight - (_height * ratio) - _borderTop;
+ _borderTop = (int)((_realHeight - (_height * ratio)) / 2);
+ _borderBottom = (int)(_realHeight - (_height * ratio) - _borderTop);
diff --git a/engines/wintermute/PlatformSDL.cpp b/engines/wintermute/PlatformSDL.cpp
index fde05eafe3..9eb1970f11 100644
--- a/engines/wintermute/PlatformSDL.cpp
+++ b/engines/wintermute/PlatformSDL.cpp
@@ -45,6 +45,7 @@ CBGame *CBPlatform::Game = NULL;
#define CLASS_NAME "GF_FRAME"
int CBPlatform::Initialize(CBGame *inGame, int argc, char *argv[]) {
Game = inGame;
+ return true;
}
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/utils/StringUtil.cpp b/engines/wintermute/utils/StringUtil.cpp
index 21d777eb32..0e273ea84f 100644
--- a/engines/wintermute/utils/StringUtil.cpp
+++ b/engines/wintermute/utils/StringUtil.cpp
@@ -177,7 +177,7 @@ Utf8String StringUtil::WideToUtf8(const WideString &WideStr) {
}
// Currently this only does Ansi->ISO 8859, and only for carets.
-char simpleAnsiToWide(const AnsiString &str, int &offset) {
+char simpleAnsiToWide(const AnsiString &str, uint32 &offset) {
char c = str[offset];
if (c == 92) {
@@ -198,7 +198,7 @@ WideString StringUtil::AnsiToWide(const AnsiString &str) {
warning("StringUtil::AnsiToWide - WideString not supported yet");
}
Common::String converted = "";
- int index = 0;
+ uint32 index = 0;
while (index != str.size()) {
converted += simpleAnsiToWide(str, index);
}
diff --git a/engines/wintermute/video/VidTheoraPlayer.cpp b/engines/wintermute/video/VidTheoraPlayer.cpp
index 1afd114bd4..bcf4569737 100644
--- a/engines/wintermute/video/VidTheoraPlayer.cpp
+++ b/engines/wintermute/video/VidTheoraPlayer.cpp
@@ -386,15 +386,15 @@ HRESULT CVidTheoraPlayer::play(TVideoPlayback type, int x, int y, bool freezeGam
float ZoomX = (float)((float)Game->_renderer->_width / width * 100);
float ZoomY = (float)((float)Game->_renderer->_height / height * 100);
_playZoom = MIN(ZoomX, ZoomY);
- _posX = (Game->_renderer->_width - width * (_playZoom / 100)) / 2;
- _posY = (Game->_renderer->_height - height * (_playZoom / 100)) / 2;
+ _posX = (int)((Game->_renderer->_width - width * (_playZoom / 100)) / 2);
+ _posY = (int)((Game->_renderer->_height - height * (_playZoom / 100)) / 2);
}
break;
case VID_PLAY_CENTER:
_playZoom = 100.0f;
- _posX = (Game->_renderer->_width - width) / 2;
- _posY = (Game->_renderer->_height - height) / 2;
+ _posX = (int)((Game->_renderer->_width - width) / 2);
+ _posY = (int)((Game->_renderer->_height - height) / 2);
break;
}
return S_OK;
@@ -594,7 +594,7 @@ float CVidTheoraPlayer::getMovieTime() {
//////////////////////////////////////////////////////////////////////////
-int CVidTheoraPlayer::getMovieFrame() {
+uint32 CVidTheoraPlayer::getMovieFrame() {
#if 0
if (!m_TheoraStreams) return 0;
float Time = GetMovieTime();
diff --git a/engines/wintermute/video/VidTheoraPlayer.h b/engines/wintermute/video/VidTheoraPlayer.h
index 43be1801a0..a112377f91 100644
--- a/engines/wintermute/video/VidTheoraPlayer.h
+++ b/engines/wintermute/video/VidTheoraPlayer.h
@@ -85,7 +85,7 @@ public:
};
float getMovieTime();
- int getMovieFrame();
+ uint32 getMovieFrame();
CBSurface *getTexture();
diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp
index 0cd3da2c6a..06ab932f21 100644
--- a/engines/wintermute/wintermute.cpp
+++ b/engines/wintermute/wintermute.cpp
@@ -136,8 +136,6 @@ Common::Error WinterMuteEngine::run() {
}
int WinterMuteEngine::init() {
- char argv[1] = { ' ' };
- int argc = 0;
registerClasses(); // Needs to be done before the first WME class is instantiated
_game = new CAdGame;
if (!_game) return 1;
@@ -147,7 +145,6 @@ int WinterMuteEngine::init() {
// parse command line
char *SaveGame = NULL;
- char param[MAX_PATH];
/* for (int i = 0; i < argc; i++) {
strcpy(param, argv[i]);
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-11 03:10:33 +0000