[Scummvm-git-logs] scummvm master -> 019d06bb0f7ed70ca21fd62e3b0bb81f56be1a84
bluegr
noreply at scummvm.org
Fri Oct 28 19:38:02 UTC 2022
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
019d06bb0f SAGA2: Fix calendar typo (was calender)
Commit: 019d06bb0f7ed70ca21fd62e3b0bb81f56be1a84
https://github.com/scummvm/scummvm/commit/019d06bb0f7ed70ca21fd62e3b0bb81f56be1a84
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2022-10-28T22:37:57+03:00
Commit Message:
SAGA2: Fix calendar typo (was calender)
Changed paths:
A engines/saga2/calendar.cpp
A engines/saga2/calendar.h
R engines/saga2/calender.cpp
R engines/saga2/calender.h
engines/saga2/assign.cpp
engines/saga2/module.mk
engines/saga2/saga2.cpp
engines/saga2/saga2.h
engines/saga2/sagafunc.cpp
engines/saga2/saveload.cpp
engines/saga2/script.h
engines/saga2/tilemode.cpp
engines/saga2/tilemode.h
engines/saga2/timers.h
engines/saga2/transit.cpp
diff --git a/engines/saga2/assign.cpp b/engines/saga2/assign.cpp
index e41deea0d91..24bfe2d2076 100644
--- a/engines/saga2/assign.cpp
+++ b/engines/saga2/assign.cpp
@@ -26,13 +26,13 @@
#include "saga2/saga2.h"
#include "saga2/actor.h"
#include "saga2/assign.h"
-#include "saga2/calender.h"
+#include "saga2/calendar.h"
#include "saga2/task.h"
#include "saga2/tile.h"
namespace Saga2 {
-const uint16 kIndefiniteTime = CalenderTime::kFramesPerDay;
+const uint16 kIndefiniteTime = CalendarTime::kFramesPerDay;
/* ===================================================================== *
ActorAssignment member functions
@@ -40,7 +40,7 @@ const uint16 kIndefiniteTime = CalenderTime::kFramesPerDay;
// Constructor
ActorAssignment::ActorAssignment(Actor *a, uint16 until) :
- _startFrame(g_vm->_calender->frameInDay()),
+ _startFrame(g_vm->_calendar->frameInDay()),
_endFrame(until) {
_actor = a;
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
bool ActorAssignment::isValid() {
- uint16 frame = g_vm->_calender->frameInDay();
+ uint16 frame = g_vm->_calendar->frameInDay();
return frame < _endFrame
|| (_startFrame >= _endFrame && frame >= _startFrame);
diff --git a/engines/saga2/calender.cpp b/engines/saga2/calendar.cpp
similarity index 73%
rename from engines/saga2/calender.cpp
rename to engines/saga2/calendar.cpp
index f6d2d6224bf..4163efaab4d 100644
--- a/engines/saga2/calender.cpp
+++ b/engines/saga2/calendar.cpp
@@ -24,7 +24,7 @@
*/
#include "saga2/saga2.h"
-#include "saga2/calender.h"
+#include "saga2/calendar.h"
#include "saga2/intrface.h"
#include "saga2/localize.h"
#include "saga2/saveload.h"
@@ -36,7 +36,7 @@ namespace Saga2 {
FrameAlarm member functions
* ===================================================================== */
-void CalenderTime::read(Common::InSaveFile *in) {
+void CalendarTime::read(Common::InSaveFile *in) {
_years = in->readUint16LE();
_weeks = in->readUint16LE();
_days = in->readUint16LE();
@@ -54,7 +54,7 @@ void CalenderTime::read(Common::InSaveFile *in) {
debugC(3, kDebugSaveload, "... _frameInHour = %d", _frameInHour);
}
-void CalenderTime::write(Common::MemoryWriteStreamDynamic *out) {
+void CalendarTime::write(Common::MemoryWriteStreamDynamic *out) {
out->writeUint16LE(_years);
out->writeUint16LE(_weeks);
out->writeUint16LE(_days);
@@ -72,7 +72,7 @@ void CalenderTime::write(Common::MemoryWriteStreamDynamic *out) {
debugC(3, kDebugSaveload, "... _frameInHour = %d", _frameInHour);
}
-void CalenderTime::update() {
+void CalendarTime::update() {
const char *text = nullptr;
if (++_frameInHour >= kFramesPerHour) {
@@ -120,7 +120,7 @@ void CalenderTime::update() {
}
}
-int CalenderTime::lightLevel(int maxLevel) {
+int CalendarTime::lightLevel(int maxLevel) {
int16 solarAngle,
season,
solarLevel;
@@ -168,112 +168,112 @@ void FrameAlarm::read(Common::InSaveFile *in) {
}
void FrameAlarm::set(uint16 dur) {
- _baseFrame = g_vm->_calender->frameInDay();
+ _baseFrame = g_vm->_calendar->frameInDay();
_duration = dur;
}
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
&& frameInDay >= _baseFrame
+ _duration
- - CalenderTime::kFramesPerDay;
+ - CalendarTime::kFramesPerDay;
}
// time elapsed since alarm set
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 + CalenderTime::kFramesPerDay - _baseFrame;
+ : frameInDay + CalendarTime::kFramesPerDay - _baseFrame;
}
/* ===================================================================== *
- Calender management functions
+ Calendar management functions
* ===================================================================== */
//-----------------------------------------------------------------------
-// Pause the global calender
+// Pause the global calendar
-void pauseCalender() {
- g_vm->_calender->_calenderPaused = true;
+void pauseCalendar() {
+ g_vm->_calendar->_calendarPaused = true;
}
//-----------------------------------------------------------------------
-// Restart the paused global calender
+// Restart the paused global calendar
-void resumeCalender() {
- g_vm->_calender->_calenderPaused = false;
+void resumeCalendar() {
+ g_vm->_calendar->_calendarPaused = false;
}
//-----------------------------------------------------------------------
-// Update the global calender
+// Update the global calendar
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,
time2Frame;
- time1Frame = time1._days * CalenderTime::kFramesPerDay
- + time1._hour * CalenderTime::kFramesPerHour
+ time1Frame = time1._days * CalendarTime::kFramesPerDay
+ + time1._hour * CalendarTime::kFramesPerHour
+ time1._frameInHour;
- time2Frame = time2._days * CalenderTime::kFramesPerDay
- + time2._hour * CalenderTime::kFramesPerHour
+ time2Frame = time2._days * CalendarTime::kFramesPerDay
+ + time2._hour * CalendarTime::kFramesPerHour
+ time2._frameInHour;
return time1Frame - time2Frame;
}
//-----------------------------------------------------------------------
-// Initialize the game calender
-
-void initCalender() {
- g_vm->_calender->_calenderPaused = false;
- g_vm->_calender->_years = 0;
- g_vm->_calender->_weeks = 0;
- g_vm->_calender->_days = 0;
- g_vm->_calender->_dayInYear = 0;
- g_vm->_calender->_dayInWeek = 0;
- g_vm->_calender->_hour = CalenderTime::kGameStartHour;
- g_vm->_calender->_frameInHour = 0;
+// Initialize the game calendar
+
+void initCalendar() {
+ g_vm->_calendar->_calendarPaused = false;
+ g_vm->_calendar->_years = 0;
+ g_vm->_calendar->_weeks = 0;
+ g_vm->_calendar->_days = 0;
+ g_vm->_calendar->_dayInYear = 0;
+ g_vm->_calendar->_dayInWeek = 0;
+ g_vm->_calendar->_hour = CalendarTime::kGameStartHour;
+ g_vm->_calendar->_frameInHour = 0;
}
-void saveCalender(Common::OutSaveFile *outS) {
- debugC(2, kDebugSaveload, "Saving calender");
+void saveCalendar(Common::OutSaveFile *outS) {
+ debugC(2, kDebugSaveload, "Saving calendar");
outS->write("CALE", 4);
CHUNK_BEGIN;
- out->writeUint16LE(g_vm->_calender->_calenderPaused);
- debugC(3, kDebugSaveload, "... _calenderPaused = %d", g_vm->_calender->_calenderPaused);
- g_vm->_calender->write(out);
+ out->writeUint16LE(g_vm->_calendar->_calendarPaused);
+ debugC(3, kDebugSaveload, "... _calendarPaused = %d", g_vm->_calendar->_calendarPaused);
+ g_vm->_calendar->write(out);
CHUNK_END;
}
-void loadCalender(Common::InSaveFile *in) {
- debugC(2, kDebugSaveload, "Loading calender");
+void loadCalendar(Common::InSaveFile *in) {
+ 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() {
- return g_vm->_calender->lightLevel(MAX_LIGHT) >= (MAX_LIGHT / 2);
+ return g_vm->_calendar->lightLevel(MAX_LIGHT) >= (MAX_LIGHT / 2);
}
}
diff --git a/engines/saga2/calender.h b/engines/saga2/calendar.h
similarity index 86%
rename from engines/saga2/calender.h
rename to engines/saga2/calendar.h
index d5dc4e3189d..3a51ac46b00 100644
--- a/engines/saga2/calender.h
+++ b/engines/saga2/calendar.h
@@ -23,16 +23,16 @@
* (c) 1993-1996 The Wyrmkeep Entertainment Co.
*/
-#ifndef SAGA2_CALENDER_H
-#define SAGA2_CALENDER_H
+#ifndef SAGA2_CALENDAR_H
+#define SAGA2_CALENDAR_H
namespace Saga2 {
/* ===================================================================== *
- CalenderTime class
+ CalendarTime class
* ===================================================================== */
-class CalenderTime {
+class CalendarTime {
public:
enum {
// Basic constants
@@ -61,11 +61,11 @@ public:
_hour,
_frameInHour;
- bool _calenderPaused;
+ bool _calendarPaused;
- CalenderTime() {
+ CalendarTime() {
_years = _weeks = _days = _dayInYear = _dayInWeek = _hour = _frameInHour = 0;
- _calenderPaused = false;
+ _calendarPaused = false;
}
void read(Common::InSaveFile *in);
@@ -96,19 +96,19 @@ public:
};
/* ===================================================================== *
- Calender management functions
+ Calendar management functions
* ===================================================================== */
void updateCalendar();
-void pauseCalender();
-void resumeCalender();
+void pauseCalendar();
+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 loadCalender(Common::InSaveFile *in);
+void saveCalendar(Common::OutSaveFile *outS);
+void loadCalendar(Common::InSaveFile *in);
bool isDayTime();
diff --git a/engines/saga2/module.mk b/engines/saga2/module.mk
index 787fcb90a82..873e3cea1be 100644
--- a/engines/saga2/module.mk
+++ b/engines/saga2/module.mk
@@ -9,7 +9,7 @@ MODULE_OBJS := \
beegee.o \
blitters.o \
button.o \
- calender.o \
+ calendar.o \
console.o \
contain.o \
display.o \
diff --git a/engines/saga2/saga2.cpp b/engines/saga2/saga2.cpp
index effa8c64e41..1cf56cfaf1c 100644
--- a/engines/saga2/saga2.cpp
+++ b/engines/saga2/saga2.cpp
@@ -38,7 +38,7 @@
#include "saga2/audio.h"
#include "saga2/band.h"
#include "saga2/beegee.h"
-#include "saga2/calender.h"
+#include "saga2/calendar.h"
#include "saga2/contain.h"
#include "saga2/detection.h"
#include "saga2/dispnode.h"
@@ -72,7 +72,7 @@ Saga2Engine::Saga2Engine(OSystem *syst, const SAGA2GameDescription *desc)
_audio = nullptr;
_pal = nullptr;
_act = nullptr;
- _calender = nullptr;
+ _calendar = nullptr;
_tmm = nullptr;
_cnm = nullptr;
@@ -139,7 +139,7 @@ Saga2Engine::~Saga2Engine() {
delete _renderer;
delete _pal;
delete _act;
- delete _calender;
+ delete _calendar;
delete _tmm;
delete _cnm;
@@ -167,7 +167,7 @@ Common::Error Saga2Engine::run() {
_pal = new PaletteManager;
_act = new ActorManager;
- _calender = new CalenderTime;
+ _calendar = new CalendarTime;
_tmm = new TileModeManager;
_cnm = new ContainerManager;
diff --git a/engines/saga2/saga2.h b/engines/saga2/saga2.h
index 1b304d46dbd..1495045f7fb 100644
--- a/engines/saga2/saga2.h
+++ b/engines/saga2/saga2.h
@@ -81,7 +81,7 @@ class CMapFeature;
class AudioInterface;
class PaletteManager;
class ActorManager;
-class CalenderTime;
+class CalendarTime;
class TileModeManager;
struct SAGA2GameDescription;
@@ -144,7 +144,7 @@ public:
AudioInterface *_audio;
PaletteManager *_pal;
ActorManager *_act;
- CalenderTime *_calender;
+ CalendarTime *_calendar;
TileModeManager *_tmm;
ContainerManager *_cnm;
diff --git a/engines/saga2/sagafunc.cpp b/engines/saga2/sagafunc.cpp
index 3b9ee606bdb..34ef206c0d0 100644
--- a/engines/saga2/sagafunc.cpp
+++ b/engines/saga2/sagafunc.cpp
@@ -1673,7 +1673,7 @@ int16 scriptActorAssignPatrolRoute(int16 *args) {
if (new PatrolRouteAssignment(a,
(uint16)args[0]
- * CalenderTime::kFramesPerHour,
+ * CalendarTime::kFramesPerHour,
args[1],
(uint8)args[2],
thisThread->_argCount >= 4
@@ -1705,7 +1705,7 @@ int16 scriptActorAssignPartialPatrolRoute(int16 *args) {
if (new PatrolRouteAssignment(a,
(uint16)args[0]
- * CalenderTime::kFramesPerHour,
+ * CalendarTime::kFramesPerHour,
args[1],
(uint8)args[2],
args[3],
@@ -1849,7 +1849,7 @@ int16 scriptActorAssignTetheredWander(int16 *args) {
if (new TetheredWanderAssignment(a,
(uint16)args[0]
- * CalenderTime::kFramesPerHour,
+ * CalendarTime::kFramesPerHour,
tetherReg)
!= nullptr)
return true;
@@ -1871,9 +1871,9 @@ int16 scriptActorAssignAttend(int16 *args) {
if (a->getAssignment() != nullptr) delete a->getAssignment();
if (new AttendAssignment(a,
- (g_vm->_calender->frameInDay()
+ (g_vm->_calendar->frameInDay()
+ (uint16)args[0])
- % CalenderTime::kFramesPerDay,
+ % CalendarTime::kFramesPerDay,
GameObject::objectAddress(args[1]))
!= nullptr)
return true;
@@ -3079,7 +3079,7 @@ int16 scriptPlayVoice(int16 *args) {
int16 scriptGetHour(int16 *) {
MONOLOG(GetHour);
- return g_vm->_calender->_hour;
+ return g_vm->_calendar->_hour;
}
//-----------------------------------------------------------------------
@@ -3087,7 +3087,7 @@ int16 scriptGetHour(int16 *) {
int16 scriptGetFrameInHour(int16 *) {
MONOLOG(GetFrameInHour);
- return g_vm->_calender->_frameInHour;
+ return g_vm->_calendar->_frameInHour;
}
//-----------------------------------------------------------------------
diff --git a/engines/saga2/saveload.cpp b/engines/saga2/saveload.cpp
index 9caddd41586..d704cda0661 100644
--- a/engines/saga2/saveload.cpp
+++ b/engines/saga2/saveload.cpp
@@ -114,7 +114,7 @@ void initGameState() {
pauseTimer();
initGlobals();
- initCalender();
+ initCalendar();
initWorlds();
initActors();
initObjects();
@@ -159,7 +159,7 @@ void saveGame(Common::OutSaveFile *out, Common::String saveName) {
saveGlobals(out);
saveTimer(out);
- saveCalender(out);
+ saveCalendar(out);
saveWorlds(out);
saveActors(out);
saveObjects(out);
@@ -228,7 +228,7 @@ void loadSavedGameState(int16 saveNo) {
enum {
loadGlobalsFlag = (1 << 0),
loadTimerFlag = (1 << 1),
- loadCalenderFlag = (1 << 2),
+ loadCalendarFlag = (1 << 2),
loadWorldsFlag = (1 << 3),
loadActorsFlag = (1 << 4),
loadObjectsFlag = (1 << 5),
@@ -282,8 +282,8 @@ void loadSavedGameState(int16 saveNo) {
break;
case MKTAG('C', 'A', 'L', 'E'):
- loadCalender(in);
- loadFlags |= loadCalenderFlag;
+ loadCalendar(in);
+ loadFlags |= loadCalendarFlag;
break;
case MKTAG('W', 'R', 'L', 'D'):
@@ -472,7 +472,7 @@ void loadSavedGameState(int16 saveNo) {
if (!(loadFlags & loadTimerFlag))
error("Timer not loaded");
- if (!(loadFlags & loadCalenderFlag))
+ if (!(loadFlags & loadCalendarFlag))
error("Game calendar not loaded");
if (!(loadFlags & loadWorldsFlag))
diff --git a/engines/saga2/script.h b/engines/saga2/script.h
index 24e424860ef..cbe3ab40901 100644
--- a/engines/saga2/script.h
+++ b/engines/saga2/script.h
@@ -27,7 +27,7 @@
#define SAGA2_SCRIPT_H
#include "saga2/objects.h"
-#include "saga2/calender.h"
+#include "saga2/calendar.h"
namespace Saga2 {
diff --git a/engines/saga2/tilemode.cpp b/engines/saga2/tilemode.cpp
index 5951d0743f8..27ed752638a 100644
--- a/engines/saga2/tilemode.cpp
+++ b/engines/saga2/tilemode.cpp
@@ -242,7 +242,7 @@ char luckyKey(char *choices) {
// This function performs all combat pausing tasks
static void pauseCombat() {
- pauseCalender();
+ pauseCalendar();
pauseBackgroundSimulation();
pauseInterruptableMotions();
pauseObjectStates();
@@ -263,7 +263,7 @@ static void resumeCombat() {
resumeObjectStates();
resumeInterruptableMotions();
resumeBackgroundSimulation();
- resumeCalender();
+ resumeCalendar();
}
//-----------------------------------------------------------------------
@@ -327,7 +327,7 @@ void logAggressiveAct(ObjectID attackerID, ObjectID attackeeID) {
handlePlayerActorAttacked(playerID);
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
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() {
- _timeOfLastAggressiveAct = new CalenderTime;
+ _timeOfLastAggressiveAct = new CalendarTime;
}
TileModeManager::~TileModeManager() {
diff --git a/engines/saga2/tilemode.h b/engines/saga2/tilemode.h
index 9fa3a77c2c2..2ce741edd47 100644
--- a/engines/saga2/tilemode.h
+++ b/engines/saga2/tilemode.h
@@ -57,7 +57,7 @@ void noStickyMap();
class TileModeManager {
public:
- CalenderTime *_timeOfLastAggressiveAct; // Used to determine the
+ CalendarTime *_timeOfLastAggressiveAct;
TileModeManager();
~TileModeManager();
diff --git a/engines/saga2/timers.h b/engines/saga2/timers.h
index 78b3b38b5a9..098a5bbadfd 100644
--- a/engines/saga2/timers.h
+++ b/engines/saga2/timers.h
@@ -27,7 +27,7 @@
#define SAGA2_TIMERS_H
#include "saga2/idtypes.h"
-#include "saga2/calender.h"
+#include "saga2/calendar.h"
#include "saga2/objects.h"
namespace Saga2 {
diff --git a/engines/saga2/transit.cpp b/engines/saga2/transit.cpp
index f4f72677767..590d6c692a0 100644
--- a/engines/saga2/transit.cpp
+++ b/engines/saga2/transit.cpp
@@ -28,7 +28,7 @@
#include "saga2/tile.h"
#include "saga2/vpal.h"
#include "saga2/palette.h"
-#include "saga2/calender.h"
+#include "saga2/calendar.h"
#include "saga2/modal.h"
#include "saga2/display.h"
@@ -62,7 +62,7 @@ void dayNightUpdate() {
audioEnvironmentSetDaytime(isDayTime());
- uint32 lightLevel = g_vm->_calender->lightLevel(MAX_LIGHT);
+ uint32 lightLevel = g_vm->_calendar->lightLevel(MAX_LIGHT);
// Code to avoid unneccessary fades.
if (lightLevel != g_vm->_pal->_prevLightLevel) {
More information about the Scummvm-git-logs
mailing list