thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SAGA2: Fix calendar typo (was calender)

Browse source
This commit is contained in:
Hubert Maier 2022-10-28 21:37:57 +02:00 • committed by GitHub
parent b3205edcc9
commit 019d06bb0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 96 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/saga2/assign.cpp
View file

@ -26,13 +26,13 @@
#include "saga2/saga2.h" #include "saga2/saga2.h"
#include "saga2/actor.h" #include "saga2/actor.h"
#include "saga2/assign.h" #include "saga2/assign.h"
#include "saga2/calender.h" #include "saga2/calendar.h"
#include "saga2/task.h" #include "saga2/task.h"
#include "saga2/tile.h" #include "saga2/tile.h"
namespace Saga2 { namespace Saga2 {
const uint16 kIndefiniteTime = CalenderTime::kFramesPerDay; const uint16 kIndefiniteTime = CalendarTime::kFramesPerDay;
/* ===================================================================== * /* ===================================================================== *
ActorAssignment member functions ActorAssignment member functions
@ -40,7 +40,7 @@ const uint16 kIndefiniteTime = CalenderTime::kFramesPerDay;
// Constructor // Constructor
ActorAssignment::ActorAssignment(Actor *a, uint16 until) : ActorAssignment::ActorAssignment(Actor *a, uint16 until) :
_startFrame(g_vm->_calender->frameInDay()), _startFrame(g_vm->_calendar->frameInDay()),
_endFrame(until) { _endFrame(until) {
_actor = a; _actor = a;
debugC(2, kDebugActors, "New assignment for %p (%s) from %d until %d: %p", debugC(2, kDebugActors, "New assignment for %p (%s) from %d until %d: %p",
@ -95,7 +95,7 @@ void ActorAssignment::write(Common::MemoryWriteStreamDynamic *out) const {
// Determine if the time limit for this assignment has been exceeded // Determine if the time limit for this assignment has been exceeded
bool ActorAssignment::isValid() { bool ActorAssignment::isValid() {
uint16 frame = g_vm->_calender->frameInDay(); uint16 frame = g_vm->_calendar->frameInDay();
return frame < _endFrame return frame < _endFrame
|| (_startFrame >= _endFrame && frame >= _startFrame); || (_startFrame >= _endFrame && frame >= _startFrame);

96
engines/saga2/calender.cpp → engines/saga2/calendar.cpp
View file

@ -24,7 +24,7 @@
*/ */
#include "saga2/saga2.h" #include "saga2/saga2.h"
#include "saga2/calender.h" #include "saga2/calendar.h"
#include "saga2/intrface.h" #include "saga2/intrface.h"
#include "saga2/localize.h" #include "saga2/localize.h"
#include "saga2/saveload.h" #include "saga2/saveload.h"
@ -36,7 +36,7 @@ namespace Saga2 {
FrameAlarm member functions FrameAlarm member functions
* ===================================================================== */ * ===================================================================== */
void CalenderTime::read(Common::InSaveFile *in) { void CalendarTime::read(Common::InSaveFile *in) {
_years = in->readUint16LE(); _years = in->readUint16LE();
_weeks = in->readUint16LE(); _weeks = in->readUint16LE();
_days = in->readUint16LE(); _days = in->readUint16LE();
@ -54,7 +54,7 @@ void CalenderTime::read(Common::InSaveFile *in) {
debugC(3, kDebugSaveload, "... _frameInHour = %d", _frameInHour); debugC(3, kDebugSaveload, "... _frameInHour = %d", _frameInHour);
} }
void CalenderTime::write(Common::MemoryWriteStreamDynamic *out) { void CalendarTime::write(Common::MemoryWriteStreamDynamic *out) {
out->writeUint16LE(_years); out->writeUint16LE(_years);
out->writeUint16LE(_weeks); out->writeUint16LE(_weeks);
out->writeUint16LE(_days); out->writeUint16LE(_days);
@ -72,7 +72,7 @@ void CalenderTime::write(Common::MemoryWriteStreamDynamic *out) {
debugC(3, kDebugSaveload, "... _frameInHour = %d", _frameInHour); debugC(3, kDebugSaveload, "... _frameInHour = %d", _frameInHour);
} }
void CalenderTime::update() { void CalendarTime::update() {
const char *text = nullptr; const char *text = nullptr;
if (++_frameInHour >= kFramesPerHour) { if (++_frameInHour >= kFramesPerHour) {
@ -120,7 +120,7 @@ void CalenderTime::update() {
} }
} }
int CalenderTime::lightLevel(int maxLevel) { int CalendarTime::lightLevel(int maxLevel) {
int16 solarAngle, int16 solarAngle,
season, season,
solarLevel; solarLevel;
@ -168,112 +168,112 @@ void FrameAlarm::read(Common::InSaveFile *in) {
} }
void FrameAlarm::set(uint16 dur) { void FrameAlarm::set(uint16 dur) {
_baseFrame = g_vm->_calender->frameInDay(); _baseFrame = g_vm->_calendar->frameInDay();
_duration = dur; _duration = dur;
} }
bool FrameAlarm::check() { bool FrameAlarm::check() {
uint16 frameInDay = g_vm->_calender->frameInDay(); uint16 frameInDay = g_vm->_calendar->frameInDay();
return _baseFrame + _duration < CalenderTime::kFramesPerDay return _baseFrame + _duration < CalendarTime::kFramesPerDay
? frameInDay >= _baseFrame + _duration ? frameInDay >= _baseFrame + _duration
: frameInDay < _baseFrame : frameInDay < _baseFrame
&& frameInDay >= _baseFrame && frameInDay >= _baseFrame
+ _duration + _duration
- CalenderTime::kFramesPerDay; - CalendarTime::kFramesPerDay;
} }
// time elapsed since alarm set // time elapsed since alarm set
uint16 FrameAlarm::elapsed() { uint16 FrameAlarm::elapsed() {
uint16 frameInDay = g_vm->_calender->frameInDay(); uint16 frameInDay = g_vm->_calendar->frameInDay();
return _baseFrame + _duration < CalenderTime::kFramesPerDay return _baseFrame + _duration < CalendarTime::kFramesPerDay
? frameInDay - _baseFrame ? frameInDay - _baseFrame
: frameInDay >= _baseFrame : frameInDay >= _baseFrame
? frameInDay - _baseFrame ? frameInDay - _baseFrame
: frameInDay + CalenderTime::kFramesPerDay - _baseFrame; : frameInDay + CalendarTime::kFramesPerDay - _baseFrame;
} }
/* ===================================================================== * /* ===================================================================== *
Calender management functions Calendar management functions
* ===================================================================== */ * ===================================================================== */
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// Pause the global calender // Pause the global calendar
void pauseCalender() { void pauseCalendar() {
g_vm->_calender->_calenderPaused = true; g_vm->_calendar->_calendarPaused = true;
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// Restart the paused global calender // Restart the paused global calendar
void resumeCalender() { void resumeCalendar() {
g_vm->_calender->_calenderPaused = false; g_vm->_calendar->_calendarPaused = false;
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// Update the global calender // Update the global calendar
void updateCalendar() { void updateCalendar() {
if (!g_vm->_calender->_calenderPaused) g_vm->_calender->update(); if (!g_vm->_calendar->_calendarPaused) g_vm->_calendar->update();
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// CalenderTime subtraction operator // CalendarTime subtraction operator
uint32 operator - (const CalenderTime &time1, const CalenderTime &time2) { uint32 operator - (const CalendarTime &time1, const CalendarTime &time2) {
uint32 time1Frame, uint32 time1Frame,
time2Frame; time2Frame;
time1Frame = time1._days * CalenderTime::kFramesPerDay time1Frame = time1._days * CalendarTime::kFramesPerDay
+ time1._hour * CalenderTime::kFramesPerHour + time1._hour * CalendarTime::kFramesPerHour
+ time1._frameInHour; + time1._frameInHour;
time2Frame = time2._days * CalenderTime::kFramesPerDay time2Frame = time2._days * CalendarTime::kFramesPerDay
+ time2._hour * CalenderTime::kFramesPerHour + time2._hour * CalendarTime::kFramesPerHour
+ time2._frameInHour; + time2._frameInHour;
return time1Frame - time2Frame; return time1Frame - time2Frame;
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
// Initialize the game calender // Initialize the game calendar
void initCalender() { void initCalendar() {
g_vm->_calender->_calenderPaused = false; g_vm->_calendar->_calendarPaused = false;
g_vm->_calender->_years = 0; g_vm->_calendar->_years = 0;
g_vm->_calender->_weeks = 0; g_vm->_calendar->_weeks = 0;
g_vm->_calender->_days = 0; g_vm->_calendar->_days = 0;
g_vm->_calender->_dayInYear = 0; g_vm->_calendar->_dayInYear = 0;
g_vm->_calender->_dayInWeek = 0; g_vm->_calendar->_dayInWeek = 0;
g_vm->_calender->_hour = CalenderTime::kGameStartHour; g_vm->_calendar->_hour = CalendarTime::kGameStartHour;
g_vm->_calender->_frameInHour = 0; g_vm->_calendar->_frameInHour = 0;
} }
void saveCalender(Common::OutSaveFile *outS) { void saveCalendar(Common::OutSaveFile *outS) {
debugC(2, kDebugSaveload, "Saving calender"); debugC(2, kDebugSaveload, "Saving calendar");
outS->write("CALE", 4); outS->write("CALE", 4);
CHUNK_BEGIN; CHUNK_BEGIN;
out->writeUint16LE(g_vm->_calender->_calenderPaused); out->writeUint16LE(g_vm->_calendar->_calendarPaused);
debugC(3, kDebugSaveload, "... _calenderPaused = %d", g_vm->_calender->_calenderPaused); debugC(3, kDebugSaveload, "... _calendarPaused = %d", g_vm->_calendar->_calendarPaused);
g_vm->_calender->write(out); g_vm->_calendar->write(out);
CHUNK_END; CHUNK_END;
} }
void loadCalender(Common::InSaveFile *in) { void loadCalendar(Common::InSaveFile *in) {
debugC(2, kDebugSaveload, "Loading calender"); debugC(2, kDebugSaveload, "Loading calendar");
g_vm->_calender->_calenderPaused = in->readUint16LE(); g_vm->_calendar->_calendarPaused = in->readUint16LE();
debugC(3, kDebugSaveload, "... _calenderPaused = %d", g_vm->_calender->_calenderPaused); debugC(3, kDebugSaveload, "... _calendarPaused = %d", g_vm->_calendar->_calendarPaused);
g_vm->_calender->read(in); g_vm->_calendar->read(in);
} }
bool isDayTime() { bool isDayTime() {
return g_vm->_calender->lightLevel(MAX_LIGHT) >= (MAX_LIGHT / 2); return g_vm->_calendar->lightLevel(MAX_LIGHT) >= (MAX_LIGHT / 2);
} }
} }

28
engines/saga2/calender.h → engines/saga2/calendar.h
View file

@ -23,16 +23,16 @@
* (c) 1993-1996 The Wyrmkeep Entertainment Co. * (c) 1993-1996 The Wyrmkeep Entertainment Co.
*/ */
#ifndef SAGA2_CALENDER_H #ifndef SAGA2_CALENDAR_H
#define SAGA2_CALENDER_H #define SAGA2_CALENDAR_H
namespace Saga2 { namespace Saga2 {
/* ===================================================================== * /* ===================================================================== *
CalenderTime class CalendarTime class
* ===================================================================== */ * ===================================================================== */
class CalenderTime { class CalendarTime {
public: public:
enum { enum {
// Basic constants // Basic constants
@ -61,11 +61,11 @@ public:
_hour, _hour,
_frameInHour; _frameInHour;
bool _calenderPaused; bool _calendarPaused;
CalenderTime() { CalendarTime() {
_years = _weeks = _days = _dayInYear = _dayInWeek = _hour = _frameInHour = 0; _years = _weeks = _days = _dayInYear = _dayInWeek = _hour = _frameInHour = 0;
_calenderPaused = false; _calendarPaused = false;
} }
void read(Common::InSaveFile *in); void read(Common::InSaveFile *in);
@ -96,19 +96,19 @@ public:
}; };
/* ===================================================================== * /* ===================================================================== *
Calender management functions Calendar management functions
* ===================================================================== */ * ===================================================================== */
void updateCalendar(); void updateCalendar();
void pauseCalender(); void pauseCalendar();
void resumeCalender(); void resumeCalendar();
uint32 operator - (const CalenderTime &time1, const CalenderTime &time2); uint32 operator - (const CalendarTime &time1, const CalendarTime &time2);
void initCalender(); void initCalendar();
void saveCalender(Common::OutSaveFile *outS); void saveCalendar(Common::OutSaveFile *outS);
void loadCalender(Common::InSaveFile *in); void loadCalendar(Common::InSaveFile *in);
bool isDayTime(); bool isDayTime();

2
engines/saga2/module.mk
View file

@ -9,7 +9,7 @@ MODULE_OBJS := \
beegee.o \ beegee.o \
blitters.o \ blitters.o \
button.o \ button.o \
calender.o \ calendar.o \
console.o \ console.o \
contain.o \ contain.o \
display.o \ display.o \

8
engines/saga2/saga2.cpp
View file

@ -38,7 +38,7 @@
#include "saga2/audio.h" #include "saga2/audio.h"
#include "saga2/band.h" #include "saga2/band.h"
#include "saga2/beegee.h" #include "saga2/beegee.h"
#include "saga2/calender.h" #include "saga2/calendar.h"
#include "saga2/contain.h" #include "saga2/contain.h"
#include "saga2/detection.h" #include "saga2/detection.h"
#include "saga2/dispnode.h" #include "saga2/dispnode.h"
@ -72,7 +72,7 @@ Saga2Engine::Saga2Engine(OSystem *syst, const SAGA2GameDescription *desc)
_audio = nullptr; _audio = nullptr;
_pal = nullptr; _pal = nullptr;
_act = nullptr; _act = nullptr;
_calender = nullptr; _calendar = nullptr;
_tmm = nullptr; _tmm = nullptr;
_cnm = nullptr; _cnm = nullptr;
@ -139,7 +139,7 @@ Saga2Engine::~Saga2Engine() {
delete _renderer; delete _renderer;
delete _pal; delete _pal;
delete _act; delete _act;
delete _calender; delete _calendar;
delete _tmm; delete _tmm;
delete _cnm; delete _cnm;
@ -167,7 +167,7 @@ Common::Error Saga2Engine::run() {
_pal = new PaletteManager; _pal = new PaletteManager;
_act = new ActorManager; _act = new ActorManager;
_calender = new CalenderTime; _calendar = new CalendarTime;
_tmm = new TileModeManager; _tmm = new TileModeManager;
_cnm = new ContainerManager; _cnm = new ContainerManager;

4
engines/saga2/saga2.h
View file

@ -81,7 +81,7 @@ class CMapFeature;
class AudioInterface; class AudioInterface;
class PaletteManager; class PaletteManager;
class ActorManager; class ActorManager;
class CalenderTime; class CalendarTime;
class TileModeManager; class TileModeManager;
struct SAGA2GameDescription; struct SAGA2GameDescription;
@ -144,7 +144,7 @@ public:
AudioInterface *_audio; AudioInterface *_audio;
PaletteManager *_pal; PaletteManager *_pal;
ActorManager *_act; ActorManager *_act;
CalenderTime *_calender; CalendarTime *_calendar;
TileModeManager *_tmm; TileModeManager *_tmm;
ContainerManager *_cnm; ContainerManager *_cnm;

14
engines/saga2/sagafunc.cpp
View file

@ -1673,7 +1673,7 @@ int16 scriptActorAssignPatrolRoute(int16 *args) {
if (new PatrolRouteAssignment(a, if (new PatrolRouteAssignment(a,
(uint16)args[0] (uint16)args[0]
* CalenderTime::kFramesPerHour, * CalendarTime::kFramesPerHour,
args[1], args[1],
(uint8)args[2], (uint8)args[2],
thisThread->_argCount >= 4 thisThread->_argCount >= 4
@ -1705,7 +1705,7 @@ int16 scriptActorAssignPartialPatrolRoute(int16 *args) {
if (new PatrolRouteAssignment(a, if (new PatrolRouteAssignment(a,
(uint16)args[0] (uint16)args[0]
* CalenderTime::kFramesPerHour, * CalendarTime::kFramesPerHour,
args[1], args[1],
(uint8)args[2], (uint8)args[2],
args[3], args[3],
@ -1849,7 +1849,7 @@ int16 scriptActorAssignTetheredWander(int16 *args) {
if (new TetheredWanderAssignment(a, if (new TetheredWanderAssignment(a,
(uint16)args[0] (uint16)args[0]
* CalenderTime::kFramesPerHour, * CalendarTime::kFramesPerHour,
tetherReg) tetherReg)
!= nullptr) != nullptr)
return true; return true;
@ -1871,9 +1871,9 @@ int16 scriptActorAssignAttend(int16 *args) {
if (a->getAssignment() != nullptr) delete a->getAssignment(); if (a->getAssignment() != nullptr) delete a->getAssignment();
if (new AttendAssignment(a, if (new AttendAssignment(a,
(g_vm->_calender->frameInDay() (g_vm->_calendar->frameInDay()
+ (uint16)args[0]) + (uint16)args[0])
% CalenderTime::kFramesPerDay, % CalendarTime::kFramesPerDay,
GameObject::objectAddress(args[1])) GameObject::objectAddress(args[1]))
!= nullptr) != nullptr)
return true; return true;
@ -3079,7 +3079,7 @@ int16 scriptPlayVoice(int16 *args) {
int16 scriptGetHour(int16 *) { int16 scriptGetHour(int16 *) {
MONOLOG(GetHour); MONOLOG(GetHour);
return g_vm->_calender->_hour; return g_vm->_calendar->_hour;
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -3087,7 +3087,7 @@ int16 scriptGetHour(int16 *) {
int16 scriptGetFrameInHour(int16 *) { int16 scriptGetFrameInHour(int16 *) {
MONOLOG(GetFrameInHour); MONOLOG(GetFrameInHour);
return g_vm->_calender->_frameInHour; return g_vm->_calendar->_frameInHour;
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------

12
engines/saga2/saveload.cpp
View file

@ -114,7 +114,7 @@ void initGameState() {
pauseTimer(); pauseTimer();
initGlobals(); initGlobals();
initCalender(); initCalendar();
initWorlds(); initWorlds();
initActors(); initActors();
initObjects(); initObjects();
@ -159,7 +159,7 @@ void saveGame(Common::OutSaveFile *out, Common::String saveName) {
saveGlobals(out); saveGlobals(out);
saveTimer(out); saveTimer(out);
saveCalender(out); saveCalendar(out);
saveWorlds(out); saveWorlds(out);
saveActors(out); saveActors(out);
saveObjects(out); saveObjects(out);
@ -228,7 +228,7 @@ void loadSavedGameState(int16 saveNo) {
enum { enum {
loadGlobalsFlag = (1 << 0), loadGlobalsFlag = (1 << 0),
loadTimerFlag = (1 << 1), loadTimerFlag = (1 << 1),
loadCalenderFlag = (1 << 2), loadCalendarFlag = (1 << 2),
loadWorldsFlag = (1 << 3), loadWorldsFlag = (1 << 3),
loadActorsFlag = (1 << 4), loadActorsFlag = (1 << 4),
loadObjectsFlag = (1 << 5), loadObjectsFlag = (1 << 5),
@ -282,8 +282,8 @@ void loadSavedGameState(int16 saveNo) {
break; break;
case MKTAG('C', 'A', 'L', 'E'): case MKTAG('C', 'A', 'L', 'E'):
loadCalender(in); loadCalendar(in);
loadFlags |= loadCalenderFlag; loadFlags |= loadCalendarFlag;
break; break;
case MKTAG('W', 'R', 'L', 'D'): case MKTAG('W', 'R', 'L', 'D'):
@ -472,7 +472,7 @@ void loadSavedGameState(int16 saveNo) {
if (!(loadFlags & loadTimerFlag)) if (!(loadFlags & loadTimerFlag))
error("Timer not loaded"); error("Timer not loaded");
if (!(loadFlags & loadCalenderFlag)) if (!(loadFlags & loadCalendarFlag))
error("Game calendar not loaded"); error("Game calendar not loaded");
if (!(loadFlags & loadWorldsFlag)) if (!(loadFlags & loadWorldsFlag))

2
engines/saga2/script.h
View file

@ -27,7 +27,7 @@
#define SAGA2_SCRIPT_H #define SAGA2_SCRIPT_H
#include "saga2/objects.h" #include "saga2/objects.h"
#include "saga2/calender.h" #include "saga2/calendar.h"
namespace Saga2 { namespace Saga2 {

10
engines/saga2/tilemode.cpp
View file

@ -242,7 +242,7 @@ char luckyKey(char *choices) {
// This function performs all combat pausing tasks // This function performs all combat pausing tasks
static void pauseCombat() { static void pauseCombat() {
pauseCalender(); pauseCalendar();
pauseBackgroundSimulation(); pauseBackgroundSimulation();
pauseInterruptableMotions(); pauseInterruptableMotions();
pauseObjectStates(); pauseObjectStates();
@ -263,7 +263,7 @@ static void resumeCombat() {
resumeObjectStates(); resumeObjectStates();
resumeInterruptableMotions(); resumeInterruptableMotions();
resumeBackgroundSimulation(); resumeBackgroundSimulation();
resumeCalender(); resumeCalendar();
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -327,7 +327,7 @@ void logAggressiveAct(ObjectID attackerID, ObjectID attackeeID) {
handlePlayerActorAttacked(playerID); handlePlayerActorAttacked(playerID);
aggressiveActFlag = true; aggressiveActFlag = true;
*g_vm->_tmm->_timeOfLastAggressiveAct = *g_vm->_calender; *g_vm->_tmm->_timeOfLastAggressiveAct = *g_vm->_calendar;
} }
} }
@ -336,7 +336,7 @@ void logAggressiveAct(ObjectID attackerID, ObjectID attackeeID) {
// involving a player actor // involving a player actor
uint16 timeSinceLastAggressiveAct() { uint16 timeSinceLastAggressiveAct() {
return aggressiveActFlag ? *g_vm->_calender - *g_vm->_tmm->_timeOfLastAggressiveAct : maxuint16; return aggressiveActFlag ? *g_vm->_calendar - *g_vm->_tmm->_timeOfLastAggressiveAct : maxuint16;
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
@ -1438,7 +1438,7 @@ void noStickyMap() {
} }
TileModeManager::TileModeManager() { TileModeManager::TileModeManager() {
_timeOfLastAggressiveAct = new CalenderTime; _timeOfLastAggressiveAct = new CalendarTime;
} }
TileModeManager::~TileModeManager() { TileModeManager::~TileModeManager() {

2
engines/saga2/tilemode.h
View file

@ -57,7 +57,7 @@ void noStickyMap();
class TileModeManager { class TileModeManager {
public: public:
CalenderTime *_timeOfLastAggressiveAct; // Used to determine the CalendarTime *_timeOfLastAggressiveAct;
TileModeManager(); TileModeManager();
~TileModeManager(); ~TileModeManager();

2
engines/saga2/timers.h
View file

@ -27,7 +27,7 @@
#define SAGA2_TIMERS_H #define SAGA2_TIMERS_H
#include "saga2/idtypes.h" #include "saga2/idtypes.h"
#include "saga2/calender.h" #include "saga2/calendar.h"
#include "saga2/objects.h" #include "saga2/objects.h"
namespace Saga2 { namespace Saga2 {

4
engines/saga2/transit.cpp
View file

@ -28,7 +28,7 @@
#include "saga2/tile.h" #include "saga2/tile.h"
#include "saga2/vpal.h" #include "saga2/vpal.h"
#include "saga2/palette.h" #include "saga2/palette.h"
#include "saga2/calender.h" #include "saga2/calendar.h"
#include "saga2/modal.h" #include "saga2/modal.h"
#include "saga2/display.h" #include "saga2/display.h"
@ -62,7 +62,7 @@ void dayNightUpdate() {
audioEnvironmentSetDaytime(isDayTime()); audioEnvironmentSetDaytime(isDayTime());
uint32 lightLevel = g_vm->_calender->lightLevel(MAX_LIGHT); uint32 lightLevel = g_vm->_calendar->lightLevel(MAX_LIGHT);
// Code to avoid unneccessary fades. // Code to avoid unneccessary fades.
if (lightLevel != g_vm->_pal->_prevLightLevel) { if (lightLevel != g_vm->_pal->_prevLightLevel) {