aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/wintermute/AdActor.cpp6
-rw-r--r--engines/wintermute/AdInventoryBox.cpp4
-rw-r--r--engines/wintermute/AdResponseBox.cpp2
-rw-r--r--engines/wintermute/AdScene.cpp34
-rw-r--r--engines/wintermute/AdSentence.cpp6
-rw-r--r--engines/wintermute/AdTalkHolder.cpp1
-rw-r--r--engines/wintermute/AdWaypointGroup.cpp2
-rw-r--r--engines/wintermute/BFileManager.cpp24
-rw-r--r--engines/wintermute/BFileManager.h2
-rw-r--r--engines/wintermute/BFontBitmap.cpp2
-rw-r--r--engines/wintermute/BFontTT.cpp5
-rw-r--r--engines/wintermute/BGame.cpp18
-rw-r--r--engines/wintermute/BPersistMgr.cpp6
-rw-r--r--engines/wintermute/BRegion.cpp15
-rw-r--r--engines/wintermute/BSprite.cpp4
-rw-r--r--engines/wintermute/PartEmitter.cpp2
-rw-r--r--engines/wintermute/UIEdit.cpp18
-rw-r--r--engines/wintermute/scriptables/SXArray.cpp2
-rw-r--r--engines/wintermute/scriptables/SXMemBuffer.cpp4
19 files changed, 83 insertions, 74 deletions
diff --git a/engines/wintermute/AdActor.cpp b/engines/wintermute/AdActor.cpp
index dff70dc3e9..14a36b1a90 100644
--- a/engines/wintermute/AdActor.cpp
+++ b/engines/wintermute/AdActor.cpp
@@ -805,8 +805,8 @@ void CAdActor::GetNextStep() {
MaxStepX = abs(_currentSprite->_moveX);
MaxStepY = abs(_currentSprite->_moveY);
- MaxStepX = std::max(MaxStepX, MaxStepY);
- MaxStepX = std::max(MaxStepX, 1);
+ MaxStepX = MAX(MaxStepX, MaxStepY);
+ MaxStepX = MAX(MaxStepX, 1);
while (_pFCount > 0 && MaxStepX >= 0) {
_pFX += _pFStepX;
@@ -851,7 +851,7 @@ void CAdActor::GetNextStep() {
//////////////////////////////////////////////////////////////////////////
void CAdActor::InitLine(CBPoint StartPt, CBPoint EndPt) {
- _pFCount = std::max((abs(EndPt.x - StartPt.x)) , (abs(EndPt.y - StartPt.y)));
+ _pFCount = MAX((abs(EndPt.x - StartPt.x)) , (abs(EndPt.y - StartPt.y)));
_pFStepX = (double)(EndPt.x - StartPt.x) / _pFCount;
_pFStepY = (double)(EndPt.y - StartPt.y) / _pFCount;
diff --git a/engines/wintermute/AdInventoryBox.cpp b/engines/wintermute/AdInventoryBox.cpp
index 6429179f50..c89fd5215f 100644
--- a/engines/wintermute/AdInventoryBox.cpp
+++ b/engines/wintermute/AdInventoryBox.cpp
@@ -39,7 +39,7 @@
#include "UIWindow.h"
#include "PlatformSDL.h"
#include "common/str.h"
-#include <cmath>
+//#include <cmath>
namespace WinterMute {
@@ -83,7 +83,7 @@ HRESULT CAdInventoryBox::Listen(CBScriptHolder *param1, uint32 param2) {
_visible = false;
} else if (scumm_stricmp(obj->_name, "prev") == 0) {
_scrollOffset -= _scrollBy;
- _scrollOffset = std::max(_scrollOffset, 0);
+ _scrollOffset = MAX(_scrollOffset, 0);
} else if (scumm_stricmp(obj->_name, "next") == 0) {
_scrollOffset += _scrollBy;
} else return CBObject::Listen(param1, param2);
diff --git a/engines/wintermute/AdResponseBox.cpp b/engines/wintermute/AdResponseBox.cpp
index a027847d24..cd8f950393 100644
--- a/engines/wintermute/AdResponseBox.cpp
+++ b/engines/wintermute/AdResponseBox.cpp
@@ -163,7 +163,7 @@ HRESULT CAdResponseBox::CreateButtons() {
// make the responses touchable
if (Game->_touchInterface)
- btn->_height = std::max(btn->_height, 50);
+ btn->_height = MAX(btn->_height, 50);
//btn->SetListener(this, btn, _responses[i]->_iD);
btn->SetListener(this, btn, i);
diff --git a/engines/wintermute/AdScene.cpp b/engines/wintermute/AdScene.cpp
index 4fb1096c1e..c3331c223b 100644
--- a/engines/wintermute/AdScene.cpp
+++ b/engines/wintermute/AdScene.cpp
@@ -435,7 +435,7 @@ int CAdScene::GetPointsDist(CBPoint p1, CBPoint p2, CBObject *requester) {
X += xStep;
}
}
- return std::max(xLength, yLength);
+ return MAX(xLength, yLength);
}
@@ -895,10 +895,10 @@ HRESULT CAdScene::TraverseNodes(bool Update) {
_lastTimeH = Game->_timer;
if (_offsetLeft < _targetOffsetLeft) {
_offsetLeft += _scrollPixelsH;
- _offsetLeft = std::min(_offsetLeft, _targetOffsetLeft);
+ _offsetLeft = MIN(_offsetLeft, _targetOffsetLeft);
} else if (_offsetLeft > _targetOffsetLeft) {
_offsetLeft -= _scrollPixelsH;
- _offsetLeft = std::max(_offsetLeft, _targetOffsetLeft);
+ _offsetLeft = MAX(_offsetLeft, _targetOffsetLeft);
}
}
@@ -907,10 +907,10 @@ HRESULT CAdScene::TraverseNodes(bool Update) {
_lastTimeV = Game->_timer;
if (_offsetTop < _targetOffsetTop) {
_offsetTop += _scrollPixelsV;
- _offsetTop = std::min(_offsetTop, _targetOffsetTop);
+ _offsetTop = MIN(_offsetTop, _targetOffsetTop);
} else if (_offsetTop > _targetOffsetTop) {
_offsetTop -= _scrollPixelsV;
- _offsetTop = std::max(_offsetTop, _targetOffsetTop);
+ _offsetTop = MAX(_offsetTop, _targetOffsetTop);
}
}
@@ -1198,11 +1198,11 @@ void CAdScene::ScrollTo(int OffsetX, int OffsetY) {
int OrigOffsetLeft = _targetOffsetLeft;
int OrigOffsetTop = _targetOffsetTop;
- _targetOffsetLeft = std::max(0, OffsetX - ViewportWidth / 2);
- _targetOffsetLeft = std::min(_targetOffsetLeft, _width - ViewportWidth);
+ _targetOffsetLeft = MAX(0, OffsetX - ViewportWidth / 2);
+ _targetOffsetLeft = MIN(_targetOffsetLeft, _width - ViewportWidth);
- _targetOffsetTop = std::max(0, OffsetY - ViewportHeight / 2);
- _targetOffsetTop = std::min(_targetOffsetTop, _height - ViewportHeight);
+ _targetOffsetTop = MAX(0, OffsetY - ViewportHeight / 2);
+ _targetOffsetTop = MIN(_targetOffsetTop, _height - ViewportHeight);
if (Game->_mainObject && Game->_mainObject->_is3D) {
@@ -1232,11 +1232,11 @@ void CAdScene::SkipTo(int OffsetX, int OffsetY) {
int ViewportWidth, ViewportHeight;
GetViewportSize(&ViewportWidth, &ViewportHeight);
- _offsetLeft = std::max(0, OffsetX - ViewportWidth / 2);
- _offsetLeft = std::min(_offsetLeft, _width - ViewportWidth);
+ _offsetLeft = MAX(0, OffsetX - ViewportWidth / 2);
+ _offsetLeft = MIN(_offsetLeft, _width - ViewportWidth);
- _offsetTop = std::max(0, OffsetY - ViewportHeight / 2);
- _offsetTop = std::min(_offsetTop, _height - ViewportHeight);
+ _offsetTop = MAX(0, OffsetY - ViewportHeight / 2);
+ _offsetTop = MIN(_offsetTop, _height - ViewportHeight);
_targetOffsetLeft = _offsetLeft;
_targetOffsetTop = _offsetTop;
@@ -1914,8 +1914,8 @@ HRESULT CAdScene::ScSetProperty(const char *Name, CScValue *Value) {
int ViewportWidth, ViewportHeight;
GetViewportSize(&ViewportWidth, &ViewportHeight);
- _offsetLeft = std::max(0, _offsetLeft - ViewportWidth / 2);
- _offsetLeft = std::min(_offsetLeft, _width - ViewportWidth);
+ _offsetLeft = MAX(0, _offsetLeft - ViewportWidth / 2);
+ _offsetLeft = MIN(_offsetLeft, _width - ViewportWidth);
_targetOffsetLeft = _offsetLeft;
return S_OK;
@@ -1930,8 +1930,8 @@ HRESULT CAdScene::ScSetProperty(const char *Name, CScValue *Value) {
int ViewportWidth, ViewportHeight;
GetViewportSize(&ViewportWidth, &ViewportHeight);
- _offsetTop = std::max(0, _offsetTop - ViewportHeight / 2);
- _offsetTop = std::min(_offsetTop, _height - ViewportHeight);
+ _offsetTop = MAX(0, _offsetTop - ViewportHeight / 2);
+ _offsetTop = MIN(_offsetTop, _height - ViewportHeight);
_targetOffsetTop = _offsetTop;
return S_OK;
diff --git a/engines/wintermute/AdSentence.cpp b/engines/wintermute/AdSentence.cpp
index cd5fc5d754..9665f36d1e 100644
--- a/engines/wintermute/AdSentence.cpp
+++ b/engines/wintermute/AdSentence.cpp
@@ -183,9 +183,9 @@ HRESULT CAdSentence::Display() {
}
- x = std::max(x, 0);
- x = std::min(x, Game->_renderer->_width - _width);
- y = std::max(y, 0);
+ x = MAX(x, 0);
+ x = MIN(x, Game->_renderer->_width - _width);
+ y = MAX(y, 0);
_font->DrawText((byte *)_text, x, y, _width, _align);
}
diff --git a/engines/wintermute/AdTalkHolder.cpp b/engines/wintermute/AdTalkHolder.cpp
index 05d2c46059..5fc5a40388 100644
--- a/engines/wintermute/AdTalkHolder.cpp
+++ b/engines/wintermute/AdTalkHolder.cpp
@@ -26,6 +26,7 @@
* Copyright (c) 2011 Jan Nedoma
*/
+#define FORBIDDEN_SYMBOL_EXCEPTION_rand
#include "dcgf.h"
#include "AdTalkHolder.h"
#include "BDynBuffer.h"
diff --git a/engines/wintermute/AdWaypointGroup.cpp b/engines/wintermute/AdWaypointGroup.cpp
index c68a7e3101..d85304b6f5 100644
--- a/engines/wintermute/AdWaypointGroup.cpp
+++ b/engines/wintermute/AdWaypointGroup.cpp
@@ -33,6 +33,8 @@
#include "BGame.h"
#include "BRegion.h"
#include "BFileManager.h"
+#include <limits.h>
+
namespace WinterMute {
IMPLEMENT_PERSISTENT(CAdWaypointGroup, false)
diff --git a/engines/wintermute/BFileManager.cpp b/engines/wintermute/BFileManager.cpp
index e3e5986b88..f3290afdca 100644
--- a/engines/wintermute/BFileManager.cpp
+++ b/engines/wintermute/BFileManager.cpp
@@ -27,7 +27,7 @@
*/
-
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
#include "dcgf.h"
#include "BFileManager.h"
#include "StringUtil.h"
@@ -50,18 +50,18 @@
#include "common/system.h"
#include "common/fs.h"
#include "common/file.h"
-
+/*
#ifdef __WIN32__
# include <direct.h>
#else
# include <unistd.h>
#endif
-
+*/
/*#ifdef __APPLE__
# include <CoreFoundation/CoreFoundation.h>
#endif*/
-
+/*
#if _DEBUG
#pragma comment(lib, "zlib_d.lib")
#else
@@ -73,7 +73,7 @@ extern "C"
{
#include "zlib.h"
}
-
+*/
namespace WinterMute {
//////////////////////////////////////////////////////////////////////
@@ -731,23 +731,23 @@ Common::File *CBFileManager::OpenSingleFile(const char *Name) {
bool CBFileManager::GetFullPath(const char *Filename, char *Fullname) {
RestoreCurrentDir();
- FILE *f = NULL;
+ Common::File f;
bool found = false;
for (int i = 0; i < _singlePaths.GetSize(); i++) {
sprintf(Fullname, "%s%s", _singlePaths[i], Filename);
- f = fopen(Fullname, "rb");
- if (f) {
- fclose(f);
+ f.open(Fullname);
+ if (f.isOpen()) {
+ f.close();
found = true;
break;
}
}
if (!found) {
- f = fopen(Filename, "rb");
- if (f) {
- fclose(f);
+ f.open(Filename);
+ if (f.isOpen()) {
+ f.close();
found = true;
strcpy(Fullname, Filename);
}
diff --git a/engines/wintermute/BFileManager.h b/engines/wintermute/BFileManager.h
index 7b487674f5..c7363de04e 100644
--- a/engines/wintermute/BFileManager.h
+++ b/engines/wintermute/BFileManager.h
@@ -30,7 +30,7 @@
#define WINTERMUTE_BFILEMANAGER_H
-#include <map>
+//#include <map>
#include "coll_templ.h"
#include "BFileEntry.h"
#include "common/archive.h"
diff --git a/engines/wintermute/BFontBitmap.cpp b/engines/wintermute/BFontBitmap.cpp
index caa0fb8bf1..46e66ae84c 100644
--- a/engines/wintermute/BFontBitmap.cpp
+++ b/engines/wintermute/BFontBitmap.cpp
@@ -508,7 +508,7 @@ HRESULT CBFontBitmap::GetWidths() {
if (xxx + col < 0 || xxx + col >= surf->GetWidth() || yyy + row < 0 || yyy + row >= surf->GetHeight()) continue;
if (!surf->IsTransparentAtLite(xxx + col, yyy + row)) {
//min_col = col;
- min_col = std::max(col, min_col);
+ min_col = MAX(col, min_col);
break;
}
}
diff --git a/engines/wintermute/BFontTT.cpp b/engines/wintermute/BFontTT.cpp
index 2fdaf7b128..a9495834b3 100644
--- a/engines/wintermute/BFontTT.cpp
+++ b/engines/wintermute/BFontTT.cpp
@@ -44,6 +44,7 @@
#include "PlatformSDL.h"
#include "graphics/fonts/ttf.h"
#include "graphics/fontman.h"
+#include <limits.h>
namespace WinterMute {
@@ -281,7 +282,7 @@ CBSurface *CBFontTT::RenderTextToTexture(const WideString &text, int width, TTex
GlyphInfo *glyph = _glyphCache->GetGlyph(ch);
if (!glyph) continue;
- textOffset = std::max(textOffset, glyph->GetBearingY());
+ textOffset = MAX(textOffset, glyph->GetBearingY());
}
@@ -811,7 +812,7 @@ void CBFontTT::MeasureText(const WideString &text, int maxWidth, int maxHeight,
TextLineList::iterator it;
for (it = lines.begin(); it != lines.end(); ++it) {
TextLine *line = (*it);
- textWidth = std::max(textWidth, line->GetWidth());
+ textWidth = MAX(textWidth, line->GetWidth());
SAFE_DELETE(line);
}
}
diff --git a/engines/wintermute/BGame.cpp b/engines/wintermute/BGame.cpp
index e210b3299c..e3ec86aafc 100644
--- a/engines/wintermute/BGame.cpp
+++ b/engines/wintermute/BGame.cpp
@@ -1336,10 +1336,10 @@ HRESULT CBGame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisS
Stack->CorrectParams(2);
int x = Stack->Pop()->GetInt();
int y = Stack->Pop()->GetInt();
- x = std::max(x, 0);
- x = std::min(x, _renderer->_width);
- y = std::max(y, 0);
- y = std::min(y, _renderer->_height);
+ x = MAX(x, 0);
+ x = MIN(x, _renderer->_width);
+ y = MAX(y, 0);
+ y = MIN(y, _renderer->_height);
POINT p;
p.x = x + _renderer->_drawOffsetX;
p.y = y + _renderer->_drawOffsetY;
@@ -2623,7 +2623,7 @@ HRESULT CBGame::ScSetProperty(const char *Name, CScValue *Value) {
//////////////////////////////////////////////////////////////////////////
else if (strcmp(Name, "SoundBufferSize") == 0) {
_soundBufferSizeSec = Value->GetInt();
- _soundBufferSizeSec = std::max(3, _soundBufferSizeSec);
+ _soundBufferSizeSec = MAX(3, _soundBufferSizeSec);
return S_OK;
}
@@ -4373,11 +4373,11 @@ void CBGame::GetMousePos(POINT *Pos) {
if (_mouseLockRect.left != 0 && _mouseLockRect.right != 0 && _mouseLockRect.top != 0 && _mouseLockRect.bottom != 0) {
if (!CBPlatform::PtInRect(&_mouseLockRect, *Pos)) {
- Pos->x = std::max(_mouseLockRect.left, Pos->x);
- Pos->y = std::max(_mouseLockRect.top, Pos->y);
+ Pos->x = MAX(_mouseLockRect.left, Pos->x);
+ Pos->y = MAX(_mouseLockRect.top, Pos->y);
- Pos->x = std::min(_mouseLockRect.right, Pos->x);
- Pos->y = std::min(_mouseLockRect.bottom, Pos->y);
+ Pos->x = MIN(_mouseLockRect.right, Pos->x);
+ Pos->y = MIN(_mouseLockRect.bottom, Pos->y);
POINT NewPos = *Pos;
diff --git a/engines/wintermute/BPersistMgr.cpp b/engines/wintermute/BPersistMgr.cpp
index bc825ac385..4004375daf 100644
--- a/engines/wintermute/BPersistMgr.cpp
+++ b/engines/wintermute/BPersistMgr.cpp
@@ -177,10 +177,10 @@ HRESULT CBPersistMgr::InitSave(const char *Desc) {
PutDWORD(DataOffset);
PutString(Desc);
-
- time_t Timestamp;
+// TODO: Add usefull timestamps, we can't use ctime...
+/* time_t Timestamp;
time(&Timestamp);
- PutDWORD((uint32)Timestamp);
+ PutDWORD((uint32)Timestamp);*/
}
return res;
}
diff --git a/engines/wintermute/BRegion.cpp b/engines/wintermute/BRegion.cpp
index f7c4812d3e..4f71975c39 100644
--- a/engines/wintermute/BRegion.cpp
+++ b/engines/wintermute/BRegion.cpp
@@ -36,6 +36,7 @@
#include "engines/wintermute/scriptables/ScValue.h"
#include "engines/wintermute/BFileManager.h"
#include "engines/wintermute/PlatformSDL.h"
+#include <limits.h>
namespace WinterMute {
@@ -443,9 +444,9 @@ bool CBRegion::PtInPolygon(int X, int Y) {
p2.x = (double)_points[i % _points.GetSize()]->x;
p2.y = (double)_points[i % _points.GetSize()]->y;
- if (p.y > std::min(p1.y, p2.y)) {
- if (p.y <= std::max(p1.y, p2.y)) {
- if (p.x <= std::max(p1.x, p2.x)) {
+ if (p.y > MIN(p1.y, p2.y)) {
+ if (p.y <= MAX(p1.y, p2.y)) {
+ if (p.x <= MAX(p1.x, p2.x)) {
if (p1.y != p2.y) {
xinters = (p.y - p1.y) * (p2.x - p1.x) / (p2.y - p1.y) + p1.x;
if (p1.x == p2.x || p.x <= xinters)
@@ -471,11 +472,11 @@ HRESULT CBRegion::GetBoundingRect(RECT *Rect) {
int MinX = INT_MAX, MinY = INT_MAX, MaxX = INT_MIN, MaxY = INT_MIN;
for (int i = 0; i < _points.GetSize(); i++) {
- MinX = std::min(MinX, _points[i]->x);
- MinY = std::min(MinY, _points[i]->y);
+ MinX = MIN(MinX, _points[i]->x);
+ MinY = MIN(MinY, _points[i]->y);
- MaxX = std::max(MaxX, _points[i]->x);
- MaxY = std::max(MaxY, _points[i]->y);
+ MaxX = MAX(MaxX, _points[i]->x);
+ MaxY = MAX(MaxY, _points[i]->y);
}
CBPlatform::SetRect(Rect, MinX, MinY, MaxX, MaxY);
}
diff --git a/engines/wintermute/BSprite.cpp b/engines/wintermute/BSprite.cpp
index f24ee23a78..05ccc9c397 100644
--- a/engines/wintermute/BSprite.cpp
+++ b/engines/wintermute/BSprite.cpp
@@ -278,8 +278,8 @@ HRESULT CBSprite::LoadBuffer(byte *Buffer, bool Complete, int LifeTime, TSprite
case TOKEN_EDITOR_BG_ALPHA:
parser.ScanStr((char *)params, "%d", &_editorBgAlpha);
- _editorBgAlpha = std::min(_editorBgAlpha, 255);
- _editorBgAlpha = std::max(_editorBgAlpha, 0);
+ _editorBgAlpha = MIN(_editorBgAlpha, 255);
+ _editorBgAlpha = MAX(_editorBgAlpha, 0);
break;
case TOKEN_FRAME: {
diff --git a/engines/wintermute/PartEmitter.cpp b/engines/wintermute/PartEmitter.cpp
index 79bfa8a5b2..a184a46e40 100644
--- a/engines/wintermute/PartEmitter.cpp
+++ b/engines/wintermute/PartEmitter.cpp
@@ -251,7 +251,7 @@ HRESULT CPartEmitter::UpdateInternal(uint32 CurrentTime, uint32 TimerDelta) {
return S_OK;
}
- int ToGen = std::min(_genAmount, _maxParticles - NumLive);
+ int ToGen = MIN(_genAmount, _maxParticles - NumLive);
while (ToGen > 0) {
int FirstDeadIndex = -1;
for (int i = 0; i < _particles.GetSize(); i++) {
diff --git a/engines/wintermute/UIEdit.cpp b/engines/wintermute/UIEdit.cpp
index 642504e82e..5b222ac831 100644
--- a/engines/wintermute/UIEdit.cpp
+++ b/engines/wintermute/UIEdit.cpp
@@ -579,26 +579,26 @@ HRESULT CUIEdit::Display(int OffsetX, int OffsetY) {
bool CurFirst;
// modify scroll offset
if (_selStart >= _selEnd) {
- while (font->GetTextWidth((byte *)_text + _scrollOffset, std::max(0, _selEnd - _scrollOffset)) > _width - CursorWidth - 2 * _frameWidth) {
+ while (font->GetTextWidth((byte *)_text + _scrollOffset, MAX(0, _selEnd - _scrollOffset)) > _width - CursorWidth - 2 * _frameWidth) {
_scrollOffset++;
if (_scrollOffset >= strlen(_text)) break;
}
- _scrollOffset = std::min(_scrollOffset, _selEnd);
+ _scrollOffset = MIN(_scrollOffset, _selEnd);
s1 = _selEnd;
s2 = _selStart;
CurFirst = true;
} else {
- while (font->GetTextWidth((byte *)_text + _scrollOffset, std::max(0, _selStart - _scrollOffset)) +
- sfont->GetTextWidth((byte *)(_text + std::max(_scrollOffset, _selStart)), _selEnd - std::max(_scrollOffset, _selStart))
+ while (font->GetTextWidth((byte *)_text + _scrollOffset, MAX(0, _selStart - _scrollOffset)) +
+ sfont->GetTextWidth((byte *)(_text + MAX(_scrollOffset, _selStart)), _selEnd - MAX(_scrollOffset, _selStart))
> _width - CursorWidth - 2 * _frameWidth) {
_scrollOffset++;
if (_scrollOffset >= strlen(_text)) break;
}
- _scrollOffset = std::min(_scrollOffset, _selEnd);
+ _scrollOffset = MIN(_scrollOffset, _selEnd);
s1 = _selStart;
s2 = _selEnd;
@@ -616,7 +616,7 @@ HRESULT CUIEdit::Display(int OffsetX, int OffsetY) {
yyy = _posY + _frameWidth + OffsetY;
width = _posX + _width + OffsetX - _frameWidth;
- height = std::max(font->GetLetterHeight(), sfont->GetLetterHeight());
+ height = MAX(font->GetLetterHeight(), sfont->GetLetterHeight());
if (Game->_textRTL) xxx += AlignOffset;
@@ -645,7 +645,7 @@ HRESULT CUIEdit::Display(int OffsetX, int OffsetY) {
}
// selected
- int s3 = std::max(s1, _scrollOffset);
+ int s3 = MAX(s1, _scrollOffset);
if (s2 - s3 > 0) {
if (Count) sfont->DrawText((byte *)_text + s3, xxx, yyy, width - xxx, Align, height, s2 - s3);
@@ -710,7 +710,7 @@ bool CUIEdit::HandleKeypress(Common::Event *event) {
if (Game->_textRTL) DeleteChars(_selStart, _selStart + 1);
else DeleteChars(_selStart - 1, _selStart);
} else DeleteChars(_selStart, _selEnd);
- if (_selEnd >= _selStart) _selEnd -= std::max(1, _selEnd - _selStart);
+ if (_selEnd >= _selStart) _selEnd -= MAX(1, _selEnd - _selStart);
_selStart = _selEnd;
Handled = true;
@@ -798,7 +798,7 @@ int CUIEdit::DeleteChars(int Start, int End) {
char *str = new char[strlen(_text) - (End - Start) + 1];
if (str) {
if (Start > 0) memcpy(str, _text, Start);
- memcpy(str + std::max(0, Start), _text + End, strlen(_text) - End + 1);
+ memcpy(str + MAX(0, Start), _text + End, strlen(_text) - End + 1);
delete[] _text;
_text = str;
diff --git a/engines/wintermute/scriptables/SXArray.cpp b/engines/wintermute/scriptables/SXArray.cpp
index 7ac7dd5460..0dd620c487 100644
--- a/engines/wintermute/scriptables/SXArray.cpp
+++ b/engines/wintermute/scriptables/SXArray.cpp
@@ -209,7 +209,7 @@ HRESULT CSXArray::Persist(CBPersistMgr *PersistMgr) {
bool CSXArray::ValidNumber(const char *OrigStr, char *OutStr) {
bool IsNumber = true;
for (int i = 0; i < strlen(OrigStr); i++) {
- if (!isdigit(OrigStr[i])) {
+ if (!(OrigStr[i] >= '0' && OrigStr[i] <= '9')) {
IsNumber = false;
break;
}
diff --git a/engines/wintermute/scriptables/SXMemBuffer.cpp b/engines/wintermute/scriptables/SXMemBuffer.cpp
index 9aea2b0c4c..730108e4a4 100644
--- a/engines/wintermute/scriptables/SXMemBuffer.cpp
+++ b/engines/wintermute/scriptables/SXMemBuffer.cpp
@@ -26,6 +26,10 @@
* Copyright (c) 2011 Jan Nedoma
*/
+#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
+#define FORBIDDEN_SYMBOL_EXCEPTION_fopen
+#define FORBIDDEN_SYMBOL_EXCEPTION_fwrite
+#define FORBIDDEN_SYMBOL_EXCEPTION_fclose
#include "engines/wintermute/BScriptable.h"
#include "engines/wintermute/scriptables/ScStack.h"
#include "engines/wintermute/scriptables/ScScript.h"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 06:37:23 +0000