[Scummvm-cvs-logs] scummvm master -> 60cd621b744d07618f77bcd7477588c6b05ef049
m-kiewitz
m_kiewitz at users.sourceforge.net
Sun Jan 31 23:13:51 CET 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
60cd621b74 AGI: fix warnings
Commit: 60cd621b744d07618f77bcd7477588c6b05ef049
https://github.com/scummvm/scummvm/commit/60cd621b744d07618f77bcd7477588c6b05ef049
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-01-31T23:13:19+01:00
Commit Message:
AGI: fix warnings
Changed paths:
engines/agi/font.cpp
engines/agi/picture.cpp
engines/agi/picture.h
engines/agi/systemui.cpp
diff --git a/engines/agi/font.cpp b/engines/agi/font.cpp
index 2ee3e64..5f1f079 100644
--- a/engines/agi/font.cpp
+++ b/engines/agi/font.cpp
@@ -1042,8 +1042,8 @@ void GfxFont::loadFontAtariST(Common::String fontFilename) {
uint16 header_MaxWidth = 0;
uint16 header_MaxHeight = 0;
uint16 header_Flags = 0;
- uint32 header_OffsetOfCharOffsets = 0;
- uint32 header_OffsetOfFontData = 0;
+ //uint32 header_OffsetOfCharOffsets = 0;
+ //uint32 header_OffsetOfFontData = 0;
uint16 header_FormWidth = 0;
uint16 header_FormHeight = 0;
uint16 totalCharacterCount = 0;
@@ -1084,8 +1084,8 @@ void GfxFont::loadFontAtariST(Common::String fontFilename) {
// bit 2 - byte orientation word is high->low
// bit 3 - mono spaced font
fontFile.skip(4); // horizontal table offset
- header_OffsetOfCharOffsets = fontFile.readUint32BE();
- header_OffsetOfFontData = fontFile.readUint32BE();
+ fontFile.skip(4); // header_OffsetOfCharOffsets = fontFile.readUint32BE();
+ fontFile.skip(4); // header_OffsetOfFontData = fontFile.readUint32BE();
header_FormWidth = fontFile.readUint16BE();
header_FormHeight = fontFile.readUint16BE();
fontFile.skip(4); // pointer to next font
diff --git a/engines/agi/picture.cpp b/engines/agi/picture.cpp
index 965145c..40fb8ea 100644
--- a/engines/agi/picture.cpp
+++ b/engines/agi/picture.cpp
@@ -906,7 +906,7 @@ int PictureMgr::draw_FillCheck(int16 x, int16 y) {
* @param clear clear AGI screen before drawing
* @param agi256 load an AGI256 picture resource
*/
-int PictureMgr::decodePicture(int16 resourceNr, bool clear, bool agi256, int16 pic_width, int16 pic_height) {
+int PictureMgr::decodePicture(int16 resourceNr, bool clearScreen, bool agi256, int16 pic_width, int16 pic_height) {
debugC(8, kDebugLevelResources, "(%d)", resourceNr);
_patCode = 0;
@@ -924,7 +924,7 @@ int PictureMgr::decodePicture(int16 resourceNr, bool clear, bool agi256, int16 p
_width = pic_width;
_height = pic_height;
- if (clear && !agi256) { // 256 color pictures should always fill the whole screen, so no clearing for them.
+ if (clearScreen && !agi256) { // 256 color pictures should always fill the whole screen, so no clearing for them.
_gfx->clear(15, 4); // Clear 16 color AGI screen (Priority 4, color white).
}
@@ -934,9 +934,9 @@ int PictureMgr::decodePicture(int16 resourceNr, bool clear, bool agi256, int16 p
drawPictureAGI256();
}
- if (clear)
+ if (clearScreen)
_vm->clearImageStack();
- _vm->recordImageStackCall(ADD_PIC, resourceNr, clear, agi256, 0, 0, 0, 0);
+ _vm->recordImageStackCall(ADD_PIC, resourceNr, clearScreen, agi256, 0, 0, 0, 0);
return errOK;
}
diff --git a/engines/agi/picture.h b/engines/agi/picture.h
index b1a272b..a3d167e 100644
--- a/engines/agi/picture.h
+++ b/engines/agi/picture.h
@@ -76,7 +76,7 @@ private:
public:
void putVirtPixel(int x, int y);
- int decodePicture(int16 resourceNr, bool clear, bool agi256 = false, int16 pic_width = _DEFAULT_WIDTH, int16 pic_height = _DEFAULT_HEIGHT);
+ int decodePicture(int16 resourceNr, bool clearScreen, bool agi256 = false, int16 pic_width = _DEFAULT_WIDTH, int16 pic_height = _DEFAULT_HEIGHT);
int decodePicture(byte* data, uint32 length, int clear, int pic_width = _DEFAULT_WIDTH, int pic_height = _DEFAULT_HEIGHT);
int unloadPicture(int);
void drawPicture();
diff --git a/engines/agi/systemui.cpp b/engines/agi/systemui.cpp
index dc83c4d..0eb7d76 100644
--- a/engines/agi/systemui.cpp
+++ b/engines/agi/systemui.cpp
@@ -81,31 +81,6 @@ SystemUI::SystemUI(AgiEngine *vm, GfxMgr *gfx, TextMgr *text) {
_textRestoreGameSelectSlot = "\x91 \xAF\xAE\xAC\xAE\xE9\xEC\xEE \xAA\xAB\xA0\xA2\xA8\xE8 \xAA\xE3\xE0\xE1\xAE\xE0\xA0 \xA2\xEB\xA1\xA5\xE0\xA8\xE2\xA5 \xA8\xA3\xE0\xE3, \xAA\xAE\xE2\xAE\xE0\xE3\xEE \xA2\xEB \xA6\xA5\xAB\xA0\xA5\xE2\xA5 \xE1\xE7\xA8\xE2\xA0\xE2\xEC. \x8D\xA0\xA6\xAC\xA8\xE2\xA5 ENTER \xA4\xAB\xEF \xE1\xE7\xA8\xE2\xEB\xA2\xA0\xAD\xA8\xEF \xA8\xA3\xE0\xEB, ESC - \xA4\xAB\xEF \xAE\xE2\xAC\xA5\xAD\xEB.";
_textRestoreGameError ="\x8E\xE8\xA8\xA1\xAA\xA0 \xA2 \xA7\xA0\xAF\xA8\xE1\xA0\xAD\xAD\xAE\xA9 \xA8\xA3\xE0\xA5.\nENTER - \xA2\xEB\xE5\xAE\xA4.";
_textRestoreGameVerify = "\x83\xAE\xE2\xAE\xA2 \xAA \xE1\xE7\xA8\xE2\xEB\xA2\xA0\xAD\xA8\xEE \xA8\xA3\xE0\xEB\x2C\n\xAE\xAF\xA8\xE1\xA0\xAD\xAD\xAE\xA9 \xAA\xA0\xAA.\n\n%s\n\n\x84\xAB\xEF \xAF\xE0\xAE\xA4\xAE\xAB\xA6\xA5\xAD\xA8\xEF \xAD\xA0\xA6\xAC\xA8\xE2\xA5 ENTER.\nESC - \xAE\xE2\xAC\xA5\xAD\xA0.";
-
-//Press ENTER to continue...
-//"\x84\xAB\xEF \xAF\xE0\xAE\xA4\xAE\xAB\xA6\xA5\xAD\xA8\xEF \xAD\xA0\xA6\xAC\xA8\xE2\xA5 ENTER\nESC - \xAE\xE2\xAC\xA5\xAD\xA0.";
-
-// nothing inventory
-// "\xAD\xA8\xE7\xA5\xA3\xAE
-
-// you are carrying
-// " \x93 \xA2\xA0\xE1 \xA5\xE1\xE2\xEC\x3A "
-
-// Press enter to select
-// "ENTER - \xA2\xEB\xA1\xAE\xE0, ESC - \xAE\xE2\xAC\xA5\xAD\xA0.";
-
-// Press a key to return
-// "\x8B\xEE\xA1\xA0\xEF \xAA\xAB\xA0\xA2\xA8\xE8\xA0 - \xA2\xAE\xA7\xA2\xE0\xA0\xE2 \xA2 \xA8\xA3\xE0\xE3";
-
-// Score %d %d
-// "\x91\xE7\xA5\xE2\x3A %d \xA8\xA7 %d "
-
-// Sound: on/off
-// "\x87\xA2\xE3\xAA\x3A\xA2%s"
-// "\xAA\xAB "
-// "\xEB\xAA\xAB"
-
-
break;
default:
break;
@@ -653,9 +628,9 @@ bool SystemUI::askForSavedGameVerification(const char *verifyText, const char *d
return true;
break;
default:
- return false;
break;
}
+ return false;
}
} // End of namespace Agi
More information about the Scummvm-git-logs
mailing list