[Scummvm-git-logs] scummvm master -> 6f8aa0b21b90b3940f929708ac65154e8a131f66
athrxx
athrxx at scummvm.org
Sat Aug 29 21:53:19 UTC 2020
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7b66f1191d KYRA: whitespace cleanup
6f8aa0b21b DEVTOOLS: (CREATE_KYRADAT) - whitespace
Commit: 7b66f1191d88edcf1646d107e08c81d127b0bd5a
https://github.com/scummvm/scummvm/commit/7b66f1191d88edcf1646d107e08c81d127b0bd5a
Author: athrxx (athrxx at scummvm.org)
Date: 2020-08-29T23:50:29+02:00
Commit Message:
KYRA: whitespace cleanup
Changed paths:
engines/kyra/engine/chargen.cpp
engines/kyra/engine/darkmoon.cpp
engines/kyra/engine/eob.cpp
engines/kyra/engine/eobcommon.h
engines/kyra/engine/kyra_v1.cpp
engines/kyra/engine/magic_eob.cpp
engines/kyra/engine/scene_eob.cpp
engines/kyra/engine/scene_rpg.cpp
engines/kyra/engine/sprites_eob.cpp
engines/kyra/engine/timer_eob.cpp
engines/kyra/graphics/screen.cpp
engines/kyra/graphics/screen.h
engines/kyra/graphics/screen_eob.cpp
engines/kyra/graphics/screen_eob.h
engines/kyra/graphics/screen_eob_amiga.cpp
engines/kyra/graphics/screen_eob_pc98.cpp
engines/kyra/graphics/screen_eob_segacd.cpp
engines/kyra/gui/debugger.cpp
engines/kyra/gui/gui_eob.cpp
engines/kyra/gui/gui_eob_segacd.cpp
engines/kyra/gui/saveload_eob.cpp
engines/kyra/resource/staticres_eob.cpp
engines/kyra/script/script_eob.cpp
engines/kyra/sequence/seqplayer_eob_segacd.cpp
engines/kyra/sequence/sequences_darkmoon.cpp
engines/kyra/sequence/sequences_eob.cpp
engines/kyra/sound/drivers/audiomaster2.cpp
engines/kyra/sound/drivers/mlalf98.cpp
engines/kyra/sound/drivers/pcspeaker_v1.cpp
engines/kyra/sound/drivers/segacd.cpp
engines/kyra/sound/sound_amiga_eob.cpp
engines/kyra/sound/sound_pc_midi.cpp
engines/kyra/sound/sound_towns_darkmoon.cpp
engines/kyra/text/text_eob_segacd.cpp
engines/kyra/text/text_rpg.cpp
diff --git a/engines/kyra/engine/chargen.cpp b/engines/kyra/engine/chargen.cpp
index a5071d73d9..65a5ee98b8 100644
--- a/engines/kyra/engine/chargen.cpp
+++ b/engines/kyra/engine/chargen.cpp
@@ -293,7 +293,7 @@ void CharacterGenerator::init(bool defaultParty) {
_screen->sega_getRenderer()->loadToVRAM(&cgb[0], 0x1900, 0x8220);
_screen->sega_getRenderer()->loadToVRAM(&cgb[0x1900], 0x8E0, 0xB080);
delete[] cgb;
-
+
_screen->sega_getRenderer()->fillRectWithTiles(0, 0, 0, 40, 28, 0);
_screen->sega_getRenderer()->fillRectWithTiles(1, 0, 0, 40, 28, 0);
_screen->sega_getRenderer()->fillRectWithTiles(1, 0, 0, 40, 26, 1, true);
@@ -476,7 +476,7 @@ void CharacterGenerator::checkForCompleteParty() {
_screen->sega_getRenderer()->fillRectWithTiles(0, 18, 8, 20, 16, 0);
cs = _screen->setFontStyles(_screen->_currentFont, _vm->gameFlags().lang == Common::JA_JPN ? Font::kStyleFixedWidth : Font::kStyleForceTwoByte | Font::kStyleFat);
_vm->_txt->printShadedText(_chargenStrings1[8], 0, 0, -1, 0x99);
- } else {
+ } else {
_screen->printShadedText(_chargenStrings1[8], x, 16, _vm->guiSettings()->colors.guiColorWhite, 0, _vm->guiSettings()->colors.guiColorBlack);
_screen->copyRegion(160, 0, 144, 64, 160, 128, 2, 0, Screen::CR_NO_P_CHECK);
}
@@ -1153,7 +1153,7 @@ void CharacterGenerator::printStats(int index, int mode) {
_screen->printShadedText(_chargenStatStrings[i], 163, (i + 8) << 3, _vm->guiSettings()->colors.guiColorWhite, 0, _vm->guiSettings()->colors.guiColorBlack);
_screen->printShadedText(_chargenStrings1[2], 248, 64, _vm->guiSettings()->colors.guiColorWhite, 0, _vm->guiSettings()->colors.guiColorBlack);
- _screen->printShadedText(str1.c_str(), 192, 64, _vm->guiSettings()->colors.guiColorWhite, 0, _vm->guiSettings()->colors.guiColorBlack);
+ _screen->printShadedText(str1.c_str(), 192, 64, _vm->guiSettings()->colors.guiColorWhite, 0, _vm->guiSettings()->colors.guiColorBlack);
_screen->printShadedText(str2.c_str(), 280, 64, _vm->guiSettings()->colors.guiColorWhite, 0, _vm->guiSettings()->colors.guiColorBlack);
_screen->printShadedText(str3.c_str(), 280, 80, _vm->guiSettings()->colors.guiColorWhite, 0, _vm->guiSettings()->colors.guiColorBlack);
}
diff --git a/engines/kyra/engine/darkmoon.cpp b/engines/kyra/engine/darkmoon.cpp
index 1c608339aa..2b8f6b7afb 100644
--- a/engines/kyra/engine/darkmoon.cpp
+++ b/engines/kyra/engine/darkmoon.cpp
@@ -644,7 +644,7 @@ void DarkMoonEngine::snd_loadAmigaSounds(int level, int sub) {
if (val == -1)
i++;
}
-
+
if (sub)
sndIndex += 4;
diff --git a/engines/kyra/engine/eob.cpp b/engines/kyra/engine/eob.cpp
index 7527fdf76e..b742037e3e 100644
--- a/engines/kyra/engine/eob.cpp
+++ b/engines/kyra/engine/eob.cpp
@@ -1212,7 +1212,7 @@ bool EoBEngine::checkPartyStatusExtra() {
}
_screen->copyPage(Screen_EoB::kDefeatMsgBackupPage, 0);
}
-
+
_eventList.clear();
_screen->setScreenDim(cd);
_txt->removePageBreakFlag();
diff --git a/engines/kyra/engine/eobcommon.h b/engines/kyra/engine/eobcommon.h
index 3eb271ad6b..5f90d2c7fd 100644
--- a/engines/kyra/engine/eobcommon.h
+++ b/engines/kyra/engine/eobcommon.h
@@ -1176,7 +1176,7 @@ protected:
const char *const *_clericSpellList;
const char *const *_spellNames;
const char *const *_mageSpellList2;
- const char *const *_clericSpellList2;
+ const char *const *_clericSpellList2;
const char *const *_magicStrings1;
const char *const *_magicStrings2;
const char *const *_magicStrings3;
diff --git a/engines/kyra/engine/kyra_v1.cpp b/engines/kyra/engine/kyra_v1.cpp
index 4fe37bf3d6..6c01778ef1 100644
--- a/engines/kyra/engine/kyra_v1.cpp
+++ b/engines/kyra/engine/kyra_v1.cpp
@@ -219,7 +219,7 @@ Common::Point KyraEngine_v1::getMousePos() {
if (_flags.useHiRes) {
mouse.x >>= 1;
mouse.y >>= 1;
- }
+ }
return mouse;
}
@@ -287,7 +287,7 @@ int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag)
keys |= 0x100;
} else {
keys = 0;
- }
+ }
// When we got an keypress, which we might need to handle,
// break the event loop and pass it to GUI code.
@@ -437,7 +437,7 @@ void KyraEngine_v1::setupKeyMap() {
// If we have an engine that wants ASCII codes instead of key codes, we can skip the setup of the key map.
// In that case we simply return the ASCII codes from the event manager. At least until I know better I
// trust that the ASCII codes we get from our event manager are the same identical codes. If that assumption
- // turns out to be wrong I can still implement the original conversion method...
+ // turns out to be wrong I can still implement the original conversion method...
if (_asciiCodeEvents)
return;
diff --git a/engines/kyra/engine/magic_eob.cpp b/engines/kyra/engine/magic_eob.cpp
index fc2dcdb90c..e22ce38952 100644
--- a/engines/kyra/engine/magic_eob.cpp
+++ b/engines/kyra/engine/magic_eob.cpp
@@ -395,7 +395,7 @@ void EoBCoreEngine::sparkEffectDefensive(int charIndex) {
first = 0;
last = 5;
}
-
+
if (_flags.gameID == GI_EOB1 && _flags.platform == Common::kPlatformAmiga)
snd_playSoundEffect(104);
diff --git a/engines/kyra/engine/scene_eob.cpp b/engines/kyra/engine/scene_eob.cpp
index 525968bb55..db3871bccd 100644
--- a/engines/kyra/engine/scene_eob.cpp
+++ b/engines/kyra/engine/scene_eob.cpp
@@ -97,7 +97,7 @@ void EoBCoreEngine::loadLevel(int level, int sub) {
_levelBlockProperties[0x035C].assignedObjects = 0x0E8D;
loadVcnData(gfxFile.c_str(), _cgaLevelMappingIndex ? _cgaMappingLevel[_cgaLevelMappingIndex[level - 1]] : 0);
- gui_setupPlayFieldHelperPages();
+ gui_setupPlayFieldHelperPages();
if (_flags.platform == Common::kPlatformAmiga && _flags.gameID == GI_EOB1)
_screen->getPalette(0).copy(_screen->getPalette(1), 1, 5, 1);
@@ -122,7 +122,7 @@ void EoBCoreEngine::readLevelFileData(int level) {
file = Common::String::format("LEVEL%d.%s", level, *sf);
s = _res->createReadStream(file);
}
-
+
if (!s)
error("Failed to load level file LEVEL%d.INF/DRO/ELO/JOT", level);
@@ -164,7 +164,7 @@ Common::String EoBCoreEngine::initLevelData(int sub) {
loadBlockProperties((const char *)pos);
pos += slen;
- Common::SeekableReadStreamEndian *s = getVmpData((const char*)pos);
+ Common::SeekableReadStreamEndian *s = getVmpData((const char*)pos);
assert(s);
uint16 size = (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformSegaCD) ? 2916 : s->readUint16();
delete[] _vmpPtr;
@@ -317,7 +317,7 @@ void EoBCoreEngine::addLevelItems() {
}
}
-void EoBCoreEngine::loadVcnData(const char *file, const uint8 *cgaMapping) {
+void EoBCoreEngine::loadVcnData(const char *file, const uint8 *cgaMapping) {
uint32 vcnSize = 0;
Common::String fn = Common::String::format(_vcnFilePattern.c_str(), _lastBlockDataFile);
_screen->loadBitmap(fn.c_str(), 3, 3, 0, true);
@@ -354,7 +354,7 @@ void EoBCoreEngine::loadVcnData(const char *file, const uint8 *cgaMapping) {
} else {
if (_flags.platform != Common::kPlatformAmiga && !(_flags.gameID == GI_EOB1 && _configRenderMode == Common::kRenderEGA))
memcpy(_vcnColTable, colMap, 32);
-
+
memcpy(_vcnBlocks, pos, vcnSize);
}
}
diff --git a/engines/kyra/engine/scene_rpg.cpp b/engines/kyra/engine/scene_rpg.cpp
index 3de2ec0b17..8047aba3a4 100644
--- a/engines/kyra/engine/scene_rpg.cpp
+++ b/engines/kyra/engine/scene_rpg.cpp
@@ -347,7 +347,7 @@ uint16 KyraRpgEngine::calcNewBlockPosition(uint16 curBlock, uint16 direction) {
void KyraRpgEngine::drawVcnBlocks() {
uint8 *d = _sceneWindowBuffer;
uint16 *bdb = _blockDrawingBuffer;
-
+
for (int y = 0; y < 15; y++) {
for (int x = 0; x < 22; x++) {
bool horizontalFlip = false;
@@ -428,7 +428,7 @@ void KyraRpgEngine::vcnDraw_fw_4bit(uint8 *&dst, const uint8 *&src) {
uint8 bl = *src++;
*dst++ = _vcnColTable[((bl >> 4) + _wllVcnOffset2) | _vcnShiftVal];
*dst++ = _vcnColTable[((bl & 0x0F) + _wllVcnOffset2) | _vcnShiftVal];
- }
+ }
}
void KyraRpgEngine::vcnDraw_bw_4bit(uint8 *&dst, const uint8 *&src) {
diff --git a/engines/kyra/engine/sprites_eob.cpp b/engines/kyra/engine/sprites_eob.cpp
index 33952e47ab..76d0331304 100644
--- a/engines/kyra/engine/sprites_eob.cpp
+++ b/engines/kyra/engine/sprites_eob.cpp
@@ -287,7 +287,7 @@ void EoBCoreEngine::drawBlockObject(int flipped, int page, const uint8 *shape, i
const ScreenDim *d = _screen->getScreenDim(sd);
if (_flags.gameID == GI_EOB1)
x &= ~1;
-
+
_screen->drawShape(page, shape, x - (d->sx << 3) + _shapeShakeOffsetX, y - d->sy + _shapeShakeOffsetY, sd, flipped | (ovl ? 2 : 0), ovl);
}
diff --git a/engines/kyra/engine/timer_eob.cpp b/engines/kyra/engine/timer_eob.cpp
index c14ee5f09e..5965b3e636 100644
--- a/engines/kyra/engine/timer_eob.cpp
+++ b/engines/kyra/engine/timer_eob.cpp
@@ -214,7 +214,7 @@ void EoBCoreEngine::advanceTimers(uint32 millis) {
} else if (_scriptTimers[i].next) {
_scriptTimers[i].next = 1;
debugC(3, kDebugLevelTimer, "EoBCoreEngine::advanceTimers() - CTIME: %08d SCRIPT TIMER[%02d].NEXT: %08d", ct, i, _scriptTimers[i].next);
- }
+ }
}
}
diff --git a/engines/kyra/graphics/screen.cpp b/engines/kyra/graphics/screen.cpp
index 4bb6bc17b5..53a9abf89b 100644
--- a/engines/kyra/graphics/screen.cpp
+++ b/engines/kyra/graphics/screen.cpp
@@ -205,7 +205,7 @@ bool Screen::init() {
_palettes.resize(paletteCount);
_palettes[0] = new Palette(numColorsInternal);
assert(_palettes[0]);
-
+
for (int i = 1; i < paletteCount; ++i) {
_palettes[i] = new Palette(numColors);
assert(_palettes[i]);
@@ -311,7 +311,7 @@ void Screen::setResolution() {
initGraphics(width, height, tryModes);
if (_system->getScreenFormat().bytesPerPixel != 2)
error("Required graphics mode not supported by platform.");
-
+
} else {
initGraphics(width, height);
_system->getPaletteManager()->setPalette(palette, 0, 256);
@@ -745,8 +745,8 @@ void Screen::setPagePixel(int pageNum, int x, int y, uint8 color) {
color &= 0x03;
} else if (_use16ColorMode || (_renderMode == Common::kRenderEGA && !_useHiResEGADithering)) {
color &= 0x0F;
- }
-
+ }
+
if (_bytesPerPixel == 2) {
((uint16*)_pagePtrs[pageNum])[y * SCREEN_W + x] = _16bitPalette[color];
} else {
@@ -1304,7 +1304,7 @@ void Screen::setTextColor(const uint8 *cmap8, int a, int b) {
// We need to update the color tables of all fonts, we
// setup so far here.
for (int i = 0; i < FID_NUM; ++i) {
- if (_fonts[i])
+ if (_fonts[i])
_fonts[i]->setColorMap(_textColorsMap);
}
}
@@ -3206,7 +3206,7 @@ void Screen::shakeScreen(int times) {
const int8 *shakeData = _shakeParaPC;
int steps = ARRAYSIZE(_shakeParaPC) / 3;
-
+
// The FM-TOWNS version has a slightly better shake animation
// TODO: check PC-98 version
if (_vm->gameFlags().platform == Common::kPlatformFMTowns) {
diff --git a/engines/kyra/graphics/screen.h b/engines/kyra/graphics/screen.h
index 805ca8e06a..14a68e32dc 100644
--- a/engines/kyra/graphics/screen.h
+++ b/engines/kyra/graphics/screen.h
@@ -119,7 +119,7 @@ public:
* Sets a text 16bit palette map. Only used in in EOB II FM-Towns. The map contains 2 entries.
*/
virtual void set16bitColorMap(const uint16 *src) {}
-
+
enum FontStyle {
kStyleNone = 0,
kStyleLeftShadow = 1 << 0,
diff --git a/engines/kyra/graphics/screen_eob.cpp b/engines/kyra/graphics/screen_eob.cpp
index 423ed52a67..dfc3a9175d 100644
--- a/engines/kyra/graphics/screen_eob.cpp
+++ b/engines/kyra/graphics/screen_eob.cpp
@@ -189,7 +189,7 @@ void Screen_EoB::setMouseCursor(int x, int y, const byte *shape, const uint8 *ov
int bpp = _useHiColorScreen ? 2 : 1;
uint8 *cursor = new uint8[mouseW * scaleFactor * bpp * mouseH * scaleFactor];
-
+
if (_bytesPerPixel == 2) {
for (int s = mouseW * scaleFactor * bpp * mouseH * scaleFactor; s; s -= 2)
*(uint16*)(cursor + s - 2) = colorKey;
@@ -211,7 +211,7 @@ void Screen_EoB::setMouseCursor(int x, int y, const byte *shape, const uint8 *ov
else
copyRegionToBuffer(6, 0, 0, mouseW, mouseH, cursor);
- // Mouse cursor post processing for EOB II Amiga
+ // Mouse cursor post processing for EOB II Amiga
if (_dualPaletteModeSplitY) {
int len = mouseW * mouseH;
while (--len > -1)
@@ -240,7 +240,7 @@ void Screen_EoB::setMouseCursor(int x, int y, const byte *shape, const uint8 *ov
}
}
}
-
+
// Convert color key to 16 bit after drawing the mouse cursor.
// The cursor has been converted to 16 bit in scale2x().
colorKey = _16bitConversionPalette ? _16bitConversionPalette[colorKey] : colorKey;
@@ -329,7 +329,7 @@ void Screen_EoB::loadBitmap(const char *filename, int tempPage, int dstPage, Pal
Screen::convertAmigaGfx(getPagePtr(dstPage), 320, 200);
delete str;
- }
+ }
}
void Screen_EoB::loadEoBBitmap(const char *file, const uint8 *cgaMapping, int tempPage, int destPage, int convertToPage) {
@@ -339,13 +339,13 @@ void Screen_EoB::loadEoBBitmap(const char *file, const uint8 *cgaMapping, int te
if (_vm->gameFlags().platform == Common::kPlatformFMTowns) {
if (!s)
- error("Screen_EoB::loadEoBBitmap(): Failed to load file '%s'", file);
+ error("Screen_EoB::loadEoBBitmap(): Failed to load file '%s'", file);
s->read(_shpBuffer, s->size());
decodeSHP(_shpBuffer, destPage);
} else if (s) {
// This additional check is necessary since some localized versions of EOB II seem to contain invalid (size zero) cps files
- if (s->size() == 0) {
+ if (s->size() == 0) {
loadAlternative = true;
// This check is due to EOB II Amiga German. That version simply checks
@@ -356,7 +356,7 @@ void Screen_EoB::loadEoBBitmap(const char *file, const uint8 *cgaMapping, int te
// Tolerance for size mismatches up to 2 bytes is needed in some cases
if ((((s->readUint16LE()) + 5) & ~3) != (((s->size()) + 3) & ~3))
loadAlternative = true;
- }
+ }
if (!loadAlternative)
loadBitmap(tmp.c_str(), tempPage, destPage, _vm->gameFlags().platform == Common::kPlatformAmiga ? _palettes[0] : 0);
@@ -687,7 +687,7 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
int16 dX = x - (_dsX1 << 3);
int16 dY = y;
int16 dW = _dsX2 - _dsX1;
-
+
uint8 pixelsPerByte = *src++;
uint16 dH = *src++;
uint16 width = (*src++) << 3;
diff --git a/engines/kyra/graphics/screen_eob.h b/engines/kyra/graphics/screen_eob.h
index b268a8eca6..0f145cc1fb 100644
--- a/engines/kyra/graphics/screen_eob.h
+++ b/engines/kyra/graphics/screen_eob.h
@@ -100,7 +100,7 @@ public:
void setFadeTable(const uint8 *table);
void createFadeTable(const uint8 *palData, uint8 *dst, uint8 rootColor, uint8 weight);
void createFadeTable16bit(const uint16 *palData, uint16 *dst, uint16 rootColor, uint8 weight);
-
+
const uint16 *getCGADitheringTable(int index);
const uint8 *getEGADitheringTable();
@@ -178,7 +178,7 @@ private:
const uint8 *_gfxMaxY;
int16 _dsX1, _dsX2, _dsY1, _dsY2;
-
+
bool _dsBackgroundFading;
int16 _dsBackgroundFadingXOffs;
uint8 _shapeOverlay[16];
diff --git a/engines/kyra/graphics/screen_eob_amiga.cpp b/engines/kyra/graphics/screen_eob_amiga.cpp
index 876ddf75d1..ddc40732ac 100644
--- a/engines/kyra/graphics/screen_eob_amiga.cpp
+++ b/engines/kyra/graphics/screen_eob_amiga.cpp
@@ -109,7 +109,7 @@ void Screen_EoB::loadSpecialAmigaCPS(const char *fileName, int destPage, bool is
cnt = decodeFrameAmiga_readBits(pos, val, chk, 8) + 1;
para2 = 12;
}
-
+
code = decodeFrameAmiga_readBits(pos, val, chk, para2);
while (cnt--) {
dst--;
@@ -125,7 +125,7 @@ void Screen_EoB::loadSpecialAmigaCPS(const char *fileName, int destPage, bool is
*dst = dst[code & 0xFFFF];
} else {
- para = 3;
+ para = 3;
}
}
@@ -171,7 +171,7 @@ bool AmigaDOSFont::load(Common::SeekableReadStream &file) {
unload();
uint16 id = file.readUint16BE();
- // We only support type 0x0f00, since this is the only type used for EOB
+ // We only support type 0x0f00, since this is the only type used for EOB
if (id != 0x0f00)
return false;
diff --git a/engines/kyra/graphics/screen_eob_pc98.cpp b/engines/kyra/graphics/screen_eob_pc98.cpp
index 7c0f13c43e..d4fb2d8da0 100644
--- a/engines/kyra/graphics/screen_eob_pc98.cpp
+++ b/engines/kyra/graphics/screen_eob_pc98.cpp
@@ -43,7 +43,7 @@ void Screen_EoB::selectPC98Palette(int palID, Palette &dest, int brightness, boo
for (int i = 0; i < 48; ++i)
pal[i] = CLIP<int>(pal16c[palID * 48 + i] + brightness, 0, 15);
loadPalette(pal, dest, 48);
-
+
if (set)
setScreenPalette(dest);
}
diff --git a/engines/kyra/graphics/screen_eob_segacd.cpp b/engines/kyra/graphics/screen_eob_segacd.cpp
index c6313dc123..986aec8669 100644
--- a/engines/kyra/graphics/screen_eob_segacd.cpp
+++ b/engines/kyra/graphics/screen_eob_segacd.cpp
@@ -342,7 +342,7 @@ void Screen_EoB::sega_encodeShapesFromSprites(const uint8 **dst, const uint8 *sr
if (((++s) % 80) == 0)
break;
}
-
+
_segaAnimator->update();
_segaRenderer->render(Screen_EoB::kSegaInitShapesPage, -1, -1, -1, -1, true);
@@ -677,7 +677,7 @@ void SegaRenderer::render(int destPageNum, int renderBlockX, int renderBlockY, i
/*if ((x >> 3) < renderBlockX) {
bW = MIN<int>(0, (int)bW - (renderBlockX - (x >> 3)));
x = (renderBlockX << 3);
-
+
}
if ((y >> 3) < renderBlockY) {
diff --git a/engines/kyra/gui/debugger.cpp b/engines/kyra/gui/debugger.cpp
index b74aefe759..11e5469f3c 100644
--- a/engines/kyra/gui/debugger.cpp
+++ b/engines/kyra/gui/debugger.cpp
@@ -662,7 +662,7 @@ bool Debugger_EoB::cmdPrintMap(int, const char **) {
}
if (_vm->_currentBlock == i) {
- c = 'X';
+ c = 'X';
} else if (key) {
c = signs[8];
} else {
@@ -673,7 +673,7 @@ bool Debugger_EoB::cmdPrintMap(int, const char **) {
}
}
}
-
+
debugPrintf("%c", c);
}
debugPrintf("\n\nParty Position: %c Door: %c Stairs Up/Down: %c/%c Plate: %c Hole: %c\nSwitch: %c Clickable Object: %c Illusion Wall: %c Teleporter: %c Key: %c\n\n", 'X', 216, signs[3], signs[4], signs[6], signs[5], '/', 176, signs[1], signs[0], signs[8]);
diff --git a/engines/kyra/gui/gui_eob.cpp b/engines/kyra/gui/gui_eob.cpp
index 85eac8031f..d4a23b8fca 100644
--- a/engines/kyra/gui/gui_eob.cpp
+++ b/engines/kyra/gui/gui_eob.cpp
@@ -149,7 +149,7 @@ void EoBCoreEngine::gui_drawCharPortraitWithStats(int index, bool screenUpdt) {
_screen->copyRegion(x2, y2, guiSettings()->charBoxCoords.boxX[index & 1], y2, guiSettings()->charBoxCoords.boxWidth, guiSettings()->charBoxCoords.boxHeight, 2, 0, Screen::CR_NO_P_CHECK);
- // Redraw this for the SegaCD version, since the red splat shapes do overlap with the next portrait to the bottom and would otherwise be cut off.
+ // Redraw this for the SegaCD version, since the red splat shapes do overlap with the next portrait to the bottom and would otherwise be cut off.
if (_flags.platform == Common::kPlatformSegaCD && c->damageTaken > 0) {
_screen->drawShape(0, _redSplatShape, guiSettings()->charBoxCoords.boxX[index & 1] + guiSettings()->charBoxCoords.redSplatOffsetX, y2 + guiSettings()->charBoxCoords.redSplatOffsetY, 0);
gui_printInventoryDigits(guiSettings()->charBoxCoords.boxX[index & 1] + guiSettings()->charBoxCoords.redSplatOffsetX + 12, y2 + guiSettings()->charBoxCoords.redSplatOffsetY + 10, c->damageTaken);
@@ -881,7 +881,7 @@ int EoBCoreEngine::clickedCamp(Button *button) {
}
_screen->copyPage(0, 7);
-
+
// Create a thumbnail from the screen for a possible savegame.
// This ensures that all special rendering (EGA dithering, 16bit rendering, Japanese font rendering) will be visible on the thumbnail.
::createThumbnailFromScreen(&_thumbNail);
@@ -903,7 +903,7 @@ int EoBCoreEngine::clickedCamp(Button *button) {
_screen->setScreenDim(cd);
_thumbNail.free();
-
+
drawScene(0);
for (int i = 0; i < 6; i++)
@@ -2341,7 +2341,7 @@ void GUI_EoB::runCampMenu() {
}
// fall through
- case 0x800C:
+ case 0x800C:
if (lastMenu == 1 || lastMenu == 2)
newMenu = 0;
else if (inputFlag == _vm->_keyMap[Common::KEYCODE_ESCAPE])
@@ -2491,7 +2491,7 @@ bool GUI_EoB::runLoadMenu(int x, int y, bool fromMainMenu) {
for (bool runLoop = true; runLoop && !_vm->shouldQuit();) {
updateSaveSlotsList(_vm->_targetName);
-
+
_vm->useMainMenuGUISettings(fromMainMenu);
int slot = selectSaveSlotDialog(x, y, 1);
_vm->useMainMenuGUISettings(false);
@@ -2882,7 +2882,7 @@ int GUI_EoB::getTextInput(char *dest, int x, int y, int destMaxLen, int textColo
} else {
sufx[0] = 32;
sufx[1] = 0;
- }
+ }
} else {
sufx[0] = (pos < len) ? dest[pos] : 32;
}
@@ -3142,7 +3142,7 @@ bool GUI_EoB::runSaveMenu(int x, int y) {
_screen->fillRect(fx - 2, fy, fx + 160, fy + 8, _vm->guiSettings()->colors.fill);
if (_vm->gameFlags().platform == Common::kPlatformFMTowns) {
TimeDate td;
- _vm->_system->getTimeAndDate(td);
+ _vm->_system->getTimeAndDate(td);
Common::strlcpy(_saveSlotStringsTemp[slot], Common::String::format(_vm->_saveNamePatterns[_vm->_currentLevel * 2 + _vm->_currentSub], td.tm_mon + 1, td.tm_mday, td.tm_hour, td.tm_min).c_str(), 25);
in = strlen(_saveSlotStringsTemp[slot]);
of = _vm->screen()->setFont(Screen::FID_6_FNT);
@@ -3199,7 +3199,7 @@ bool GUI_EoB::runSaveMenu(int x, int y) {
int GUI_EoB::selectSaveSlotDialog(int x, int y, int id) {
_saveSlotX = _saveSlotY = 0;
_savegameOffset = 0;
-
+
drawSaveSlotDialog(x, y, id);
_screen->updateScreen();
@@ -3472,7 +3472,7 @@ void GUI_EoB::runMemorizePrayMenu(int charIndex, int spellType) {
_screen->copyRegion(0, 50, 0, 50, 176, 72, 2, 0, Screen::CR_NO_P_CHECK);
lastHighLightText = -1;
}
-
+
if (updateDesc) {
updateDesc = false;
if (_vm->gameFlags().platform == Common::kPlatformSegaCD) {
@@ -4431,7 +4431,7 @@ void GUI_EoB::drawSaveSlotButton(int slot, int redrawBox, bool highlight) {
int w = 167;
char slotString[26];
Common::strlcpy(slotString, slot < _numSlotsVisible ? _saveSlotStringsTemp[slot] : _vm->_saveLoadStrings[0], _vm->gameFlags().platform == Common::kPlatformFMTowns ? 25 : 20);
-
+
if (slot >= 6) {
x = _saveSlotX + 118;
y = _saveSlotY + 126;
diff --git a/engines/kyra/gui/gui_eob_segacd.cpp b/engines/kyra/gui/gui_eob_segacd.cpp
index 30a1413776..333bd29885 100644
--- a/engines/kyra/gui/gui_eob_segacd.cpp
+++ b/engines/kyra/gui/gui_eob_segacd.cpp
@@ -877,7 +877,7 @@ void GUI_EoB_SegaCD::updateOptionsStrings() {
SegaRenderer *r = _screen->sega_getRenderer();
r->loadToVRAM(&_campMenu[(0x1CE + (_vm->_configMouse ? 0x240 : 0x24C)) << 5], 0x180, 0x42E0);
r->loadToVRAM(&_campMenu[(0x1CE + (_vm->_configMusic ? 0x258 : 0x264)) << 5], 0x180, 0x4460);
- r->loadToVRAM(&_campMenu[(0x1CE + (_vm->_configSounds ? 0x258 : 0x264)) << 5], 0x180, 0x45E0);
+ r->loadToVRAM(&_campMenu[(0x1CE + (_vm->_configSounds ? 0x258 : 0x264)) << 5], 0x180, 0x45E0);
r->loadToVRAM(&_campMenu[(0x1CE + ntblInputMode[_vm->_inputMode]) << 5], 0x280, 0x49A0);
r->loadToVRAM(&_campMenu[(0x444 + speed * 12) << 5], 0xC0, 0x48E0);
diff --git a/engines/kyra/gui/saveload_eob.cpp b/engines/kyra/gui/saveload_eob.cpp
index ad0d96bdcb..0d6f156a28 100644
--- a/engines/kyra/gui/saveload_eob.cpp
+++ b/engines/kyra/gui/saveload_eob.cpp
@@ -675,7 +675,7 @@ Common::String EoBCoreEngine::readOriginalSaveFile(Common::String &file) {
return desc;
Common::SeekableSubReadStream test(fs, 0, fs->size(), DisposeAfterUse::NO);
-
+
// detect source platform (PC98 has the exact same file layout as DOS)
Common::Platform sourcePlatform = Common::kPlatformDOS;
test.seek(32);
@@ -689,12 +689,12 @@ Common::String EoBCoreEngine::readOriginalSaveFile(Common::String &file) {
test.seek(_flags.gameID == GI_EOB1 ? 61 : 27);
bool padding = !test.readByte();
test.seek(0);
-
+
if (testStr >= 0 && testStr <= 25 && testChr >= 0 && testChr <= 25) {
if (testSJIS >= 0xE0 || (testSJIS > 0x80 && testSJIS < 0xA0))
sourcePlatform = Common::kPlatformFMTowns;
}
-
+
if (sourcePlatform == Common::kPlatformDOS && padding && (exp & 0xFF000000))
sourcePlatform = Common::kPlatformAmiga;
@@ -730,7 +730,7 @@ Common::String EoBCoreEngine::readOriginalSaveFile(Common::String &file) {
c->constitutionCur = in.readSByte();
c->constitutionMax = in.readSByte();
c->charismaCur = in.readSByte();
- c->charismaMax = in.readSByte();
+ c->charismaMax = in.readSByte();
if (_flags.gameID == GI_EOB2 && sourcePlatform == Common::kPlatformAmiga)
in.skip(1);
c->hitPointsCur = (_flags.gameID == GI_EOB1) ? in.readSByte() : in.readSint16();
@@ -810,7 +810,7 @@ Common::String EoBCoreEngine::readOriginalSaveFile(Common::String &file) {
}
if (_flags.gameID == GI_EOB2)
in.skip(1);
-
+
_inf->loadState(in, true);
loadItemDefs();
@@ -1244,7 +1244,7 @@ bool EoBCoreEngine::saveAsOriginalSaveFile(int slot) {
if (_flags.gameID == GI_EOB2)
out->writeByte(0);
-
+
_inf->saveState(out, true);
int numItems = (_flags.gameID == GI_EOB1) ? 500 : 600;
@@ -1273,7 +1273,7 @@ bool EoBCoreEngine::saveAsOriginalSaveFile(int slot) {
int numParts = (_flags.gameID == GI_EOB1) ? 12 : 17;
int partSize = (_flags.platform == Common::kPlatformFMTowns) ? 5030 :(_flags.gameID == GI_EOB1) ? 2040 : 2130;
-
+
uint8 *tempData = new uint8[5030];
uint8 *cmpData = new uint8[1200];
diff --git a/engines/kyra/resource/staticres_eob.cpp b/engines/kyra/resource/staticres_eob.cpp
index 6b9637d769..533a44bc80 100644
--- a/engines/kyra/resource/staticres_eob.cpp
+++ b/engines/kyra/resource/staticres_eob.cpp
@@ -525,7 +525,7 @@ void EoBCoreEngine::initStaticResource() {
// EOB I doesn't have load and save menus, because there is only one single
// save slot. Instead of emulating this we provide a menu similiar to EOB II.
// EOB I SegaCD actually has save/load menus with more than 1 slot if there is
- // a RAM cart present). I supply the strings here, too...
+ // a RAM cart present). I supply the strings here, too...
static const char *const saveLoadStrings[7][4] = {
{ "Cancel", "Empty Slot", "Save Game", "Load Game" },
@@ -545,7 +545,7 @@ void EoBCoreEngine::initStaticResource() {
"\r ""\x82\xBB\x82\xCC\x83""X""\x83\x8D\x83""b""\x83""g""\x82\xC9\x82\xCD\x83""Q""\x81""[""\x83\x80\x82\xAA\x83""Z""\x81""[""\x83""u\r ""\x82\xB3\x82\xEA\x82\xC4\x82\xA2\x82\xDC\x82\xB9\x82\xF1\x81""B",
0
};
-
+
switch (_flags.lang) {
case Common::EN_ANY: {
if (_flags.platform == Common::kPlatformSegaCD) {
@@ -911,7 +911,7 @@ void EoBCoreEngine::initMenus() {
{ 0, 8, 88, 48, 16, 0, 3 },
{ 0, 0, 0, 0, 0, 0, 0 },
{ 0, 8, 40, 48, 16, 0, 3 },
- { 0, 120, 40, 24, 16, 0, 3 },
+ { 0, 120, 40, 24, 16, 0, 3 },
{ 0, 24, 80, 48, 16, 48, 3 },
{ 0, 104, 80, 48, 16, 19, 3 },
{ 0, 120, 144, 48, 16, 19, 5 },
diff --git a/engines/kyra/script/script_eob.cpp b/engines/kyra/script/script_eob.cpp
index 21a70ff1b5..9e31a9c5f5 100644
--- a/engines/kyra/script/script_eob.cpp
+++ b/engines/kyra/script/script_eob.cpp
@@ -565,7 +565,7 @@ int EoBInfProcessor::oeob_printMessage_v1(int8 *data) {
}
int EoBInfProcessor::oeob_printMessage_v2(int8 *data) {
-
+
int8 *pos = data;
uint16 str = READ_LE_UINT16(pos);
pos += 2;
@@ -578,7 +578,7 @@ int EoBInfProcessor::oeob_printMessage_v2(int8 *data) {
assert(col < 16);
col = _amigaColorMap[col];
}
-
+
if (_activeCharacter == -1) {
c = _vm->rollDice(1, 6, -1);
while (!_vm->testCharacter(c, 3))
diff --git a/engines/kyra/sequence/seqplayer_eob_segacd.cpp b/engines/kyra/sequence/seqplayer_eob_segacd.cpp
index 0633b6a8ea..c78e8a6fc6 100644
--- a/engines/kyra/sequence/seqplayer_eob_segacd.cpp
+++ b/engines/kyra/sequence/seqplayer_eob_segacd.cpp
@@ -333,7 +333,7 @@ void SegaSequencePlayer::updateSpeechAnimGraphics(int animDrawOp) {
_renderer->loadToVRAM(d->tileData, (d->width * d->height) << 5, (d->nTblVal & 0x7FF) << 5);
else
_renderer->fillRectWithTiles(d->addr, d->x, d->y, d->width, d->height, d->nTblVal, true);
-
+
}
#define ARG(x) READ_BE_UINT16(pos + x)
diff --git a/engines/kyra/sequence/sequences_darkmoon.cpp b/engines/kyra/sequence/sequences_darkmoon.cpp
index 79ba647858..33c27ca17e 100644
--- a/engines/kyra/sequence/sequences_darkmoon.cpp
+++ b/engines/kyra/sequence/sequences_darkmoon.cpp
@@ -71,7 +71,7 @@ private:
OSystem *_system;
DarkMoonEngine *_vm;
Screen_EoB *_screen;
-
+
struct Config {
Config(const char *const *str, const char *const *cpsfiles, const uint8 **cpsdata, const char *const *pal, const DarkMoonShapeDef **shp, const DarkMoonAnimCommand **anim, bool loadScenePalette, bool paletteFading, bool animCmdRestorePalette, bool shapeBackgroundFading, int animPalOffset, int animType1ShapeDim, bool animCmd5SetPalette, int animCmd5ExtraPage) : strings(str), cpsFiles(cpsfiles), cpsData(cpsdata), palFiles(pal), shapeDefs(shp), animData(anim), loadScenePal(loadScenePalette), palFading(paletteFading), animCmdRestorePal(animCmdRestorePalette), shpBackgroundFading(shapeBackgroundFading), animPalOffs(animPalOffset), animCmd1ShapeFrame(animType1ShapeDim), animCmd5SetPal(animCmd5SetPalette), animCmd5AltPage(animCmd5ExtraPage) {}
const char *const *strings;
@@ -89,7 +89,7 @@ private:
bool animCmd5SetPal;
int animCmd5AltPage;
};
-
+
const Config *_config;
Palette *_palettes[13];
@@ -304,7 +304,7 @@ void DarkMoonEngine::seq_playIntro() {
_screen->setCurPage(2);
_screen->setClearScreenDim(17);
_screen->setCurPage(0);
-
+
sq.animCommand(_flags.platform == Common::kPlatformAmiga ? 38 : (_configRenderMode == Common::kRenderEGA ? 41 : 40));
sq.animCommand(7, 18);
@@ -379,7 +379,7 @@ void DarkMoonEngine::seq_playIntro() {
sq.animCommand(_flags.platform == Common::kPlatformAmiga ? 12 : 13);
_screen->copyRegion(104, 16, 96, 8, 120, 100, 0, 2, Screen::CR_NO_P_CHECK);
sq.fadeText();
-
+
if (_flags.platform == Common::kPlatformAmiga)
sq.animCommand(9);
@@ -845,7 +845,7 @@ void DarkMoonEngine::seq_playFinale() {
sq.delay(54);
sq.fadeText();
sq.loadScene(12, 2);
-
+
sq.waitForSongNotifier(5);
if (!skipFlag() && !shouldQuit())
@@ -946,9 +946,9 @@ void DarkMoonEngine::seq_playFinale() {
int temp = 0;
const uint8 *creditsData = (_flags.platform != Common::kPlatformDOS) ? _res->fileData("CREDITS.TXT", 0) : _staticres->loadRawData(kEoB2CreditsData, temp);
-
+
seq_playCredits(&sq, creditsData, 18, 2, 6, 2);
-
+
if (_flags.platform != Common::kPlatformDOS)
delete[] creditsData;
@@ -1174,7 +1174,7 @@ void DarkmoonSequenceHelper::loadScene(int index, int pageNum, bool ignorePalett
file = _config->cpsFiles[index];
s = _vm->resource()->createReadStream(file);
}
-
+
if (s) {
chunkID = s->readUint32LE();
s->seek(0);
@@ -1469,7 +1469,7 @@ void DarkmoonSequenceHelper::fadeText() {
if (_vm->_configRenderMode != Common::kRenderEGA)
_screen->fadeTextColor(_palettes[0], col, 8);
-
+
memset(_textColor, 0, 3);
_screen->clearCurDim();
}
diff --git a/engines/kyra/sequence/sequences_eob.cpp b/engines/kyra/sequence/sequences_eob.cpp
index 47333313be..f3996fe8f7 100644
--- a/engines/kyra/sequence/sequences_eob.cpp
+++ b/engines/kyra/sequence/sequences_eob.cpp
@@ -135,7 +135,7 @@ private:
void congratulation();
void credits();
void bonus();
-
+
template<int brStart, int brEnd, int inc> void pc98FadePalette(int palId, uint32 del);
void fadeToBlack(int palId, uint32 delay) { pc98FadePalette<0, -16, -1>(palId, delay); }
void fadeFromBlack(int palId, uint32 delay) { pc98FadePalette<-15, 1, 1>(palId, delay); }
@@ -181,10 +181,10 @@ private:
uint8 *_councilAnimData1;
uint8 *_councilAnimData2;
-
+
const uint8 *_councilAnimData3;
const uint8 *_councilAnimData4;
- const uint8 *_eyesAnimData;
+ const uint8 *_eyesAnimData;
const int16 *_handsAnimData;
const uint8 *_textFrameDuration;
@@ -490,8 +490,8 @@ void EoBIntroPlayer::openingCredits() {
void EoBIntroPlayer::tower() {
if (_vm->shouldQuit() || _vm->skipFlag())
- return;
-
+ return;
+
_screen->loadBitmap(_filesTower[1], 5, 3, 0);
_screen->setCurPage(2);
@@ -618,10 +618,10 @@ void EoBIntroPlayer::orb() {
_vm->delay(80 * _vm->_tickLength);
_screen->fadePalette(_screen->getPalette(2), 48);
_screen->clearCurPage();
- } else {
+ } else {
_vm->delay(40 * _vm->_tickLength);
_vm->snd_playSoundEffect(6);
- }
+ }
startFrame = (_vm->gameFlags().platform == Common::kPlatformAmiga) ? -1 : 3;
for (int i = startFrame; i > -2 && !_vm->shouldQuit() && !_vm->skipFlag(); i--) {
@@ -1022,7 +1022,7 @@ void EoBIntroPlayer::waterdeepExit() {
_screen->fillRect(0, 168, 319, 199, _fillColor1, 0);
_screen->copyRegion(0, 136, 0, 0, 48, 36, 0, 4, Screen::CR_NO_P_CHECK);
- int dstPage = (_vm->gameFlags().platform == Common::kPlatformAmiga) ? 4 : 5;
+ int dstPage = (_vm->gameFlags().platform == Common::kPlatformAmiga) ? 4 : 5;
_screen->loadBitmap(_filesWdExit[2], 3, dstPage, 0);
_screen->convertPage(dstPage, 2, _vm->_cgaMappingAlt);
whirlTransition();
@@ -1291,7 +1291,7 @@ EoBPC98FinalePlayer::EoBPC98FinalePlayer(EoBEngine *vm, Screen_EoB *screen) : Eo
_palCycleType1 = new Screen_EoB::PalCycleData[48];
_palCycleType2 = new Screen_EoB::PalCycleData[48];
_updatePalCycle = false;
-
+
resetPaletteCycle();
}
@@ -1380,7 +1380,7 @@ void EoBPC98FinalePlayer::king() {
uint32 xylen = 0;
uint8 *xydata = _vm->resource()->fileData("xytbl.dat", &xylen);
xylen >>= 1;
-
+
_screen->loadBitmap("KING.BIN", 3, 5, 0);
_screen->convertPage(5, 2, 0);
_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
@@ -1388,7 +1388,7 @@ void EoBPC98FinalePlayer::king() {
_screen->loadBitmap("KG.BIN", 3, 4, 0);
_screen->setCurPage(4);
- _shapes[0] = _screen->encodeShape(32, 0, 8, 128);
+ _shapes[0] = _screen->encodeShape(32, 0, 8, 128);
for (int i = 0; i < 4; ++i) {
_shapes[2 + i] = _screen->encodeShape(i << 3, 0, 8, 80);
if (i < 3)
@@ -1499,9 +1499,9 @@ void EoBPC98FinalePlayer::inspection() {
_screen->drawShape(2, _shapes[0], 0, 0);
_screen->copyRegion(0, 0, 104, 30, 96, 120, 2, 0, Screen::CR_NO_P_CHECK);
fadeFromBlack(7, 1);
-
+
wait(30);
-
+
printSubtitle(_strings[12], 2, 22, 225);
printSubtitle(_strings[13], 18, 22, 225);
printSubtitle(_strings[14], 14, 22, 225);
@@ -1688,7 +1688,7 @@ template<int brStart, int brEnd, int brInc> void EoBPC98FinalePlayer::pc98FadePa
for (int i = brStart; i != brEnd && !_vm->skipFlag() && !_vm->shouldQuit(); i += brInc) {
uint32 end = _vm->_system->getMillis() + del;
- if (_updatePalCycle) {
+ if (_updatePalCycle) {
for (uint32 cur = _vm->_system->getMillis(); end > cur; cur = _vm->_system->getMillis()) {
_screen->updatePC98PaletteCycle(i);
_screen->updateScreen();
@@ -1714,7 +1714,7 @@ void EoBPC98FinalePlayer::startPaletteCycle(int palId, int style) {
_screen->initPC98PaletteCycle(palId, _palCycleType1);
else if (style == 1)
_screen->initPC98PaletteCycle(palId, _palCycleType2);
-
+
if (style == 0 || style == 1)
resetPaletteCycle();
@@ -1916,7 +1916,7 @@ void EoBAmigaFinalePlayer::inspection() {
_screen->copyRegion(112, 32, 112, 32, 96, 24, 2, 0, Screen::CR_NO_P_CHECK);
_screen->updateScreen();
- _vm->delay(_vm->_tickLength);
+ _vm->delay(_vm->_tickLength);
}
}
@@ -1959,7 +1959,7 @@ void EoBAmigaFinalePlayer::congratulation() {
_shapes[40] = _screen->encodeShape(12, 24, 12, 64, true);
_shapes[41] = _screen->encodeShape(12, 88, 12, 72, true);
_shapes[42] = _screen->encodeShape(24, 136, 15, 64, true);
-
+
_screen->clearPage(2);
_screen->fadeFromBlack(1);
@@ -2040,7 +2040,7 @@ void EoBAmigaFinalePlayer::animateCouncil1(int numFrames, int skipFrame) {
int frame = 5;
int subFrame = 0;
int subFrameAlt = 2;
-
+
if (numFrames == 99) {
subFrame = _animCurFrame ? 6 : 0;
_animCurFrame ^= 1;
@@ -2065,7 +2065,7 @@ void EoBAmigaFinalePlayer::animateCouncil1(int numFrames, int skipFrame) {
_councilAnimData1[frame * 13 + 12]++;
subFrame = 0;
}
-
+
const uint8 *crds = &_councilAnimData1[frame * 13 + subFrame];
_screen->copyRegion(crds[0] << 3, crds[1], crds[4] << 3, crds[5], crds[2] << 3, crds[3], 4, 0, Screen::CR_NO_P_CHECK);
}
@@ -2084,11 +2084,11 @@ void EoBAmigaFinalePlayer::animateCouncil2(int numFrames, int skipFrame, bool wi
for (int i = 0; i < 6 && !_vm->skipFlag() && !_vm->shouldQuit(); ++i) {
if (frames[i] == skipFrame)
continue;
-
+
uint8 *crds = &_councilAnimData2[frames[i] * 13];
crds[12] = 0;
_screen->copyRegion(crds[0] << 3, crds[1], crds[4] << 3, crds[5], crds[2] << 3, crds[3], 4, 0, Screen::CR_NO_P_CHECK);
-
+
if (withSpeechAnim)
animateCouncil1(2, -1);
@@ -2132,7 +2132,7 @@ void EoBAmigaFinalePlayer::playDialogue(int line, bool withAnim) {
} else {
_screen->drawShape(0, _shapes[line], 0, line == 9 ? 92 : 170);
- }
+ }
}
int EoBEngine::mainMenu() {
@@ -2146,7 +2146,7 @@ int EoBEngine::mainMenu() {
case 0: {
if (_ttlCfg->fade)
_screen->fadeToBlack(10);
-
+
_screen->selectPC98Palette(_ttlCfg->pc98PaletteID, _screen->getPalette(0));
for (int i = 0; i < 3; ++i) {
if (_ttlCfg->palFiles[i].renderMode == -1)
@@ -2211,7 +2211,7 @@ int EoBEngine::mainMenu() {
_sound->selectAudioResourceSet(kMusicIntro);
_sound->loadSoundFile(0);
_screen->hideMouse();
-
+
seq_playIntro(kOnlyIntro);
_screen->showMouse();
@@ -2445,7 +2445,7 @@ void EoBEngine::seq_segaOpeningCredits(bool jumpToTitle) {
r->setPlaneTableLocation(SegaRenderer::kPlaneA, 0xE000);
r->setupPlaneAB(1024, 256);
r->setHScrollMode(SegaRenderer::kHScroll1PixelRows);
-
+
r->fillRectWithTiles(0, 0, 0, 40, 28, 0);
r->fillRectWithTiles(1, 0, 0, 128, 28, 1);
r->fillRectWithTiles(1, 0, 0, 40, 28, 1, true);
diff --git a/engines/kyra/sound/drivers/audiomaster2.cpp b/engines/kyra/sound/drivers/audiomaster2.cpp
index fb3ccbbdd8..8feb0a657e 100644
--- a/engines/kyra/sound/drivers/audiomaster2.cpp
+++ b/engines/kyra/sound/drivers/audiomaster2.cpp
@@ -68,7 +68,7 @@ public:
void clearChain();
void deployChannels(IOUnit **dest);
IOUnit *requestFreeUnit();
-
+
void fadeOut();
bool isFading();
@@ -281,7 +281,7 @@ private:
};
bool parse(AudioMaster2IOManager *io, Track *track);
-
+
uint16 _tempo;
uint8 _songVolume;
@@ -311,7 +311,7 @@ public:
void setMasterVolume(int type, int volume);
void interrupt(AudioMaster2IOManager *io);
-
+
private:
SoundResource *retrieveFromChain(const Common::String &resName);
void linkToChain(SoundResource *resource, SoundResource::Mode mode);
@@ -453,7 +453,7 @@ void SoundResource::loadName(Common::ReadStream *stream, uint32 size) {
stream->read(data, size);
data[size] = '\0';
_name = data;
-
+
delete[] data;
}
@@ -536,9 +536,9 @@ void SoundResource8SVX::setupMusicNote(AudioMaster2IOManager::IOUnit *unit, uint
// The original code uses 3579546 here. But since the Paula code uses kPalPaulaClock I do the same.
uint32 rt = Audio::Paula::kPalPaulaClock;
uint32 offs = 0;
-
+
if (_numSamplesRepeat && _numSamplesPerCycle) {
- uint32 octave = _numBlocks;
+ uint32 octave = _numBlocks;
rt = _periods[note] << 13;
for (rt /= _numSamplesPerCycle; rt >= 0x4000000 && octave > 1; octave--) {
@@ -647,7 +647,7 @@ void SoundResourceINST::loadSamples(Common::ReadStream *stream, uint32 size) {
char *data = new char[size + 1];
stream->read(data, size);
data[size] = '\0';
-
+
if (_samplesResource)
_samplesResource->close();
@@ -706,7 +706,7 @@ void SoundResourceINST::setupEnvelopes(AudioMaster2IOManager::IOUnit *unit) {
void SoundResourceINST::setupSoundEffect(AudioMaster2IOManager::IOUnit *unit, uint32 sync, uint32 rate) {
if (!unit)
return;
-
+
if (_samplesResource)
_samplesResource->setupSoundEffect(unit, sync, rate);
@@ -723,7 +723,7 @@ SoundResourceSMUS::~SoundResourceSMUS() {
void SoundResourceSMUS::loadHeader(Common::ReadStream *stream, uint32 size) {
if (size < 3)
error("SoundResourceSMUS:loadHeader(): Invalid data chunk size");
-
+
_tempo = stream->readUint16BE() / 68;
_songVolume = stream->readByte();
}
@@ -747,14 +747,14 @@ void SoundResourceSMUS::loadInstrument(Common::ReadStream *stream, uint32 size)
warning("SoundResourceSMUS::loadInstrument(): Samples resource '%s' not found for '%s'.", data, _name.c_str());
}
- delete[] data;
+ delete[] data;
}
void SoundResourceSMUS::loadTrack(Common::ReadStream *stream, uint32 size) {
Track *track = new Track();
uint8 *data = new uint8[size];
stream->read(data, size);
-
+
track->_dataStart = data;
track->_dataEnd = data + size;
track->_volume = 128;
@@ -800,7 +800,7 @@ void SoundResourceSMUS::release() {
bool SoundResourceSMUS::parse(AudioMaster2IOManager *io, Track *track) {
uint32 duration = 0;
-
+
while (track->_sync <= io->_sync) {
if (track->_dataCur >= track->_dataEnd)
return false;
@@ -820,7 +820,7 @@ bool SoundResourceSMUS::parse(AudioMaster2IOManager *io, Track *track) {
AudioMaster2IOManager::IOUnit *unit = io->requestFreeUnit();
if (unit) {
unit->_startTick = track->_sync;
- unit->_endTick = unit->_startTick + duration;
+ unit->_endTick = unit->_startTick + duration;
track->_instrument->setupMusicNote(unit, cmd, _masterVolume * track->_volume);
}
}
@@ -958,7 +958,7 @@ void AudioMaster2ResourceManager::stopChain() {
void AudioMaster2ResourceManager::flush() {
Common::StackLock lock(_mutex);
- stopChain();
+ stopChain();
while (_chainPlaying) {
SoundResource *res = _chainPlaying;
@@ -1237,7 +1237,7 @@ bool AudioMaster2Internal::init() {
_res = new AudioMaster2ResourceManager(this, _mutex);
startPaula();
-
+
_mixer->playStream(Audio::Mixer::kPlainSoundType,
&_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
@@ -1358,11 +1358,11 @@ void AudioMaster2Internal::updateDevice() {
}
bool next = false;
-
+
if (unit->_transposeData) {
unit->_period += unit->_transposePara;
const uint8 *data = unit->_transposeData;
-
+
if (unit->_transposeDuration-- <= 1) {
for (bool loop = true; loop; ) {
uint8 para = *data++;
@@ -1440,7 +1440,7 @@ void AudioMaster2Internal::updateDevice() {
} else {
para2 = (unit->_volumeSetting * para2) >> 6;
if (para2 > 0x4000)
- para2 = 0x4000;
+ para2 = 0x4000;
}
if (!para) {
@@ -1480,7 +1480,7 @@ void AudioMaster2Internal::updateDevice() {
setChannelSampleStart(i, unit->_sampleDataRepeat);
setChannelSampleLen(i, unit->_lenRepeat);
}
-
+
} else if (unit->_transposeData || unit->_levelAdjustData) {
setChannelPeriod(i, unit->_period);
setChannelVolume(i, unit->_outputVolume >> 8);
diff --git a/engines/kyra/sound/drivers/mlalf98.cpp b/engines/kyra/sound/drivers/mlalf98.cpp
index 6ccd6601d7..9457603b27 100644
--- a/engines/kyra/sound/drivers/mlalf98.cpp
+++ b/engines/kyra/sound/drivers/mlalf98.cpp
@@ -376,7 +376,7 @@ private:
void writeDevice(uint8 reg, uint8 val) override;
void op_writeDevice(uint8 *&data) override;
-
+
uint8 _specialModeModifier[4];
bool _specialMode;
bool _isFinished;
@@ -621,7 +621,7 @@ void SoundChannel::op_jumpToSubroutine(uint8 *&data) {
else
warning("SoundChannel::op_jumpToSubroutine(): invalid offset");
data = _buffer + offset;
-#else
+#else
// This is a very ugly opcode which reads and sets an absolute 16 bit offset
// inside the music driver segment. Thus, the ip can jump anywhere, not only
// from one track or channel to another or from the music buffer to the sfx
@@ -934,7 +934,7 @@ void MusicChannelFM::noteOn(uint8 note) {
if (_note == note && !(_flags2 & kNoSustain))
return;
-
+
_note = note;
if ((note & 0x0F) >= 12)
@@ -1154,7 +1154,7 @@ void MusicChannelSSG::parse() {
_flags2 &= ~kNoSustain;
else
noteOff();
- }
+ }
}
if (_volume & kUpdate) {
@@ -1163,8 +1163,8 @@ void MusicChannelSSG::parse() {
}
return;
}
-
- uint8 *pos = _dataPtr;
+
+ uint8 *pos = _dataPtr;
if (pos && pos < _dataEnd) {
if (*pos == 0xFD) {
_flags2 &= ~kNoSustain;
@@ -1215,7 +1215,7 @@ void MusicChannelSSG::noteOff() {
writeDevice(_regOffsetAttn, _globalBlock ? 0 : val);
}
return;
- }
+ }
if (_volume & kUpdate) {
_volume &= ~(kAttack | kDecay | kSustain);
@@ -1230,7 +1230,7 @@ void MusicChannelSSG::noteOn(uint8 note) {
static uint16 freqTableSSG[12] = {
0x0EE8, 0x0E12, 0x0D48, 0x0C89, 0x0BD5, 0x0B2B, 0x0A8A, 0x09F3, 0x0964, 0x08DD, 0x085E, 0x07E6
};
-
+
if (_note == note && !(_flags2 & kNoSustain))
return;
@@ -1248,7 +1248,7 @@ void MusicChannelSSG::noteOn(uint8 note) {
if (_flags2 & kNoSustain) {
if (_flags & kEnvelope) {
writeDevice(_regOffsetAttn, 0x10);
- writeDevice(0x0D, _flags & kInternalMask);
+ writeDevice(0x0D, _flags & kInternalMask);
} else {
_volume = (kUpdate | kAttack) | (_volume & 0x0F);
_envCurLvl = _envStartLvl;
@@ -1458,7 +1458,7 @@ void MusicChannelEXT::noteOn(uint8 note) {
static uint16 freqTableEXT[12] = {
0x4A82, 0x4EE4, 0x5389, 0x5875, 0x5DAC, 0x6332, 0x690C, 0x6F3F, 0x75D1, 0x7C76, 0x8426, 0x8BF5
};
-
+
if (!(_flags2 & kNoSustain) && _note == note)
return;
@@ -1472,7 +1472,7 @@ void MusicChannelEXT::noteOn(uint8 note) {
if (!(_flags2 & kNoSustain))
vbrResetDelay();
vbrReset();
-
+
if (_globalBlock)
return;
@@ -1534,7 +1534,7 @@ void MusicChannelEXT::op_setVolume(uint8 *&data) {
_volume2 = *data;
else
_volume = *data;
- data++;
+ data++;
}
void MusicChannelEXT::op_setPanPos(uint8 *&data) {
@@ -1641,7 +1641,7 @@ MLALF98Internal::MLALF98Internal(Audio::Mixer *mixer, EmuType emuType) : PC98Aud
_musicChannels.push_back(new MusicChannelFM(_pc98a, 0, i));
for (int i = 3; i < 6; ++i)
_musicChannels.push_back(new MusicChannelSSG(_pc98a, 0, (i - 3) << 1));
-
+
if (_type86) {
_musicChannels.push_back(new MusicChannelRHY(_pc98a, 0, 0));
for (int i = 7; i < 10; ++i)
@@ -1659,7 +1659,7 @@ MLALF98Internal::MLALF98Internal(Audio::Mixer *mixer, EmuType emuType) : PC98Aud
MLALF98Internal::~MLALF98Internal() {
_ready = false;
-
+
delete _pc98a;
iterateChannels(_musicChannels)
@@ -1757,7 +1757,7 @@ void MLALF98Internal::startMusic(int track) {
_pc98a->writeReg(0, 0x10, 0x00);
_pc98a->writeReg(0, 0x24, 0x18);
_pc98a->writeReg(0, 0x25, 0x02);
-
+
iterateChannels(_sfxChannels)
(*i)->setData(0, 0, 0, 0);
@@ -1779,13 +1779,13 @@ void MLALF98Internal::startMusic(int track) {
header += 2;
(*i)->setData(_musicBuffer + 5 + offset1, offset2 ? _musicBuffer + 5 + offset2 : 0, _musicBuffer + _musicBufferSize, _musicBuffer + 1);
}
-
+
debugC(3, kDebugLevelSound, "\nStarting music. Track: %03d", track);
_pc98a->writeReg(0, 0x29, 0x83);
for (int i = 0; i < 6; ++i)
_pc98a->writeReg(0, i, 0);
- _pc98a->writeReg(0, 0x07, 0x38);
+ _pc98a->writeReg(0, 0x07, 0x38);
_pc98a->writeReg(0, 0x26, tempo);
for (int i = 0; i < 2; ++i) {
diff --git a/engines/kyra/sound/drivers/pcspeaker_v1.cpp b/engines/kyra/sound/drivers/pcspeaker_v1.cpp
index de6364f3d4..29a5a53997 100644
--- a/engines/kyra/sound/drivers/pcspeaker_v1.cpp
+++ b/engines/kyra/sound/drivers/pcspeaker_v1.cpp
@@ -215,12 +215,12 @@ void PCSpeakerDriver::update() {
uint16 ts = _channels[i]->timerScale + *pos++;
_channels[i]->timerScale = (uint8)MIN<uint16>(ts, 0xFF);
} break;
-
+
case -24: {
int16 ts = _channels[i]->timerScale - *pos++;
_channels[i]->timerScale = (uint8)MAX<int16>(ts, 1);
} break;
-
+
case -26: {
uint16 prd = _clock / READ_LE_UINT16(pos);
if (_pcJR && prd >= 0x400)
@@ -230,7 +230,7 @@ void PCSpeakerDriver::update() {
uint8 nextTimer = 1 + *pos++;
_channels[i]->timer = _channels[i]->timerScale * nextTimer;
} break;
-
+
case -30: {
_channels[i]->timerScale = *pos++;
if (!_channels[i]->timerScale)
@@ -300,7 +300,7 @@ int PCSpeakerDriver::readBuffer(int16 *buffer, const int numSamples) {
generateSamples(buffer, render);
buffer += render;
}
-
+
return numSamples;
}
diff --git a/engines/kyra/sound/drivers/segacd.cpp b/engines/kyra/sound/drivers/segacd.cpp
index f77f643eb7..c7785ca54e 100644
--- a/engines/kyra/sound/drivers/segacd.cpp
+++ b/engines/kyra/sound/drivers/segacd.cpp
@@ -361,7 +361,7 @@ bool SegaAudioChannel::update() {
not implemented/required: sfx channel lock handling
restoreTone();
*/
-
+
fadeUpdate();
if (!_dataPtr)
diff --git a/engines/kyra/sound/sound_amiga_eob.cpp b/engines/kyra/sound/sound_amiga_eob.cpp
index 0fdf57d7d5..7bd3f41342 100644
--- a/engines/kyra/sound/sound_amiga_eob.cpp
+++ b/engines/kyra/sound/sound_amiga_eob.cpp
@@ -89,7 +89,7 @@ void SoundAmiga_EoB::loadSoundFile(Common::String file) {
// This value can deviate up to 5 bytes from the real size in EOB II Amiga.
// The original simply tries to read 64000 bytes from the file (ignoring this
// value). We do the same.
- // EOB I strangely always seems to have correct values.
+ // EOB I strangely always seems to have correct values.
uint16 readSize = in->readUint16LE() - 10;
uint8 cmp = in->readByte();
in->seek(1, SEEK_CUR);
@@ -106,7 +106,7 @@ void SoundAmiga_EoB::loadSoundFile(Common::String file) {
if (cmp == 0) {
memcpy(buf, _fileBuffer, outSize);
- } else if (cmp == 3) {
+ } else if (cmp == 3) {
Screen::decodeFrame3(_fileBuffer, buf, outSize, true);
} else if (cmp == 4) {
Screen::decodeFrame4(_fileBuffer, buf, outSize);
@@ -213,7 +213,7 @@ void SoundAmiga_EoB::playSoundEffect(uint16 track, uint8 volume) {
}
void SoundAmiga_EoB::beginFadeOut(int delay) {
- _driver->fadeOut(delay);
+ _driver->fadeOut(delay);
while (_driver->isFading() && !_vm->shouldQuit())
_vm->delay(5);
haltTrack();
diff --git a/engines/kyra/sound/sound_pc_midi.cpp b/engines/kyra/sound/sound_pc_midi.cpp
index f687e9a157..96341ef0c7 100644
--- a/engines/kyra/sound/sound_pc_midi.cpp
+++ b/engines/kyra/sound/sound_pc_midi.cpp
@@ -298,7 +298,7 @@ void SoundMidiPC::playTrack(uint8 track) {
Common::StackLock lock(_mutex);
_fadeMusicOut = false;
-
+
_output->setSourceVolume(0, _musicVolume);
if (_music->setTrack(track))
diff --git a/engines/kyra/sound/sound_towns_darkmoon.cpp b/engines/kyra/sound/sound_towns_darkmoon.cpp
index 33d227aa3c..e46f0b2f58 100644
--- a/engines/kyra/sound/sound_towns_darkmoon.cpp
+++ b/engines/kyra/sound/sound_towns_darkmoon.cpp
@@ -42,7 +42,7 @@ SoundTowns_Darkmoon::SoundTowns_Darkmoon(KyraEngine_v1 *vm, Audio::Mixer *mixer)
_timerSwitch = 0;
memset(_resource, 0, sizeof(_resource));
}
-
+
SoundTowns_Darkmoon::~SoundTowns_Darkmoon() {
for (int i = 0; i < 3; i++)
initAudioResourceInfo(i, 0);
@@ -100,7 +100,7 @@ void SoundTowns_Darkmoon::selectAudioResourceSet(int set) {
_fileListLen = _resource[set]->numFiles;
_pcmDataSize = _resource[kMusicIngame]->pcmDataSize;
- _pcmData = new uint8[_pcmDataSize];
+ _pcmData = new uint8[_pcmDataSize];
_pcmVol = _resource[set]->pcmVolume;
memcpy(_pcmData, _resource[kMusicIngame]->pcmData, _pcmDataSize);
@@ -141,7 +141,7 @@ void SoundTowns_Darkmoon::loadSoundFile(Common::String name) {
uint8 *src = pmb + 8;
for (int i = 0; i < 32; i++)
_intf->callback(5, 0x40, i, &src[i << 7]);
-
+
_intf->callback(35, -1);
src += 0x1000;
bytesLeft -= 0x1008;
diff --git a/engines/kyra/text/text_eob_segacd.cpp b/engines/kyra/text/text_eob_segacd.cpp
index f190d12062..9c6ba9d9ec 100644
--- a/engines/kyra/text/text_eob_segacd.cpp
+++ b/engines/kyra/text/text_eob_segacd.cpp
@@ -155,12 +155,12 @@ void TextDisplayer_SegaCD::displayText(char *str, ...) {
_curPosY -= _screen->getFontHeight();
linefeed();
}
- }
+ }
printShadedText(tmp, _curPosX, _curPosY, _textColor);
_curPosX += _screen->getTextWidth(tmp);
updated = true;
- }
+ }
}
if (!updated)
@@ -182,7 +182,7 @@ uint8 TextDisplayer_SegaCD::fetchCharacter(char *dest, const char *&src) {
dest[0] = '\0';
return c;
}
-
+
dest[0] = (char)c;
dest[1] = (c <= 0x7F || (c >= 0xA1 && c <= 0xDF)) ? '\0' : *src++;
diff --git a/engines/kyra/text/text_rpg.cpp b/engines/kyra/text/text_rpg.cpp
index 87513bb0dc..8ad3b5902e 100644
--- a/engines/kyra/text/text_rpg.cpp
+++ b/engines/kyra/text/text_rpg.cpp
@@ -787,7 +787,7 @@ void TextDisplayer_rpg::convertString(char *str) {
if ((*str) == c[0])
*str = c[1];
}
- }
+ }
}
} // End of namespace Kyra
Commit: 6f8aa0b21b90b3940f929708ac65154e8a131f66
https://github.com/scummvm/scummvm/commit/6f8aa0b21b90b3940f929708ac65154e8a131f66
Author: athrxx (athrxx at scummvm.org)
Date: 2020-08-29T23:50:30+02:00
Commit Message:
DEVTOOLS: (CREATE_KYRADAT) - whitespace
Changed paths:
devtools/create_kyradat/resources/eob1_segacd.h
devtools/create_kyradat/resources/eob2_fmtowns.h
devtools/create_kyradat/resources/eob2_fmtowns_japanese.h
diff --git a/devtools/create_kyradat/resources/eob1_segacd.h b/devtools/create_kyradat/resources/eob1_segacd.h
index 91837736f8..ccf25b66ba 100644
--- a/devtools/create_kyradat/resources/eob1_segacd.h
+++ b/devtools/create_kyradat/resources/eob1_segacd.h
@@ -52,7 +52,7 @@ static const byte kEoB1SaveThrowTable1SegaCD[50] = {
0x10, 0x0e, 0x0d, 0x0b, 0x0a, 0x08, 0x07, 0x05, 0x04, 0x03, 0x12, 0x10, 0x0f, 0x0d, 0x0c, 0x0a,
0x09, 0x07, 0x06, 0x05, 0x11, 0x0f, 0x0e, 0x0c, 0x0b, 0x09, 0x08, 0x06, 0x05, 0x04, 0x14, 0x11,
0x10, 0x0d, 0x0c, 0x09, 0x08, 0x05, 0x04, 0x04, 0x13, 0x11, 0x10, 0x0e, 0x0d, 0x0b, 0x0a, 0x08,
- 0x07, 0x06
+ 0x07, 0x06
};
static const ByteProvider kEoB1SaveThrowTable1SegaCDProvider = { ARRAYSIZE(kEoB1SaveThrowTable1SegaCD), kEoB1SaveThrowTable1SegaCD };
diff --git a/devtools/create_kyradat/resources/eob2_fmtowns.h b/devtools/create_kyradat/resources/eob2_fmtowns.h
index 7d275007f7..e7b4da7333 100644
--- a/devtools/create_kyradat/resources/eob2_fmtowns.h
+++ b/devtools/create_kyradat/resources/eob2_fmtowns.h
@@ -1081,52 +1081,52 @@ static const ByteProvider kEoB2MonsterDirChangeTableFMTownsProvider = { ARRAYSIZ
static const EoBCharacter kEoB2NpcPresetsFMTowns[6] = {
{ 0x00, 0x01, "\x83""C""\x83\x93\x83""T""\x83\x8B",
- 15, 15, 0, 0, 13, 13, 11, 11, 17, 17, 16, 16, 9, 9,
+ 15, 15, 0, 0, 13, 13, 11, 11, 17, 17, 16, 16, 9, 9,
3, 39, 10, 0, 10, 5, 5, -1, 8, { 6, 0, 0 },
{ 0x00006ADA, 0x00000000, 0x00000000 }, 0x00000000,
- { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000 } },
{ 0x00, 0x01, "\x83""J""\x83\x89\x83\x93\x83""h""\x83\x89",
- 18, 18, 36, 36, 13, 13, 8, 8, 15, 15, 16, 16, 14, 14,
+ 18, 18, 36, 36, 13, 13, 8, 8, 15, 15, 16, 16, 14, 14,
4, 76, 10, 0, 1, 0, 2, -2, 12, { 9, 0, 0 },
{ 0x0003DF35, 0x00000000, 0x00000000 }, 0x00000000,
- { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000 } },
{ 0x00, 0x01, "\x83""V""\x83\x87\x81""[""\x83\x93",
- 15, 15, 0, 0, 14, 14, 13, 13, 14, 14, 13, 13, 16, 16,
+ 15, 15, 0, 0, 14, 14, 13, 13, 14, 14, 13, 13, 16, 16,
40, 40, 10, 0, 6, 4, 3, -3, 100, { 8, 0, 0 },
{ 0x00021730, 0x00000000, 0x00000000 }, 0x00000000,
- { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000 } },
{ 0x00, 0x01, "\x83""T""\x83\x93\x83\x89\x81""[""\x83\x8B",
- 11, 11, 0, 0, 18, 18, 13, 13, 14, 14, 16, 16, 9, 9,
+ 11, 11, 0, 0, 18, 18, 13, 13, 14, 14, 16, 16, 9, 9,
28, 28, 10, 0, 2, 3, 5, -4, 100, { 8, 0, 0 },
{ 0x00017AF0, 0x00000000, 0x00000000 }, 0x096B4566,
- { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000 } },
{ 0x00, 0x01, "\x83""^""\x83\x93\x83""O""\x83\x8D\x81""[",
- 16, 16, 0, 0, 13, 13, 16, 16, 15, 15, 11, 11, 12, 12,
+ 16, 16, 0, 0, 13, 13, 16, 16, 15, 15, 11, 11, 12, 12,
53, 53, 9, 0, 4, 6, 1, -5, 100, { 7, 7, 0 },
{ 0x00010FC2, 0x00010FC2, 0x00000000 }, 0xFFFFFFFF,
- { 0x0004, 0x0008, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0024, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ { 0x0004, 0x0008, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0024, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000 } },
{ 0x00, 0x01, "\x83""A""\x83\x93\x83""o""\x81""[",
- 14, 14, 0, 0, 17, 17, 12, 12, 18, 18, 9, 9, 17, 17,
+ 14, 14, 0, 0, 17, 17, 12, 12, 18, 18, 9, 9, 17, 17,
36, 36, 10, 0, 3, 10, 1, -6, 100, { 7, 7, 0 },
{ 0x0000FAE6, 0x0000FAE6, 0x00000000 }, 0x00294566,
- { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000 } }
};
diff --git a/devtools/create_kyradat/resources/eob2_fmtowns_japanese.h b/devtools/create_kyradat/resources/eob2_fmtowns_japanese.h
index be67079de5..b1d681bda5 100644
--- a/devtools/create_kyradat/resources/eob2_fmtowns_japanese.h
+++ b/devtools/create_kyradat/resources/eob2_fmtowns_japanese.h
@@ -10,7 +10,7 @@ static const char *const kEoB2ChargenStrings1FMTownsJapanese[9] = {
"\x83""L""\x83\x83\x83\x89\x83""N""\x83""^""\x81""[""\x82\xF0\x8D\xEC\x82\xE9\x82\xBD\x82\xDF\x82\xCC""\r""\x83""{""\x83""b""\x83""N""\x83""X""\x82\xF0\x8E""w""\x92\xE8\x82\xB5\x82\xC4\x82\xAD\x82\xBE\x82\xB3\x82\xA2\x81""B"
};
-static const StringListProvider kEoB2ChargenStrings1FMTownsJapaneseProvider = { ARRAYSIZE(kEoB2ChargenStrings1FMTownsJapanese), kEoB2ChargenStrings1FMTownsJapanese };
+static const StringListProvider kEoB2ChargenStrings1FMTownsJapaneseProvider = { ARRAYSIZE(kEoB2ChargenStrings1FMTownsJapanese), kEoB2ChargenStrings1FMTownsJapanese };
static const char *const kEoB2ChargenStrings2FMTownsJapanese[12] = {
"%s",
More information about the Scummvm-git-logs
mailing list