[Scummvm-git-logs] scummvm master -> 2474d96709dd78bb82df96dadc6d7c39c4d3279c
athrxx
noreply at scummvm.org
Mon Sep 26 17:59:55 UTC 2022
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:
2474d96709 KYRA: more coding style cleanup
Commit: 2474d96709dd78bb82df96dadc6d7c39c4d3279c
https://github.com/scummvm/scummvm/commit/2474d96709dd78bb82df96dadc6d7c39c4d3279c
Author: athrxx (athrxx at scummvm.org)
Date: 2022-09-26T19:59:35+02:00
Commit Message:
KYRA: more coding style cleanup
Changed paths:
engines/kyra/graphics/screen.cpp
engines/kyra/graphics/screen.h
engines/kyra/graphics/screen_eob_amiga.cpp
engines/kyra/graphics/vqa.cpp
engines/kyra/sequence/sequences_darkmoon.cpp
engines/kyra/text/text_hof.cpp
engines/kyra/text/text_mr.cpp
diff --git a/engines/kyra/graphics/screen.cpp b/engines/kyra/graphics/screen.cpp
index d11216536c3..024d6def606 100644
--- a/engines/kyra/graphics/screen.cpp
+++ b/engines/kyra/graphics/screen.cpp
@@ -61,6 +61,7 @@ Screen::Screen(KyraEngine_v1 *vm, OSystem *system, const ScreenDim *dimTable, co
memset(_shapePages, 0, sizeof(_shapePages));
memset(_fonts, 0, sizeof(_fonts));
+ _pagePtrsBuff = nullptr;
memset(_pagePtrs, 0, sizeof(_pagePtrs));
memset(_pageMapping, 0, sizeof(_pageMapping));
memset(_sjisOverlayPtrs, 0, sizeof(_sjisOverlayPtrs));
@@ -102,7 +103,7 @@ Screen::~Screen() {
for (int i = 0; i < SCREEN_OVLS_NUM; ++i)
delete[] _sjisOverlayPtrs[i];
- delete[] _pagePtrs[0];
+ delete[] _pagePtrsBuff;
for (int f = 0; f < ARRAYSIZE(_fonts); ++f)
delete _fonts[f];
@@ -556,7 +557,7 @@ void Screen::setScreenDim(int dim) {
void Screen::resetPagePtrsAndBuffers(int pageSize) {
_screenPageSize = pageSize;
- delete[] _pagePtrs[0];
+ delete[] _pagePtrsBuff;
memset(_pagePtrs, 0, sizeof(_pagePtrs));
Common::Array<uint8> realPages;
@@ -567,15 +568,15 @@ void Screen::resetPagePtrsAndBuffers(int pageSize) {
int numPages = realPages.size();
uint32 bufferSize = numPages * _screenPageSize;
-
- uint8 *pagePtr = new uint8[bufferSize]();
- uint8 *pos = pagePtr;
+
+ uint8 *pos = new uint8[bufferSize]();
+ _pagePtrsBuff = pos;
memset(_pagePtrs, 0, sizeof(_pagePtrs));
for (int i = 0; i < SCREEN_PAGE_NUM; i++) {
if (_pagePtrs[_pageMapping[i]]) {
_pagePtrs[i] = _pagePtrs[_pageMapping[i]];
- } else if (pos < &pagePtr[bufferSize]) {
+ } else if (pos < &_pagePtrsBuff[bufferSize]) {
_pagePtrs[i] = pos;
pos += _screenPageSize;
} else {
@@ -695,7 +696,7 @@ void Screen::copyWsaRect(int x, int y, int w, int h, int dimState, int plotFunc,
switch (plotFunc) {
case 0:
memcpy(dst, src, cW);
- dst += cW; src += cW;
+ src += cW;
break;
case 1:
diff --git a/engines/kyra/graphics/screen.h b/engines/kyra/graphics/screen.h
index 03c2c1a6765..dcf694628a7 100644
--- a/engines/kyra/graphics/screen.h
+++ b/engines/kyra/graphics/screen.h
@@ -798,6 +798,7 @@ protected:
template<bool noXor> static void wrapped_decodeFrameDeltaPage(uint8 *dst, const uint8 *src, const int pitch);
uint8 *_pagePtrs[16];
+ const uint8 *_pagePtrsBuff;
uint8 *_sjisOverlayPtrs[SCREEN_OVLS_NUM];
uint8 _pageMapping[SCREEN_PAGE_NUM];
diff --git a/engines/kyra/graphics/screen_eob_amiga.cpp b/engines/kyra/graphics/screen_eob_amiga.cpp
index 798f57066d8..35d338824f5 100644
--- a/engines/kyra/graphics/screen_eob_amiga.cpp
+++ b/engines/kyra/graphics/screen_eob_amiga.cpp
@@ -325,6 +325,7 @@ AmigaDOSFont::TextFont *AmigaDOSFont::loadContentFile(const Common::String fileN
errorDialog(0);
}
+ assert(str);
uint32 hunkId = str->readUint32();
// Except for some sanity checks we skip all of the Amiga hunk file magic
if (hunkId != 0x03f3)
diff --git a/engines/kyra/graphics/vqa.cpp b/engines/kyra/graphics/vqa.cpp
index a5549110858..bf8fd668198 100644
--- a/engines/kyra/graphics/vqa.cpp
+++ b/engines/kyra/graphics/vqa.cpp
@@ -58,7 +58,7 @@ static uint32 readTag(Common::SeekableReadStream *stream) {
return tag;
}
-VQADecoder::VQADecoder() {
+VQADecoder::VQADecoder() : _fileStream(nullptr) {
memset(&_header, 0, sizeof(_header));
}
diff --git a/engines/kyra/sequence/sequences_darkmoon.cpp b/engines/kyra/sequence/sequences_darkmoon.cpp
index 1eb5893dba5..824283c23f3 100644
--- a/engines/kyra/sequence/sequences_darkmoon.cpp
+++ b/engines/kyra/sequence/sequences_darkmoon.cpp
@@ -1176,8 +1176,8 @@ void DarkmoonSequenceHelper::loadScene(int index, int pageNum, bool ignorePalett
}
if (_vm->gameFlags().platform == Common::kPlatformAmiga) {
- // Tolerance for diffenrences up to 2 bytes is needed in some cases
- if ((((int32)(chunkID & 0xFFFF) + 5) & ~3) != (((s->size()) + 3) & ~3))
+ // Tolerance for differences up to 2 bytes is needed in some cases.
+ if (s && ((((int32)(chunkID & 0xFFFF) + 5) & ~3) != (((s->size()) + 3) & ~3)))
isRawData = true;
} else if (file.firstChar() == 'X' && _vm->gameFlags().lang == Common::DE_DEU) {
isRawData = true;
diff --git a/engines/kyra/text/text_hof.cpp b/engines/kyra/text/text_hof.cpp
index f4e87d0793f..34a3197eddc 100644
--- a/engines/kyra/text/text_hof.cpp
+++ b/engines/kyra/text/text_hof.cpp
@@ -536,10 +536,8 @@ void KyraEngine_HoF::processDialogue(int dlgOffset, int vocH, int csEntry) {
objectChat(str, 0, vocHi, vocLo);
} else {
if (activeTimSequence != nextTimSequence) {
- if (activeTimSequence > -1) {
+ if (activeTimSequence > -1)
deinitTalkObject(activeTimSequence);
- activeTimSequence = -1;
- }
initTalkObject(nextTimSequence);
activeTimSequence = nextTimSequence;
}
diff --git a/engines/kyra/text/text_mr.cpp b/engines/kyra/text/text_mr.cpp
index b3e90d8349b..723a161e2f0 100644
--- a/engines/kyra/text/text_mr.cpp
+++ b/engines/kyra/text/text_mr.cpp
@@ -744,7 +744,7 @@ void KyraEngine_MR::processDialog(int vocHighIndex, int vocHighBase, int funcNum
setDlgIndex(vocHighBase);
} else if (cmd == 11) {
int strSize = _cnvFile->readUint16LE();
- vocLow = _cnvFile->readUint16LE();
+ _cnvFile->readUint16LE();
_cnvFile->read(_stringBuffer, strSize);
_stringBuffer[strSize] = 0;
} else {
@@ -762,10 +762,8 @@ void KyraEngine_MR::processDialog(int vocHighIndex, int vocHighBase, int funcNum
if (cmd != 12) {
if (object != script) {
- if (script >= 0) {
+ if (script >= 0)
dialogEndScript(script);
- script = -1;
- }
dialogStartScript(object, funcNum);
script = object;
More information about the Scummvm-git-logs
mailing list