[Scummvm-git-logs] scummvm master -> 29ab18020f4297e75f36b7dbfc6f89b42926e269
Strangerke
noreply at scummvm.org
Sun Feb 12 06:56:02 UTC 2023
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:
29ab18020f EFH: Remove trailing spaces
Commit: 29ab18020f4297e75f36b7dbfc6f89b42926e269
https://github.com/scummvm/scummvm/commit/29ab18020f4297e75f36b7dbfc6f89b42926e269
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2023-02-12T07:55:55+01:00
Commit Message:
EFH: Remove trailing spaces
Changed paths:
engines/efh/constants.cpp
engines/efh/efh.cpp
engines/efh/fight.cpp
engines/efh/init.cpp
engines/efh/menu.cpp
engines/efh/savegames.cpp
engines/efh/sound.cpp
diff --git a/engines/efh/constants.cpp b/engines/efh/constants.cpp
index 1bf4fad0a1a..9fecd5013f1 100644
--- a/engines/efh/constants.cpp
+++ b/engines/efh/constants.cpp
@@ -457,14 +457,14 @@ const int16 kSoundFrequency[72] = {
7648, 7231, 6818, 6449, 6087, // D#, E, F, F#, G
5736, 5423, 5120, 4830, 4554, // G#, A, A#, B, Middle C
4307, 4058, 3836, 3615, 3418, // C#, D, D#
- 3224, 3043, 2875, 2711, 2560,
- 2415, 2281, 2153, 2032, 1918,
- 1810, 1709, 1612, 1521, 1435,
- 1355, 1280, 1207, 1139, 1075,
- 1015, 958, 897, 854, 806,
- 760, 718, 677, 639, 603,
- 570, 538, 507, 479, 452,
- 427, 403, 380, 359, 338,
+ 3224, 3043, 2875, 2711, 2560,
+ 2415, 2281, 2153, 2032, 1918,
+ 1810, 1709, 1612, 1521, 1435,
+ 1355, 1280, 1207, 1139, 1075,
+ 1015, 958, 897, 854, 806,
+ 760, 718, 677, 639, 603,
+ 570, 538, 507, 479, 452,
+ 427, 403, 380, 359, 338,
319, 301
};
diff --git a/engines/efh/efh.cpp b/engines/efh/efh.cpp
index da62273f647..f34d9532a02 100644
--- a/engines/efh/efh.cpp
+++ b/engines/efh/efh.cpp
@@ -774,7 +774,7 @@ void EfhEngine::removeCharacterFromTeam(int16 teamMemberId) {
// Safeguard
if (teamMemberId < 0 || teamMemberId >= _teamSize)
return;
-
+
int16 charId = _teamChar[teamMemberId]._id;
_npcBuf[charId].field12_textId = _npcBuf[charId].fieldB_textId;
_npcBuf[charId].field14_textId = _npcBuf[charId].fieldE_textId;
diff --git a/engines/efh/fight.cpp b/engines/efh/fight.cpp
index bc70e68b81f..2c2655fb363 100644
--- a/engines/efh/fight.cpp
+++ b/engines/efh/fight.cpp
@@ -185,7 +185,7 @@ void EfhEngine::handleFight_checkEndEffect(int16 charId) {
// At this point : The status is different to 0 (normal) and the effect duration is finally 0 (end of effect)
_enemyNamePt2 = _npcBuf[_teamChar[charId]._id]._name;
_enemyNamePt1 = getArticle(_npcBuf[_teamChar[charId]._id].getPronoun());
-
+
// End of effect message depends on the type of effect
switch (_teamChar[charId]._status._type) {
case kEfhStatusSleeping:
@@ -221,7 +221,7 @@ void EfhEngine::handleFight_lastAction_A(int16 teamCharId) {
if (minMonsterGroupId == -1)
return;
-
+
int16 maxMonsterGroupId;
if (_items[teamCharItemId]._range == 4)
maxMonsterGroupId = 5;
@@ -468,7 +468,7 @@ void EfhEngine::handleFight_MobstersAttack(int groupId) {
// In the original, this function is part of handleFight.
// It has been split for readability purposes.
debugC(3, kDebugFight, "handleFight_MobstersAttack %d", groupId);
-
+
// handleFight - Loop on mobsterId - Start
for (uint ctrMobsterId = 0; ctrMobsterId < 9; ++ctrMobsterId) {
if (isMonsterActive(groupId, ctrMobsterId)) {
diff --git a/engines/efh/init.cpp b/engines/efh/init.cpp
index 7b720e8ae64..b19ba6d4579 100644
--- a/engines/efh/init.cpp
+++ b/engines/efh/init.cpp
@@ -395,7 +395,7 @@ EfhEngine::EfhEngine(OSystem *syst, const ADGameDescription *gd) : Engine(syst),
_saveAuthorized = false;
_speakerStream = nullptr;
-
+
if (ConfMan.hasKey("save_slot")) {
int saveSlot = ConfMan.getInt("save_slot");
if (saveSlot >= 0 && saveSlot <= 999)
diff --git a/engines/efh/menu.cpp b/engines/efh/menu.cpp
index d0627237b42..05f12943269 100644
--- a/engines/efh/menu.cpp
+++ b/engines/efh/menu.cpp
@@ -665,7 +665,7 @@ int16 EfhEngine::handleStatusMenu(int16 gameMode, int16 charId) {
prepareStatusMenu(windowId, menuId, curMenuLine, charId, true);
- } while (!selectionDoneFl); // Loop until a menu entry is confirmed by the user by pressing the enter key
+ } while (!selectionDoneFl); // Loop until a menu entry is confirmed by the user by pressing the enter key
bool validationFl = true;
@@ -737,7 +737,7 @@ int16 EfhEngine::handleStatusMenu(int16 gameMode, int16 charId) {
validationFl = false;
displayWindowAndStatusMenu(charId, windowId, menuId, curMenuLine);
}
-
+
if (validationFl) {
bool givenFl;
int16 destCharId;
diff --git a/engines/efh/savegames.cpp b/engines/efh/savegames.cpp
index a4085d890dc..bd4160efe2b 100644
--- a/engines/efh/savegames.cpp
+++ b/engines/efh/savegames.cpp
@@ -60,7 +60,7 @@ Common::Error EfhEngine::loadGameState(int slot) {
Graphics::Surface *thumbnail;
if (!Graphics::loadThumbnail(*saveFile, thumbnail))
return Common::kReadingFailed;
-
+
delete (thumbnail);
// Skip the savegame date
@@ -180,7 +180,7 @@ void EfhEngine::synchronize(Common::Serializer &s) {
for (int j = 0; j < 9; ++j)
s.syncAsSint16LE(_mapMonsters[i][idx]._hitPoints[j]);
}
-
+
for (int x = 0; x < 64; ++x) {
for (int y = 0; y < 64; ++y)
s.syncAsByte(_mapGameMaps[i][x][y]);
@@ -195,7 +195,7 @@ void EfhEngine::synchronize(Common::Serializer &s) {
for (int i = 0; i < 99; ++i) {
_npcBuf[i].synchronize(s);
}
-
+
s.syncAsByte(_saveAuthorized);
}
diff --git a/engines/efh/sound.cpp b/engines/efh/sound.cpp
index a40ddd307a2..62e1851a248 100644
--- a/engines/efh/sound.cpp
+++ b/engines/efh/sound.cpp
@@ -113,18 +113,18 @@ void EfhEngine::generateSound1(int lowFreq, int highFreq, int duration) {
_speakerStream->play(Audio::PCSpeaker::kWaveFormSquare, highFreq, -1);
songDelay(10);
- _speakerStream->stop();
+ _speakerStream->stop();
for (int i = 0; i < duration; ++i) {
var2 = ROR(var2 + 0x9248, 3);
int val = (var2 * (highFreq - lowFreq)) >> 16;
-
+
_speakerStream->play(Audio::PCSpeaker::kWaveFormSquare, lowFreq + val, -1);
songDelay(10);
- _speakerStream->stop();
+ _speakerStream->stop();
}
-
+
_mixer->stopHandle(_speakerHandle);
delete _speakerStream;
@@ -161,7 +161,7 @@ void EfhEngine::generateSound2(int startFreq, int endFreq, int speed) {
_speakerStream->stop();
curFreq += delta;
} while (curFreq < endFreq && !shouldQuit());
-
+
_mixer->stopHandle(_speakerHandle);
delete _speakerStream;
More information about the Scummvm-git-logs
mailing list