[Scummvm-git-logs] scummvm master -> 3c730ffa977a9f05b3ad25e4798818ce509215e5
a-yyg
76591232+a-yyg at users.noreply.github.com
Fri Aug 20 09:04:51 UTC 2021
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
5b1872672c SAGA2: Rename constants in calender.h
0e3b035d3e SAGA2: Rename class variables in calender.h
6cbd517e22 SAGA2: Remove dead code from combat.h
3c730ffa97 SAGA2: Add missed delayMillis calls after updateScreen
Commit: 5b1872672c56333c832a062dd084d5222d5ac920
https://github.com/scummvm/scummvm/commit/5b1872672c56333c832a062dd084d5222d5ac920
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-08-20T18:03:05+09:00
Commit Message:
SAGA2: Rename constants in calender.h
Changed paths:
engines/saga2/assign.cpp
engines/saga2/calender.cpp
engines/saga2/calender.h
engines/saga2/sagafunc.cpp
diff --git a/engines/saga2/assign.cpp b/engines/saga2/assign.cpp
index a972183326..eaf0391c4e 100644
--- a/engines/saga2/assign.cpp
+++ b/engines/saga2/assign.cpp
@@ -33,7 +33,7 @@
namespace Saga2 {
-const uint16 indefinitely = CalenderTime::framesPerDay;
+const uint16 indefinitely = CalenderTime::kFramesPerDay;
/* ===================================================================== *
ActorAssignment member functions
diff --git a/engines/saga2/calender.cpp b/engines/saga2/calender.cpp
index e88204a194..59f4a608ff 100644
--- a/engines/saga2/calender.cpp
+++ b/engines/saga2/calender.cpp
@@ -39,8 +39,6 @@ namespace Saga2 {
static bool calenderPaused;
-const int dayBias = CalenderTime::framesAtNoon / 6;
-
/* ===================================================================== *
Constants
* ===================================================================== */
@@ -90,20 +88,20 @@ void CalenderTime::write(Common::MemoryWriteStreamDynamic *out) {
void CalenderTime::update(void) {
const char *text = NULL;
- if (++frameInHour >= framesPerHour) {
+ if (++frameInHour >= kFramesPerHour) {
frameInHour = 0;
- if (++hour >= hoursPerDay) {
+ if (++hour >= kHoursPerDay) {
hour = 0;
days++;
- if (++dayInWeek >= daysPerWeek) {
+ if (++dayInWeek >= kDaysPerWeek) {
dayInWeek = 0;
weeks++;
}
- if (++dayInYear >= daysPerYear) {
+ if (++dayInYear >= kDaysPerYear) {
dayInYear = 0;
years++;
}
@@ -141,31 +139,31 @@ int CalenderTime::lightLevel(int maxLevel) {
solarLevel;
// solarAngle equals starts at 0 at midnight, then linearly
- // grows to 'framesAtNoon' at noon, then shrinks
+ // grows to 'kFramesAtNoon' at noon, then shrinks
// back to 0 at midnight again.
- solarAngle = framesAtNoon
- - ABS(frameInDay() - framesAtNoon);
+ solarAngle = kFramesAtNoon
+ - ABS(frameInDay() - kFramesAtNoon);
// Just for fun, we'll make the days longer in the summer,
// and shorter the winter. The calculation produces a number
- // which equals daysPerYear/4 in summer, and -daysperYear/4
+ // which equals kDaysPerYear/4 in summer, and -daysperYear/4
// in winter.
- season = daysPerYear / 4 - ABS(dayInYear - daysPerYear / 2);
+ season = kDaysPerYear / 4 - ABS(dayInYear - kDaysPerYear / 2);
// Convert season to an extra hour of daylight in summer,
// and an extra hour of night in winter. (That's an extra
// hour in the morning AND in the evening.
- season = season * framesPerHour / (daysPerYear / 4);
+ season = season * kFramesPerHour / (kDaysPerYear / 4);
- // This produces a triangle wave that goes from -framesAtNoon/3
- // to framesAtNoon*2/3. Then we clip off the part of the
+ // This produces a triangle wave that goes from -kFramesAtNoon/3
+ // to kFramesAtNoon*2/3. Then we clip off the part of the
// curve below zero, and above 1/3, giving 1/3 night,
// 1/6 morning, 1/3 day, and 1/6 evening.
- solarLevel = clamp(g_vm->_showNight ? /* 0 */ (dayBias * 5 / 4) : (framesAtNoon / 3),
- solarAngle * 2 + season - framesAtNoon / 3 + dayBias * 2,
- framesAtNoon / 3);
+ solarLevel = clamp(g_vm->_showNight ? /* 0 */ (kDayBias * 5 / 4) : (kFramesAtNoon / 3),
+ solarAngle * 2 + season - kFramesAtNoon / 3 + kDayBias * 2,
+ kFramesAtNoon / 3);
- return (solarLevel * maxLevel) / (framesAtNoon / 3);
+ return (solarLevel * maxLevel) / (kFramesAtNoon / 3);
}
/* ===================================================================== *
@@ -190,12 +188,12 @@ void FrameAlarm::set(uint16 dur) {
bool FrameAlarm::check(void) {
uint16 frameInDay = calender.frameInDay();
- return baseFrame + duration < CalenderTime::framesPerDay
+ return baseFrame + duration < CalenderTime::kFramesPerDay
? frameInDay >= baseFrame + duration
: frameInDay < baseFrame
&& frameInDay >= baseFrame
+ duration
- - CalenderTime::framesPerDay;
+ - CalenderTime::kFramesPerDay;
}
// time elapsed since alarm set
@@ -203,11 +201,11 @@ bool FrameAlarm::check(void) {
uint16 FrameAlarm::elapsed(void) {
uint16 frameInDay = calender.frameInDay();
- return baseFrame + duration < CalenderTime::framesPerDay
+ return baseFrame + duration < CalenderTime::kFramesPerDay
? frameInDay - baseFrame
: frameInDay >= baseFrame
? frameInDay - baseFrame
- : frameInDay + CalenderTime::framesPerDay - baseFrame;
+ : frameInDay + CalenderTime::kFramesPerDay - baseFrame;
}
/* ===================================================================== *
@@ -242,11 +240,11 @@ uint32 operator - (const CalenderTime &time1, const CalenderTime &time2) {
uint32 time1Frame,
time2Frame;
- time1Frame = time1.days * CalenderTime::framesPerDay
- + time1.hour * CalenderTime::framesPerHour
+ time1Frame = time1.days * CalenderTime::kFramesPerDay
+ + time1.hour * CalenderTime::kFramesPerHour
+ time1.frameInHour;
- time2Frame = time2.days * CalenderTime::framesPerDay
- + time2.hour * CalenderTime::framesPerHour
+ time2Frame = time2.days * CalenderTime::kFramesPerDay
+ + time2.hour * CalenderTime::kFramesPerHour
+ time2.frameInHour;
return time1Frame - time2Frame;
diff --git a/engines/saga2/calender.h b/engines/saga2/calender.h
index a7f565e560..44aecd5921 100644
--- a/engines/saga2/calender.h
+++ b/engines/saga2/calender.h
@@ -37,17 +37,19 @@ class CalenderTime {
public:
enum {
// Basic constants
- daysPerWeek = 7,
- daysPerYear = 365,
- hoursPerDay = 24,
- realMinutesPerDay = 30,
+ kDaysPerWeek = 7,
+ kDaysPerYear = 365,
+ kHoursPerDay = 24,
+ kRealMinutesPerDay = 30,
// Number of animation frames per day
- framesPerDay = 10 * 60 * realMinutesPerDay,
+ kFramesPerDay = 10 * 60 * kRealMinutesPerDay,
// Derived variables
- framesPerHour = (framesPerDay / hoursPerDay),
- framesAtNoon = (framesPerDay / 2)
+ kFramesPerHour = (kFramesPerDay / kHoursPerDay),
+ kFramesAtNoon = (kFramesPerDay / 2),
+
+ kDayBias = kFramesAtNoon / 6
};
uint16 years,
@@ -65,7 +67,7 @@ public:
int lightLevel(int maxLevel);
uint16 frameInDay(void) {
- return hour * framesPerHour + frameInHour;
+ return hour * kFramesPerHour + frameInHour;
}
};
diff --git a/engines/saga2/sagafunc.cpp b/engines/saga2/sagafunc.cpp
index 4a9ef680ff..7a98287d95 100644
--- a/engines/saga2/sagafunc.cpp
+++ b/engines/saga2/sagafunc.cpp
@@ -1676,7 +1676,7 @@ int16 scriptActorAssignPatrolRoute(int16 *args) {
if (new PatrolRouteAssignment(a,
(uint16)args[0]
- * CalenderTime::framesPerHour,
+ * CalenderTime::kFramesPerHour,
args[1],
(uint8)args[2],
thisThread->argCount >= 4
@@ -1708,7 +1708,7 @@ int16 scriptActorAssignPartialPatrolRoute(int16 *args) {
if (new PatrolRouteAssignment(a,
(uint16)args[0]
- * CalenderTime::framesPerHour,
+ * CalenderTime::kFramesPerHour,
args[1],
(uint8)args[2],
args[3],
@@ -1852,7 +1852,7 @@ int16 scriptActorAssignTetheredWander(int16 *args) {
if (new TetheredWanderAssignment(a,
(uint16)args[0]
- * CalenderTime::framesPerHour,
+ * CalenderTime::kFramesPerHour,
tetherReg)
!= NULL)
return true;
@@ -1876,7 +1876,7 @@ int16 scriptActorAssignAttend(int16 *args) {
if (new AttendAssignment(a,
(calender.frameInDay()
+ (uint16)args[0])
- % CalenderTime::framesPerDay,
+ % CalenderTime::kFramesPerDay,
GameObject::objectAddress(args[1]))
!= NULL)
return true;
Commit: 0e3b035d3ef9b6f4f384230e2604a86525703d2a
https://github.com/scummvm/scummvm/commit/0e3b035d3ef9b6f4f384230e2604a86525703d2a
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-08-20T18:03:05+09:00
Commit Message:
SAGA2: Rename class variables in calender.h
Changed paths:
engines/saga2/calender.cpp
engines/saga2/calender.h
engines/saga2/sagafunc.cpp
diff --git a/engines/saga2/calender.cpp b/engines/saga2/calender.cpp
index 59f4a608ff..abf2f805ef 100644
--- a/engines/saga2/calender.cpp
+++ b/engines/saga2/calender.cpp
@@ -50,64 +50,64 @@ const uint16 GAME_START_HOUR = 5;
* ===================================================================== */
void CalenderTime::read(Common::InSaveFile *in) {
- years = in->readUint16LE();
- weeks = in->readUint16LE();
- days = in->readUint16LE();
- dayInYear = in->readUint16LE();
- dayInWeek = in->readUint16LE();
- hour = in->readUint16LE();
- frameInHour = in->readUint16LE();
-
- debugC(3, kDebugSaveload, "... years = %d", years);
- debugC(3, kDebugSaveload, "... weeks = %d", weeks);
- debugC(3, kDebugSaveload, "... days = %d", days);
- debugC(3, kDebugSaveload, "... dayInYear = %d", dayInYear);
- debugC(3, kDebugSaveload, "... dayInWeek = %d", dayInWeek);
- debugC(3, kDebugSaveload, "... hour = %d", hour);
- debugC(3, kDebugSaveload, "... frameInHour = %d", frameInHour);
+ _years = in->readUint16LE();
+ _weeks = in->readUint16LE();
+ _days = in->readUint16LE();
+ _dayInYear = in->readUint16LE();
+ _dayInWeek = in->readUint16LE();
+ _hour = in->readUint16LE();
+ _frameInHour = in->readUint16LE();
+
+ debugC(3, kDebugSaveload, "... _years = %d", _years);
+ debugC(3, kDebugSaveload, "... _weeks = %d", _weeks);
+ debugC(3, kDebugSaveload, "... _days = %d", _days);
+ debugC(3, kDebugSaveload, "... _dayInYear = %d", _dayInYear);
+ debugC(3, kDebugSaveload, "... _dayInWeek = %d", _dayInWeek);
+ debugC(3, kDebugSaveload, "... _hour = %d", _hour);
+ debugC(3, kDebugSaveload, "... _frameInHour = %d", _frameInHour);
}
void CalenderTime::write(Common::MemoryWriteStreamDynamic *out) {
- out->writeUint16LE(years);
- out->writeUint16LE(weeks);
- out->writeUint16LE(days);
- out->writeUint16LE(dayInYear);
- out->writeUint16LE(dayInWeek);
- out->writeUint16LE(hour);
- out->writeUint16LE(frameInHour);
-
- debugC(3, kDebugSaveload, "... years = %d", years);
- debugC(3, kDebugSaveload, "... weeks = %d", weeks);
- debugC(3, kDebugSaveload, "... days = %d", days);
- debugC(3, kDebugSaveload, "... dayInYear = %d", dayInYear);
- debugC(3, kDebugSaveload, "... dayInWeek = %d", dayInWeek);
- debugC(3, kDebugSaveload, "... hour = %d", hour);
- debugC(3, kDebugSaveload, "... frameInHour = %d", frameInHour);
+ out->writeUint16LE(_years);
+ out->writeUint16LE(_weeks);
+ out->writeUint16LE(_days);
+ out->writeUint16LE(_dayInYear);
+ out->writeUint16LE(_dayInWeek);
+ out->writeUint16LE(_hour);
+ out->writeUint16LE(_frameInHour);
+
+ debugC(3, kDebugSaveload, "... _years = %d", _years);
+ debugC(3, kDebugSaveload, "... _weeks = %d", _weeks);
+ debugC(3, kDebugSaveload, "... _days = %d", _days);
+ debugC(3, kDebugSaveload, "... _dayInYear = %d", _dayInYear);
+ debugC(3, kDebugSaveload, "... _dayInWeek = %d", _dayInWeek);
+ debugC(3, kDebugSaveload, "... _hour = %d", _hour);
+ debugC(3, kDebugSaveload, "... _frameInHour = %d", _frameInHour);
}
void CalenderTime::update(void) {
const char *text = NULL;
- if (++frameInHour >= kFramesPerHour) {
- frameInHour = 0;
+ if (++_frameInHour >= kFramesPerHour) {
+ _frameInHour = 0;
- if (++hour >= kHoursPerDay) {
- hour = 0;
+ if (++_hour >= kHoursPerDay) {
+ _hour = 0;
- days++;
+ _days++;
- if (++dayInWeek >= kDaysPerWeek) {
- dayInWeek = 0;
- weeks++;
+ if (++_dayInWeek >= kDaysPerWeek) {
+ _dayInWeek = 0;
+ _weeks++;
}
- if (++dayInYear >= kDaysPerYear) {
- dayInYear = 0;
- years++;
+ if (++_dayInYear >= kDaysPerYear) {
+ _dayInYear = 0;
+ _years++;
}
}
- switch (hour) {
+ switch (_hour) {
case 0:
text = HOUR00_TIME;
break;
@@ -129,7 +129,7 @@ void CalenderTime::update(void) {
}
if (text)
- StatusMsg(CALENDAR_STATUS, text, dayInWeek + 1, weeks + 1);
+ StatusMsg(CALENDAR_STATUS, text, _dayInWeek + 1, _weeks + 1);
}
}
@@ -148,7 +148,7 @@ int CalenderTime::lightLevel(int maxLevel) {
// and shorter the winter. The calculation produces a number
// which equals kDaysPerYear/4 in summer, and -daysperYear/4
// in winter.
- season = kDaysPerYear / 4 - ABS(dayInYear - kDaysPerYear / 2);
+ season = kDaysPerYear / 4 - ABS(_dayInYear - kDaysPerYear / 2);
// Convert season to an extra hour of daylight in summer,
// and an extra hour of night in winter. (That's an extra
@@ -171,28 +171,28 @@ int CalenderTime::lightLevel(int maxLevel) {
* ===================================================================== */
void FrameAlarm::write(Common::MemoryWriteStreamDynamic *out) {
- out->writeUint16LE(baseFrame);
- out->writeUint16LE(duration);
+ out->writeUint16LE(_baseFrame);
+ out->writeUint16LE(_duration);
}
void FrameAlarm::read(Common::InSaveFile *in) {
- baseFrame = in->readUint16LE();
- duration = in->readUint16LE();
+ _baseFrame = in->readUint16LE();
+ _duration = in->readUint16LE();
}
void FrameAlarm::set(uint16 dur) {
- baseFrame = calender.frameInDay();
- duration = dur;
+ _baseFrame = calender.frameInDay();
+ _duration = dur;
}
bool FrameAlarm::check(void) {
uint16 frameInDay = calender.frameInDay();
- return baseFrame + duration < CalenderTime::kFramesPerDay
- ? frameInDay >= baseFrame + duration
- : frameInDay < baseFrame
- && frameInDay >= baseFrame
- + duration
+ return _baseFrame + _duration < CalenderTime::kFramesPerDay
+ ? frameInDay >= _baseFrame + _duration
+ : frameInDay < _baseFrame
+ && frameInDay >= _baseFrame
+ + _duration
- CalenderTime::kFramesPerDay;
}
@@ -201,11 +201,11 @@ bool FrameAlarm::check(void) {
uint16 FrameAlarm::elapsed(void) {
uint16 frameInDay = calender.frameInDay();
- return baseFrame + duration < CalenderTime::kFramesPerDay
- ? frameInDay - baseFrame
- : frameInDay >= baseFrame
- ? frameInDay - baseFrame
- : frameInDay + CalenderTime::kFramesPerDay - baseFrame;
+ return _baseFrame + _duration < CalenderTime::kFramesPerDay
+ ? frameInDay - _baseFrame
+ : frameInDay >= _baseFrame
+ ? frameInDay - _baseFrame
+ : frameInDay + CalenderTime::kFramesPerDay - _baseFrame;
}
/* ===================================================================== *
@@ -240,12 +240,12 @@ uint32 operator - (const CalenderTime &time1, const CalenderTime &time2) {
uint32 time1Frame,
time2Frame;
- time1Frame = time1.days * CalenderTime::kFramesPerDay
- + time1.hour * CalenderTime::kFramesPerHour
- + time1.frameInHour;
- time2Frame = time2.days * CalenderTime::kFramesPerDay
- + time2.hour * CalenderTime::kFramesPerHour
- + time2.frameInHour;
+ time1Frame = time1._days * CalenderTime::kFramesPerDay
+ + time1._hour * CalenderTime::kFramesPerHour
+ + time1._frameInHour;
+ time2Frame = time2._days * CalenderTime::kFramesPerDay
+ + time2._hour * CalenderTime::kFramesPerHour
+ + time2._frameInHour;
return time1Frame - time2Frame;
}
@@ -255,13 +255,13 @@ uint32 operator - (const CalenderTime &time1, const CalenderTime &time2) {
void initCalender(void) {
calenderPaused = false;
- calender.years = 0;
- calender.weeks = 0;
- calender.days = 0;
- calender.dayInYear = 0;
- calender.dayInWeek = 0;
- calender.hour = GAME_START_HOUR;
- calender.frameInHour = 0;
+ calender._years = 0;
+ calender._weeks = 0;
+ calender._days = 0;
+ calender._dayInYear = 0;
+ calender._dayInWeek = 0;
+ calender._hour = GAME_START_HOUR;
+ calender._frameInHour = 0;
}
void saveCalender(Common::OutSaveFile *outS) {
diff --git a/engines/saga2/calender.h b/engines/saga2/calender.h
index 44aecd5921..52128c4bc1 100644
--- a/engines/saga2/calender.h
+++ b/engines/saga2/calender.h
@@ -52,13 +52,13 @@ public:
kDayBias = kFramesAtNoon / 6
};
- uint16 years,
- weeks,
- days,
- dayInYear,
- dayInWeek,
- hour,
- frameInHour;
+ uint16 _years,
+ _weeks,
+ _days,
+ _dayInYear,
+ _dayInWeek,
+ _hour,
+ _frameInHour;
void read(Common::InSaveFile *in);
void write(Common::MemoryWriteStreamDynamic *out);
@@ -67,7 +67,7 @@ public:
int lightLevel(int maxLevel);
uint16 frameInDay(void) {
- return hour * kFramesPerHour + frameInHour;
+ return _hour * kFramesPerHour + _frameInHour;
}
};
@@ -76,8 +76,8 @@ public:
* ===================================================================== */
class FrameAlarm {
- uint16 baseFrame,
- duration;
+ uint16 _baseFrame,
+ _duration;
public:
void set(uint16 dur);
bool check(void);
diff --git a/engines/saga2/sagafunc.cpp b/engines/saga2/sagafunc.cpp
index 7a98287d95..970d671a80 100644
--- a/engines/saga2/sagafunc.cpp
+++ b/engines/saga2/sagafunc.cpp
@@ -3130,7 +3130,7 @@ int16 scriptPlayVoice(int16 *args) {
int16 scriptGetHour(int16 *) {
MONOLOG(GetHour);
- return calender.hour;
+ return calender._hour;
}
//-----------------------------------------------------------------------
@@ -3138,7 +3138,7 @@ int16 scriptGetHour(int16 *) {
int16 scriptGetFrameInHour(int16 *) {
MONOLOG(GetFrameInHour);
- return calender.frameInHour;
+ return calender._frameInHour;
}
//-----------------------------------------------------------------------
Commit: 6cbd517e2234489577ebe28c67236f49fae08b3b
https://github.com/scummvm/scummvm/commit/6cbd517e2234489577ebe28c67236f49fae08b3b
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-08-20T18:03:05+09:00
Commit Message:
SAGA2: Remove dead code from combat.h
Changed paths:
engines/saga2/combat.h
engines/saga2/idtypes.h
engines/saga2/weapons.cpp
diff --git a/engines/saga2/combat.h b/engines/saga2/combat.h
index fc34b58662..26945cee43 100644
--- a/engines/saga2/combat.h
+++ b/engines/saga2/combat.h
@@ -31,31 +31,6 @@ namespace Saga2 {
class Location;
-enum weaponHitType {
- hitMiss = 0,
- hitShield,
- hitTarget
-};
-
-//-----------------------------------------------------------------------
-
-#define nullWeapon 0
-
-enum combatSound {
- arrowFlesh = 1,
- arrowWood,
- bluntBreak,
- bluntFlesh,
- bluntMetal,
- swordBreak,
- swordFlesh,
- swordMetal,
- whoosh1,
- whoosh2,
- whoosh3
-};
-
-
void makeCombatSound(uint8 cs, Location l);
void makeGruntSound(uint8 cs, Location l);
diff --git a/engines/saga2/idtypes.h b/engines/saga2/idtypes.h
index c343112f21..c93067eeef 100644
--- a/engines/saga2/idtypes.h
+++ b/engines/saga2/idtypes.h
@@ -250,6 +250,7 @@ typedef uint8 ColorTable[256];
const int kNumViews = 3;
enum {
+ kNullWeapon = 0,
kMaxWeapons = 256
};
diff --git a/engines/saga2/weapons.cpp b/engines/saga2/weapons.cpp
index 96da0ee379..1561d790db 100644
--- a/engines/saga2/weapons.cpp
+++ b/engines/saga2/weapons.cpp
@@ -128,7 +128,7 @@ void cleanupWeapons(void) {
WeaponStuff &getWeapon(weaponID i) {
if (i < g_vm->_loadedWeapons)
return g_vm->_weaponRack[i];
- return g_vm->_weaponRack[nullWeapon];
+ return g_vm->_weaponRack[kNullWeapon];
}
GameObject *getShieldItem(GameObject *defender) {
@@ -173,7 +173,7 @@ void WeaponStrikeEffect::implement(Actor *enactor, GameObject *target, GameObjec
WeaponStuff::WeaponStuff() {
_effects = NULL;
- _master = nullWeapon;
+ _master = kNullWeapon;
}
WeaponStuff::~WeaponStuff() {
@@ -183,7 +183,7 @@ WeaponStuff::~WeaponStuff() {
_effects = _effects->_next;
delete curEffect;
}
- _master = nullWeapon;
+ _master = kNullWeapon;
}
void WeaponStuff::killEffects(void) {
Commit: 3c730ffa977a9f05b3ad25e4798818ce509215e5
https://github.com/scummvm/scummvm/commit/3c730ffa977a9f05b3ad25e4798818ce509215e5
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-08-20T18:03:05+09:00
Commit Message:
SAGA2: Add missed delayMillis calls after updateScreen
Changed paths:
engines/saga2/main.cpp
engines/saga2/video.cpp
engines/saga2/vpal.cpp
diff --git a/engines/saga2/main.cpp b/engines/saga2/main.cpp
index 94a4f12848..9ec7a99dc1 100644
--- a/engines/saga2/main.cpp
+++ b/engines/saga2/main.cpp
@@ -343,6 +343,7 @@ void displayUpdate(void) {
updateIndicators();
g_system->updateScreen();
+ g_system->delayMillis(10);
if (delayReDraw)
reDrawScreen();
@@ -410,6 +411,7 @@ void SystemEventLoop(void) {
}
g_system->updateScreen();
+ g_system->delayMillis(10);
}
/********************************************************************/
diff --git a/engines/saga2/video.cpp b/engines/saga2/video.cpp
index de6f6814c7..87f0b24c10 100644
--- a/engines/saga2/video.cpp
+++ b/engines/saga2/video.cpp
@@ -77,6 +77,7 @@ bool Saga2Engine::checkVideo(void) {
g_system->getPaletteManager()->setPalette(_smkDecoder->getPalette(), 0, 256);
g_system->updateScreen();
+ g_system->delayMillis(10);
}
}
diff --git a/engines/saga2/vpal.cpp b/engines/saga2/vpal.cpp
index eb09f05348..26518b3c3d 100644
--- a/engines/saga2/vpal.cpp
+++ b/engines/saga2/vpal.cpp
@@ -229,6 +229,7 @@ bool updatePalette() {
assertCurrentPalette();
g_system->updateScreen();
+ g_system->delayMillis(10);
}
return true;
}
More information about the Scummvm-git-logs
mailing list