[Scummvm-git-logs] scummvm master -> 1cae66c1288635c8467b120d880305debd96bde9
waltervn
walter at vanniftrik-it.nl
Mon May 27 23:50:02 CEST 2019
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:
1cae66c128 Revert "ADL: Fix MSVC warnings"
Commit: 1cae66c1288635c8467b120d880305debd96bde9
https://github.com/scummvm/scummvm/commit/1cae66c1288635c8467b120d880305debd96bde9
Author: Walter van Niftrik (walter at scummvm.org)
Date: 2019-05-27T20:18:28+02:00
Commit Message:
Revert "ADL: Fix MSVC warnings"
This reverts commit e412bf5ee44c7c1fb2be634e9db6aaa2322818e3.
Changed paths:
engines/adl/adl.cpp
engines/adl/display.cpp
engines/adl/display.h
engines/adl/hires1.cpp
engines/adl/hires6.cpp
diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp
index d866af6..17fdd28 100644
--- a/engines/adl/adl.cpp
+++ b/engines/adl/adl.cpp
@@ -119,7 +119,7 @@ Common::String AdlEngine::readString(Common::ReadStream &stream, byte until) con
break;
str += b;
- }
+ };
return str;
}
@@ -209,13 +209,21 @@ Common::String AdlEngine::inputString(byte prompt) const {
return s;
}
- if (b < 0xa0 && b == (Common::KEYCODE_BACKSPACE | 0x80) && !s.empty()) {
- _display->moveCursorBackward();
- _display->setCharAtCursor(APPLEBYTE(' '));
- s.deleteLastChar();
- } else if (s.size() < 255) {
- s += b;
- _display->printString(Common::String(b));
+ if (b < 0xa0) {
+ switch (b) {
+ case Common::KEYCODE_BACKSPACE | 0x80:
+ if (!s.empty()) {
+ _display->moveCursorBackward();
+ _display->setCharAtCursor(APPLECHAR(' '));
+ s.deleteLastChar();
+ }
+ break;
+ };
+ } else {
+ if (s.size() < 255) {
+ s += b;
+ _display->printString(Common::String(b));
+ }
}
}
}
@@ -225,7 +233,7 @@ byte AdlEngine::inputKey(bool showCursor) const {
// If debug script is active, we fake a return press for the text overflow handling
if (_inputScript && !_scriptPaused)
- return APPLEBYTE('\r');
+ return APPLECHAR('\r');
if (showCursor)
_display->showCursor(true);
@@ -244,12 +252,12 @@ byte AdlEngine::inputKey(bool showCursor) const {
default:
if (event.kbd.ascii >= 0x20 && event.kbd.ascii < 0x80)
key = convertKey(event.kbd.ascii);
- }
+ };
}
// If debug script was activated in the meantime, abort input
if (_inputScript && !_scriptPaused)
- return APPLEBYTE('\r');
+ return APPLECHAR('\r');
_display->updateTextScreen();
g_system->delayMillis(16);
@@ -909,11 +917,11 @@ Common::Error AdlEngine::saveGameState(int slot, const Common::String &desc) {
char name[SAVEGAME_NAME_LEN] = { };
if (!desc.empty())
- Common::strlcpy(name, desc.c_str(), sizeof(name) - 1);
+ strncpy(name, desc.c_str(), sizeof(name) - 1);
else {
Common::String defaultName("Save ");
defaultName += 'A' + slot;
- Common::strlcpy(name, defaultName.c_str(), sizeof(name) - 1);
+ strncpy(name, defaultName.c_str(), sizeof(name) - 1);
}
outFile->write(name, sizeof(name));
@@ -984,7 +992,7 @@ byte AdlEngine::convertKey(uint16 ascii) const {
Common::String AdlEngine::getLine() {
while (1) {
- Common::String line = inputString(APPLEBYTE('?'));
+ Common::String line = inputString(APPLECHAR('?'));
if (shouldQuit() || _isRestoring)
return Common::String();
@@ -1020,10 +1028,8 @@ Common::String AdlEngine::getWord(const Common::String &line, uint &index) const
// Copy up to 8 characters
while (1) {
- if (copied < 8) {
- str.setChar(line[index], copied);
- copied++;
- }
+ if (copied < 8)
+ str.setChar(line[index], copied++);
index++;
diff --git a/engines/adl/display.cpp b/engines/adl/display.cpp
index a1a1f6f..52fb1b4 100644
--- a/engines/adl/display.cpp
+++ b/engines/adl/display.cpp
@@ -383,9 +383,6 @@ static byte processColorBits(uint16 &bits, bool &odd, bool secondPal) {
break;
case 0x5: // 101 (color)
color = 2 + !odd;
- break;
- default:
- break;
}
if (secondPal)
@@ -480,9 +477,9 @@ static void renderPixelRowMono(byte *dst, byte *src) {
static void copyEvenSurfaceRows(Graphics::Surface &surf) {
byte *src = (byte *)surf.getPixels();
- for (uint16 y = 0; y < surf.h / 2; ++y) {
+ for (uint y = 0; y < surf.h / 2; ++y) {
byte *dst = src + surf.pitch;
- for (uint16 x = 0; x < surf.w; ++x)
+ for (uint x = 0; x < surf.w; ++x)
dst[x] = ALTCOL(src[x]);
src += surf.pitch * 2;
}
@@ -556,8 +553,8 @@ void Display::createFont() {
byte *buf = (byte *)_font->getPixels();
byte *bufInv = buf + (_font->h / 2) * _font->pitch;
- for (uint16 row = 0; row < _font->h / 2; row += 2) {
- for (uint16 col = 0; col < _font->w; ++col)
+ for (uint row = 0; row < _font->h / 2; row += 2) {
+ for (uint col = 0; col < _font->w; ++col)
bufInv[col] = (buf[col] ? 0 : 1);
buf += _font->pitch * 2;
diff --git a/engines/adl/display.h b/engines/adl/display.h
index 08e6f4c..c1c0f41 100644
--- a/engines/adl/display.h
+++ b/engines/adl/display.h
@@ -52,7 +52,6 @@ enum DisplayMode {
};
#define APPLECHAR(C) ((char)((C) | 0x80))
-#define APPLEBYTE(C) ((byte)((C) | 0x80))
class Display {
public:
diff --git a/engines/adl/hires1.cpp b/engines/adl/hires1.cpp
index 39aec93..2cf2931 100644
--- a/engines/adl/hires1.cpp
+++ b/engines/adl/hires1.cpp
@@ -398,7 +398,7 @@ void HiRes1Engine::printString(const Common::String &str) {
Common::String HiRes1Engine::loadMessage(uint idx) const {
StreamPtr stream(_messages[idx]->createReadStream());
- return readString(*stream, APPLEBYTE('\r')) + APPLEBYTE('\r');
+ return readString(*stream, APPLECHAR('\r')) + APPLECHAR('\r');
}
void HiRes1Engine::printMessage(uint idx) {
diff --git a/engines/adl/hires6.cpp b/engines/adl/hires6.cpp
index 3093b14..5cbca1c 100644
--- a/engines/adl/hires6.cpp
+++ b/engines/adl/hires6.cpp
@@ -214,7 +214,7 @@ void HiRes6Engine::runIntro() {
error("Failed to open disk volume 0");
stream.reset(files->createReadStream("\010\010\010\010\010\010"));
- Common::String copyright(readStringAt(*stream, 0x103, APPLEBYTE('\r')));
+ Common::String copyright(readStringAt(*stream, 0x103, APPLECHAR('\r')));
delete files;
More information about the Scummvm-git-logs
mailing list