libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-13 15:40:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: Fix compiler warnings

Browse Source
This commit is contained in:
Paul Gilbert 2016-08-29 20:03:00 -04:00
parent e7f6ccbece
commit c135643699
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engines/titanic/game/speech_dispensor.cpp
View File

@ -62,7 +62,7 @@ void CSpeechDispensor::load(SimpleFile *file) {
}
bool CSpeechDispensor::FrameMsg(CFrameMsg *msg) {
if (_fieldEC || _seasonNum == 0 || _seasonNum == 3)
if (_fieldEC || _seasonNum == SEASON_SUMMER || _seasonNum == SEASON_SPRING)
return true;
CGameObject *dragObject = getDraggingObject();
@ -79,7 +79,8 @@ bool CSpeechDispensor::FrameMsg(CFrameMsg *msg) {
if (_dragItem) {
Point pt(_itemPos.x + _dragItem->_bounds.left,
_itemPos.y + _dragItem->_bounds.top);
bool flag = checkPoint(pt, true);
if (!checkPoint(pt, true))
return true;
switch (_state) {
case 0:

2
engines/titanic/support/font.cpp
View File

@ -206,7 +206,7 @@ void STFont::writeString(CVideoSurface *surface, const Point &destPos, Rect &cli
}
// Iterate through each character of the string
for (const byte *srcP = (byte *)str.c_str(); *srcP; ++srcP) {
for (const byte *srcP = (const byte *)str.c_str(); *srcP; ++srcP) {
byte c = *srcP;
if (c == 0xE9)
c = '$';