[Scummvm-git-logs] scummvm master -> 578bbea67ccf70c5faf6e7ff0a1a13a9d7f9af03
a-yyg
76591232+a-yyg at users.noreply.github.com
Sun Jul 18 08:40:09 UTC 2021
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:
935fe59e6f SAGA2: Fix global constructor warnings in beegee.cpp
578bbea67c SAGA2: Fix global constructor warning in speldata.cpp
Commit: 935fe59e6f44ead6bacb33f1bba0f38385d7bd43
https://github.com/scummvm/scummvm/commit/935fe59e6f44ead6bacb33f1bba0f38385d7bd43
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-07-18T17:10:20+09:00
Commit Message:
SAGA2: Fix global constructor warnings in beegee.cpp
Changed paths:
engines/saga2/beegee.cpp
engines/saga2/saga2.cpp
engines/saga2/saga2.h
diff --git a/engines/saga2/beegee.cpp b/engines/saga2/beegee.cpp
index c31dfd4d9c..a3359068ae 100644
--- a/engines/saga2/beegee.cpp
+++ b/engines/saga2/beegee.cpp
@@ -41,9 +41,11 @@ struct auxAudioTheme {
soundSegment loopID;
};
+static const StaticTilePoint NullTile = {(int16)minint16, (int16)minint16, (int16)minint16};
+
static auxAudioTheme aats[AUXTHEMES] = {
- {false, {Nowhere, 0}, 0},
- {false, {Nowhere, 0}, 0}
+ {false, {NullTile, 0}, 0},
+ {false, {NullTile, 0}, 0}
};
void addAuxTheme(Location loc, soundSegment lid);
@@ -139,8 +141,6 @@ extern bool debugAudioThemes;
Locals
* ===================================================================== */
-static Deejay grandMasterFTA;
-
static uint32 currentTheme = 0;
static uint32 auxTheme = 0;
static StaticPoint32 themeAt = {0, 0};
@@ -459,28 +459,28 @@ void useActiveFactions(void) {
}
}
if (highCount)
- grandMasterFTA.setEnemy(highFaction);
+ g_vm->_grandMasterFTA->setEnemy(highFaction);
else
- grandMasterFTA.setEnemy(NoEnemy);
+ g_vm->_grandMasterFTA->setEnemy(NoEnemy);
}
//-----------------------------------------------------------------------
// Aggresssion & day/night control
void audioEnvironmentSetAggression(bool onOff) {
- grandMasterFTA.setAggression(onOff);
+ g_vm->_grandMasterFTA->setAggression(onOff);
}
void audioEnvironmentSetDaytime(bool onOff) {
- grandMasterFTA.setDaytime(onOff);
+ g_vm->_grandMasterFTA->setDaytime(onOff);
}
void audioEnvironmentSuspend(bool onOff) {
- grandMasterFTA.setSuspend(onOff);
+ g_vm->_grandMasterFTA->setSuspend(onOff);
}
void audioEnvironmentSetWorld(int mapNum) {
- grandMasterFTA.setWorld(mapNum == 1);
+ g_vm->_grandMasterFTA->setWorld(mapNum == 1);
}
} // end of namespace Saga2
diff --git a/engines/saga2/saga2.cpp b/engines/saga2/saga2.cpp
index 3b2a40b4a5..bb5c8c7c3f 100644
--- a/engines/saga2/saga2.cpp
+++ b/engines/saga2/saga2.cpp
@@ -36,6 +36,7 @@
#include "saga2/fta.h"
#include "saga2/band.h"
+#include "saga2/beegee.h"
#include "saga2/contain.h"
#include "saga2/dispnode.h"
#include "saga2/gdraw.h"
@@ -87,6 +88,7 @@ Saga2Engine::Saga2Engine(OSystem *syst)
_toolBase = new gToolBase;
_properties = new Properties;
_aTaskList = new TileActivityTaskList;
+ _grandMasterFTA = new Deejay;
_edpList = nullptr;
_sdpList = nullptr;
@@ -113,6 +115,7 @@ Saga2Engine::~Saga2Engine() {
delete _toolBase;
delete _properties;
delete _aTaskList;
+ delete _grandMasterFTA;
}
Common::Error Saga2Engine::run() {
diff --git a/engines/saga2/saga2.h b/engines/saga2/saga2.h
index 635579b4a4..c79a413cbb 100644
--- a/engines/saga2/saga2.h
+++ b/engines/saga2/saga2.h
@@ -72,6 +72,7 @@ class HandleArray;
class TileActivityTaskList;
class TaskStackList;
class TaskList;
+class Deejay;
enum {
kDebugResources = 1 << 0,
@@ -158,6 +159,7 @@ public:
TileActivityTaskList *_aTaskList;
TaskStackList *_stackList;
TaskList *_taskList;
+ Deejay *_grandMasterFTA;
gDisplayPort _mainPort;
Commit: 578bbea67ccf70c5faf6e7ff0a1a13a9d7f9af03
https://github.com/scummvm/scummvm/commit/578bbea67ccf70c5faf6e7ff0a1a13a9d7f9af03
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-07-18T17:38:49+09:00
Commit Message:
SAGA2: Fix global constructor warning in speldata.cpp
Changed paths:
engines/saga2/contain.cpp
engines/saga2/magic.cpp
engines/saga2/motion.cpp
engines/saga2/objects.cpp
engines/saga2/objproto.cpp
engines/saga2/spelcast.cpp
engines/saga2/speldata.cpp
diff --git a/engines/saga2/contain.cpp b/engines/saga2/contain.cpp
index 0fb8faf3fa..50f228a151 100644
--- a/engines/saga2/contain.cpp
+++ b/engines/saga2/contain.cpp
@@ -54,7 +54,6 @@ static void *selImage;
extern ReadyContainerView *TrioCviews[kNumViews];
extern ReadyContainerView *indivCviewTop, *indivCviewBot;
-extern SpellStuff spellBook[];
extern SpriteSet *objectSprites; // object sprites
extern Alarm containerObjTextAlarm;
extern bool gameSetupComplete;
diff --git a/engines/saga2/magic.cpp b/engines/saga2/magic.cpp
index 6f42155626..249ce6617e 100644
--- a/engines/saga2/magic.cpp
+++ b/engines/saga2/magic.cpp
@@ -57,7 +57,7 @@ const int32 spellFailSound = 42;
* ===================================================================== */
extern WorldMapData *mapList;
-extern SpellStuff spellBook[];
+extern SpellStuff *spellBook;
extern Point32 lastMousePos; // Last mouse position over map
/* ===================================================================== *
diff --git a/engines/saga2/motion.cpp b/engines/saga2/motion.cpp
index 758ec060db..e9a97ab090 100644
--- a/engines/saga2/motion.cpp
+++ b/engines/saga2/motion.cpp
@@ -135,7 +135,7 @@ extern uint16 uMaxMasks[4],
vMaxMasks[4],
vMinMasks[4];
-extern SpellStuff spellBook[];
+extern SpellStuff *spellBook;
void fallingDamage(GameObject *obj, int16 speed);
/* ===================================================================== *
diff --git a/engines/saga2/objects.cpp b/engines/saga2/objects.cpp
index 7e3764aab5..cd16212f56 100644
--- a/engines/saga2/objects.cpp
+++ b/engines/saga2/objects.cpp
@@ -133,7 +133,7 @@ bool massAndBulkCount;
extern BackWindow *mainWindow;
extern StaticPoint16 fineScroll; // current scroll pos
extern hResContext *imageRes; // image resource handle
-extern SpellStuff spellBook[];
+extern SpellStuff *spellBook;
extern ObjectID pickedObject;
const uint32 imageGroupID = MKTAG('I', 'M', 'A', 'G');
diff --git a/engines/saga2/objproto.cpp b/engines/saga2/objproto.cpp
index 79b2b88989..7f1f86c6cd 100644
--- a/engines/saga2/objproto.cpp
+++ b/engines/saga2/objproto.cpp
@@ -44,7 +44,7 @@
namespace Saga2 {
-extern SpellStuff spellBook[];
+extern SpellStuff *spellBook;
extern uint8 identityColors[256];
#ifdef __WATCOMC__
diff --git a/engines/saga2/spelcast.cpp b/engines/saga2/spelcast.cpp
index caac3cc4e2..b91c5f4d91 100644
--- a/engines/saga2/spelcast.cpp
+++ b/engines/saga2/spelcast.cpp
@@ -35,7 +35,7 @@
namespace Saga2 {
extern WorldMapData *mapList;
-extern SpellStuff spellBook[];
+extern SpellStuff *spellBook;
extern bool gameRunning; // kludge
extern PlatformHandle platformList; // platform resource hunk
diff --git a/engines/saga2/speldata.cpp b/engines/saga2/speldata.cpp
index a14bfde962..c05a6ba35f 100644
--- a/engines/saga2/speldata.cpp
+++ b/engines/saga2/speldata.cpp
@@ -100,7 +100,7 @@ extern ColorTable identityColors;
* ===================================================================== */
SpriteSet *spellSprites; // longsword test sprites
-SpellStuff spellBook[maxSpells];
+SpellStuff *spellBook;
ColorTable spellColorMaps[maxSpellColorMaps];
ColorSchemeList *spellSchemes;
@@ -125,6 +125,8 @@ void initMagic(void) {
g_vm->_edpList = new EffectDisplayPrototypeList(maxEffectPrototypes);
g_vm->_sdpList = new SpellDisplayPrototypeList(maxSpellPrototypes);
+ spellBook = new SpellStuff[maxSpells]();
+
defineEffects();
loadMagicData();
@@ -150,6 +152,8 @@ void cleanupMagic(void) {
for (int i = 0; i < maxSpells; i++) {
spellBook[i].killEffects();
}
+ delete spellBook;
+
g_vm->_sdpList->cleanup();
g_vm->_edpList->cleanup();
More information about the Scummvm-git-logs
mailing list