[Scummvm-git-logs] scummvm master -> 01d264569ca243552d6c65d9d2245ab3adb8bfb8
bluegr
noreply at scummvm.org
Mon Jun 27 11:15:41 UTC 2022
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:
24de0150a2 PINK: Rename class Director to Screen
01d264569c PINK: Rename director.h/cpp to screen.h/cpp
Commit: 24de0150a220d0b3d1aa43ea2d341cc8f035fc4f
https://github.com/scummvm/scummvm/commit/24de0150a220d0b3d1aa43ea2d341cc8f035fc4f
Author: Avijeet (am388488 at gmail.com)
Date: 2022-06-27T14:15:34+03:00
Commit Message:
PINK: Rename class Director to Screen
Changed paths:
engines/pink/director.cpp
engines/pink/director.h
engines/pink/gui.cpp
engines/pink/objects/actions/action.cpp
engines/pink/objects/actions/action.h
engines/pink/objects/actions/action_cel.cpp
engines/pink/objects/actions/action_cel.h
engines/pink/objects/actions/action_sound.cpp
engines/pink/objects/actions/action_text.cpp
engines/pink/objects/actors/actor.cpp
engines/pink/objects/actors/actor.h
engines/pink/objects/actors/lead_actor.cpp
engines/pink/objects/pages/page.cpp
engines/pink/pda_mgr.cpp
engines/pink/pink.cpp
engines/pink/pink.h
diff --git a/engines/pink/director.cpp b/engines/pink/director.cpp
index 950ae771e08..205926a51ae 100644
--- a/engines/pink/director.cpp
+++ b/engines/pink/director.cpp
@@ -81,7 +81,7 @@ static const Graphics::MacMenuData menuSubItems[] = {
*/
static void redrawCallback(void *ref) {
- Director *dir = (Director *)ref;
+ Screen *dir = (Screen *)ref;
if (dir->getWndManager().isMenuActive()) {
dir->addDirtyRect(Common::Rect(0, 0, 640, 480));
@@ -89,7 +89,7 @@ static void redrawCallback(void *ref) {
}
}
-Director::Director(PinkEngine *vm)
+Screen::Screen(PinkEngine *vm)
: _surface(640, 480), _textRendered(false) {
uint32 wmMode = Graphics::kWMModeNoDesktop | Graphics::kWMModeAutohideMenu
| Graphics::kWMModalMenuMode | Graphics::kWMModeForceBuiltinFonts
@@ -124,14 +124,14 @@ Director::Director(PinkEngine *vm)
}
}
-Director::~Director() {
+Screen::~Screen() {
delete _wm;
if (_textFontCleanup)
delete _textFont;
}
-void Director::update() {
+void Screen::update() {
if (_wm->isMenuActive()) {
_wm->draw();
g_system->updateScreen();
@@ -152,22 +152,22 @@ void Director::update() {
_wm->draw();
}
-bool Director::processEvent(Common::Event &event) {
+bool Screen::processEvent(Common::Event &event) {
return _wm->processEvent(event);
}
-void Director::setPalette(const byte *palette) {
+void Screen::setPalette(const byte *palette) {
g_system->getPaletteManager()->setPalette(palette, 0, 256);
_wm->passPalette(palette, 256);
}
-void Director::addTextAction(ActionText *txt) {
+void Screen::addTextAction(ActionText *txt) {
_textActions.push_back(txt);
_textRendered = false;
}
-void Director::removeTextAction(ActionText *action) {
+void Screen::removeTextAction(ActionText *action) {
for (uint i = 0; i < _textActions.size(); ++i) {
if (_textActions[i] == action) {
_textActions.remove_at(i);
@@ -176,11 +176,11 @@ void Director::removeTextAction(ActionText *action) {
}
}
-void Director::addTextWindow(Graphics::MacTextWindow *window) {
+void Screen::addTextWindow(Graphics::MacTextWindow *window) {
_textWindows.push_back(window);
}
-void Director::removeTextWindow(Graphics::MacTextWindow *window) {
+void Screen::removeTextWindow(Graphics::MacTextWindow *window) {
for (uint i = 0; i < _textWindows.size(); i++) {
if (_textWindows[i] == window) {
_textWindows.remove_at(i);
@@ -189,7 +189,7 @@ void Director::removeTextWindow(Graphics::MacTextWindow *window) {
}
}
-void Director::addSprite(ActionCEL *sprite) {
+void Screen::addSprite(ActionCEL *sprite) {
_sprites.push_back(sprite);
int i;
for (i = _sprites.size() - 1; i > 0 ; --i) {
@@ -201,7 +201,7 @@ void Director::addSprite(ActionCEL *sprite) {
_sprites[i] = sprite;
}
-void Director::removeSprite(ActionCEL *sprite) {
+void Screen::removeSprite(ActionCEL *sprite) {
for (uint i = 0; i < _sprites.size(); ++i) {
if (sprite == _sprites[i]) {
_sprites.remove_at(i);
@@ -211,38 +211,38 @@ void Director::removeSprite(ActionCEL *sprite) {
_dirtyRects.push_back(sprite->getBounds());
}
-void Director::removeSound(ActionSound *sound) {
+void Screen::removeSound(ActionSound *sound) {
for (uint i = 0; i < _sounds.size(); ++i) {
if (_sounds[i] == sound)
_sounds.remove_at(i);
}
}
-void Director::clear() {
+void Screen::clear() {
_dirtyRects.push_back(Common::Rect(0, 0, 640, 480));
_sprites.resize(0);
draw();
}
-void Director::pause(bool pause_) {
+void Screen::pause(bool pause_) {
for (uint i = 0; i < _sprites.size() ; ++i) {
_sprites[i]->pause(pause_);
}
}
-void Director::saveStage() {
+void Screen::saveStage() {
_savedSprites = _sprites;
clear();
}
-void Director::loadStage() {
+void Screen::loadStage() {
assert(_sprites.empty());
_dirtyRects.push_back(Common::Rect(0, 0, 640, 480));
_sprites = _savedSprites;
_savedSprites.clear();
}
-Actor *Director::getActorByPoint(Common::Point point) {
+Actor *Screen::getActorByPoint(Common::Point point) {
for (int i = _sprites.size() - 1; i >= 0; --i) {
if (_sprites[i]->getActor()->isCursor())
continue;
@@ -259,7 +259,7 @@ Actor *Director::getActorByPoint(Common::Point point) {
return nullptr;
}
-void Director::draw(bool blit) {
+void Screen::draw(bool blit) {
if (!_dirtyRects.empty() || !_textRendered) {
mergeDirtyRects();
@@ -282,7 +282,7 @@ void Director::draw(bool blit) {
g_system->updateScreen();
}
-void Director::mergeDirtyRects() {
+void Screen::mergeDirtyRects() {
Common::Array<Common::Rect>::iterator rOuter, rInner;
for (rOuter = _dirtyRects.begin(); rOuter != _dirtyRects.end(); ++rOuter) {
rInner = rOuter;
@@ -301,11 +301,11 @@ void Director::mergeDirtyRects() {
}
}
-void Director::addDirtyRect(const Common::Rect &rect) {
+void Screen::addDirtyRect(const Common::Rect &rect) {
_dirtyRects.push_back(rect);
}
-void Director::addDirtyRects(ActionCEL *sprite) {
+void Screen::addDirtyRects(ActionCEL *sprite) {
const Common::Rect spriteRect = sprite->getBounds();
const Common::List<Common::Rect> *dirtyRects = sprite->getDecoder()->getDirtyRects();
if (dirtyRects->size() > 100) {
@@ -320,7 +320,7 @@ void Director::addDirtyRects(ActionCEL *sprite) {
sprite->getDecoder()->clearDirtyRects();
}
-void Director::drawRect(const Common::Rect &rect) {
+void Screen::drawRect(const Common::Rect &rect) {
_surface.fillRect(rect, 0);
for (uint i = 0; i < _sprites.size(); ++i) {
const Common::Rect &spriteRect = _sprites[i]->getBounds();
diff --git a/engines/pink/director.h b/engines/pink/director.h
index 5ed03caf1a1..dd489c1c9d4 100644
--- a/engines/pink/director.h
+++ b/engines/pink/director.h
@@ -41,10 +41,10 @@ class ActionSound;
class ActionText;
class PinkEngine;
-class Director {
+class Screen {
public:
- Director(PinkEngine *vm);
- ~Director();
+ Screen(PinkEngine *vm);
+ ~Screen();
void update();
bool processEvent(Common::Event &event);
diff --git a/engines/pink/gui.cpp b/engines/pink/gui.cpp
index 0552430668c..37f93e36f28 100644
--- a/engines/pink/gui.cpp
+++ b/engines/pink/gui.cpp
@@ -134,9 +134,9 @@ static void menuCommandsCallback(int action, Common::U32String &, void *data) {
}
void PinkEngine::initMenu() {
- _director->getWndManager().setEngine(this);
+ _screen->getWndManager().setEngine(this);
- _menu = Graphics::MacMenu::createMenuFromPEexe(_exeResources, &_director->getWndManager());
+ _menu = Graphics::MacMenu::createMenuFromPEexe(_exeResources, &_screen->getWndManager());
if (getLanguage() == Common::HE_ISR) {
_menu->setAlignment(Graphics::kTextAlignRight);
}
diff --git a/engines/pink/objects/actions/action.cpp b/engines/pink/objects/actions/action.cpp
index 81d99d44c7d..d1c9ef60841 100644
--- a/engines/pink/objects/actions/action.cpp
+++ b/engines/pink/objects/actions/action.cpp
@@ -30,7 +30,7 @@ void Action::deserialize(Archive &archive) {
_actor = static_cast<Actor *>(archive.readObject());
}
-bool Action::initPalette(Director *director) {
+bool Action::initPalette(Screen *screen) {
return false;
}
diff --git a/engines/pink/objects/actions/action.h b/engines/pink/objects/actions/action.h
index 8ce3302da6a..3415a616b2e 100644
--- a/engines/pink/objects/actions/action.h
+++ b/engines/pink/objects/actions/action.h
@@ -28,13 +28,13 @@
namespace Pink {
class Actor;
-class Director;
+class Screen;
class Action : public NamedObject {
public:
void deserialize(Archive &archive) override;
- virtual bool initPalette(Director *director);
+ virtual bool initPalette(Screen *screen);
virtual void start() = 0;
virtual void end() = 0;
diff --git a/engines/pink/objects/actions/action_cel.cpp b/engines/pink/objects/actions/action_cel.cpp
index 455512dd579..e098f33c0a9 100644
--- a/engines/pink/objects/actions/action_cel.cpp
+++ b/engines/pink/objects/actions/action_cel.cpp
@@ -42,13 +42,13 @@ void ActionCEL::deserialize(Archive &archive) {
_z = archive.readDWORD();
}
-bool ActionCEL::initPalette(Director *director) {
+bool ActionCEL::initPalette(Screen *screen) {
loadDecoder();
if (_decoder.getCurFrame() == -1) {
_decoder.decodeNextFrame();
_decoder.rewind();
}
- director->setPalette(_decoder.getPalette());
+ screen->setPalette(_decoder.getPalette());
return true;
}
@@ -56,11 +56,11 @@ void ActionCEL::start() {
loadDecoder();
_decoder.start();
this->onStart();
- _actor->getPage()->getGame()->getDirector()->addSprite(this);
+ _actor->getPage()->getGame()->getScreen()->addSprite(this);
}
void ActionCEL::end() {
- _actor->getPage()->getGame()->getDirector()->removeSprite(this);
+ _actor->getPage()->getGame()->getScreen()->removeSprite(this);
_decoder.close();
}
@@ -94,18 +94,18 @@ void ActionCEL::setFrame(uint frame) {
}
_decoder.clearDirtyRects();
- _actor->getPage()->getGame()->getDirector()->addDirtyRect(_bounds);
+ _actor->getPage()->getGame()->getScreen()->addDirtyRect(_bounds);
}
void ActionCEL::decodeNext() {
_decoder.decodeNextFrame();
- _actor->getPage()->getGame()->getDirector()->addDirtyRects(this);
+ _actor->getPage()->getGame()->getScreen()->addDirtyRects(this);
}
void ActionCEL::setCenter(Common::Point center) {
- _actor->getPage()->getGame()->getDirector()->addDirtyRect(_bounds);
+ _actor->getPage()->getGame()->getScreen()->addDirtyRect(_bounds);
_bounds = Common::Rect::center(center.x, center.y, _decoder.getWidth(), _decoder.getHeight());
- _actor->getPage()->getGame()->getDirector()->addDirtyRect(_bounds);
+ _actor->getPage()->getGame()->getScreen()->addDirtyRect(_bounds);
}
} // End of namespace Pink
diff --git a/engines/pink/objects/actions/action_cel.h b/engines/pink/objects/actions/action_cel.h
index 6c6574c3fa5..4f54c0b842b 100644
--- a/engines/pink/objects/actions/action_cel.h
+++ b/engines/pink/objects/actions/action_cel.h
@@ -35,7 +35,7 @@ public:
void deserialize(Archive &archive) override;
- bool initPalette(Director *director) override;
+ bool initPalette(Screen *screen) override;
void start() override;
void end() override;
diff --git a/engines/pink/objects/actions/action_sound.cpp b/engines/pink/objects/actions/action_sound.cpp
index e78fcf5407e..665de953638 100644
--- a/engines/pink/objects/actions/action_sound.cpp
+++ b/engines/pink/objects/actions/action_sound.cpp
@@ -54,8 +54,8 @@ void ActionSound::start() {
Page *page = _actor->getPage();
if (!_isLoop) {
- Director *director = page->getGame()->getDirector();
- director->addSound(this);
+ Screen *screen = page->getGame()->getScreen();
+ screen->addSound(this);
} else
_actor->endAction();
@@ -67,8 +67,8 @@ void ActionSound::start() {
void ActionSound::end() {
_sound.stop();
if (!_isLoop) {
- Director *director = _actor->getPage()->getGame()->getDirector();
- director->removeSound(this);
+ Screen *screen = _actor->getPage()->getGame()->getScreen();
+ screen->removeSound(this);
}
debugC(6, kPinkDebugActions, "ActionSound %s of Actor %s is ended", _name.c_str(), _actor->getName().c_str());
diff --git a/engines/pink/objects/actions/action_text.cpp b/engines/pink/objects/actions/action_text.cpp
index 94a29fe7c7d..116a078a6b7 100644
--- a/engines/pink/objects/actions/action_text.cpp
+++ b/engines/pink/objects/actions/action_text.cpp
@@ -77,7 +77,7 @@ void ActionText::toConsole() const {
void ActionText::start() {
findColorsInPalette();
- Director *director = _actor->getPage()->getGame()->getDirector();
+ Screen *screen = _actor->getPage()->getGame()->getScreen();
Graphics::TextAlign align = _centered ? Graphics::kTextAlignCenter : Graphics::kTextAlignLeft;
Common::SeekableReadStream *stream = _actor->getPage()->getResourceStream(_fileName);
@@ -125,7 +125,7 @@ void ActionText::start() {
_text.deleteLastChar();
if (_scrollBar) {
- _txtWnd = director->getWndManager().addTextWindow(director->getTextFont(), _textColorIndex, _backgroundColorIndex,
+ _txtWnd = screen->getWndManager().addTextWindow(screen->getTextFont(), _textColorIndex, _backgroundColorIndex,
_xRight - _xLeft, align, nullptr, false);
_txtWnd->setTextColorRGB(_textRGB);
_txtWnd->enableScrollbar(true);
@@ -137,12 +137,12 @@ void ActionText::start() {
_txtWnd->setSelectable(false);
_txtWnd->appendText(_text);
- director->addTextWindow(_txtWnd);
+ screen->addTextWindow(_txtWnd);
} else {
- director->addTextAction(this);
+ screen->addTextAction(this);
- _macText = new Graphics::MacText(_text, &director->getWndManager(), director->getTextFont(), _textColorIndex, _backgroundColorIndex, _xRight - _xLeft, align);
+ _macText = new Graphics::MacText(_text, &screen->getWndManager(), screen->getTextFont(), _textColorIndex, _backgroundColorIndex, _xRight - _xLeft, align);
}
}
@@ -151,13 +151,13 @@ Common::Rect ActionText::getBound() {
}
void ActionText::end() {
- Director *director = _actor->getPage()->getGame()->getDirector();
+ Screen *screen = _actor->getPage()->getGame()->getScreen();
if (_scrollBar && _txtWnd) {
- director->getWndManager().removeWindow(_txtWnd);
- director->removeTextWindow(_txtWnd);
+ screen->getWndManager().removeWindow(_txtWnd);
+ screen->removeTextWindow(_txtWnd);
_txtWnd = nullptr;
} else {
- director->removeTextAction(this);
+ screen->removeTextAction(this);
delete _macText;
}
}
diff --git a/engines/pink/objects/actors/actor.cpp b/engines/pink/objects/actors/actor.cpp
index d2cc591fa01..676eb43679a 100644
--- a/engines/pink/objects/actors/actor.cpp
+++ b/engines/pink/objects/actors/actor.cpp
@@ -71,9 +71,9 @@ void Actor::init(bool paused) {
}
}
-bool Actor::initPalette(Director *director) {
+bool Actor::initPalette(Screen *screen) {
for (uint i = 0; i < _actions.size(); ++i) {
- if (_actions[i]->initPalette(director))
+ if (_actions[i]->initPalette(screen))
return true;
}
return false;
diff --git a/engines/pink/objects/actors/actor.h b/engines/pink/objects/actors/actor.h
index f977b28a9b2..e98d1b4c41d 100644
--- a/engines/pink/objects/actors/actor.h
+++ b/engines/pink/objects/actors/actor.h
@@ -31,7 +31,7 @@ namespace Pink {
class Page;
class Action;
class Sequencer;
-class Director;
+class Screen;
class CursorMgr;
class InventoryItem;
class InventoryMgr;
@@ -47,7 +47,7 @@ public:
void saveState(Archive &archive);
virtual void init(bool paused);
- bool initPalette(Director *director);
+ bool initPalette(Screen *screen);
void toConsole() const override;
diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp
index b3e59d49720..5c94ac32c20 100644
--- a/engines/pink/objects/actors/lead_actor.cpp
+++ b/engines/pink/objects/actors/lead_actor.cpp
@@ -108,7 +108,7 @@ void LeadActor::start(bool isHandler) {
case kPDA:
if (_stateBeforePDA == kInventory)
startInventory(1);
- _page->getGame()->getDirector()->saveStage();
+ _page->getGame()->getScreen()->saveStage();
loadPDA(_page->getGame()->getPdaMgr().getSavedPageName());
break;
default:
@@ -161,7 +161,7 @@ void LeadActor::loadPDA(const Common::String &pageName) {
_stateBeforePDA = _state;
_state = kPDA;
- _page->getGame()->getDirector()->saveStage();
+ _page->getGame()->getScreen()->saveStage();
}
_page->getGame()->getPdaMgr().setLead(this);
_page->getGame()->getPdaMgr().goToPage(pageName);
@@ -314,7 +314,7 @@ void LeadActor::onWalkEnd(const Common::String &stopName) {
void LeadActor::onPDAClose() {
_page->initPalette();
- _page->getGame()->getDirector()->loadStage();
+ _page->getGame()->getScreen()->loadStage();
_state = _stateBeforePDA;
if (_state != kInventory)
@@ -337,7 +337,7 @@ void LeadActor::setNextExecutors(const Common::String &nextModule, const Common:
void LeadActor::forceUpdateCursor() {
PinkEngine *vm =_page->getGame();
- vm->getDirector()->update(); // we have actions, that should be drawn to properly update cursor
+ vm->getScreen()->update(); // we have actions, that should be drawn to properly update cursor
Common::Point point = vm->getEventManager()->getMousePos();
updateCursor(point);
}
@@ -397,7 +397,7 @@ WalkLocation *LeadActor::getWalkDestination() {
}
Actor *LeadActor::getActorByPoint(Common::Point point) {
- return _page->getGame()->getDirector()->getActorByPoint(point);
+ return _page->getGame()->getScreen()->getActorByPoint(point);
}
void LeadActor::startInventory(bool paused) {
diff --git a/engines/pink/objects/pages/page.cpp b/engines/pink/objects/pages/page.cpp
index 3a0fe1e1c9d..99a79a845c8 100644
--- a/engines/pink/objects/pages/page.cpp
+++ b/engines/pink/objects/pages/page.cpp
@@ -62,7 +62,7 @@ void Page::init() {
void Page::initPalette() {
for (uint i = 0; i < _actors.size(); ++i) {
- if (_actors[i]->initPalette(getGame()->getDirector()))
+ if (_actors[i]->initPalette(getGame()->getScreen()))
break;
}
}
diff --git a/engines/pink/pda_mgr.cpp b/engines/pink/pda_mgr.cpp
index e79fed9f11b..675a2a05856 100644
--- a/engines/pink/pda_mgr.cpp
+++ b/engines/pink/pda_mgr.cpp
@@ -116,7 +116,7 @@ void PDAMgr::onLeftButtonClick(Common::Point point) {
Actor* rightHand = _globalPage->findActor(kRightHand);
if (rightHand)
static_cast<ActionStill*>(rightHand->getAction())->setFrame(1);
- Actor *actor = _game->getDirector()->getActorByPoint(point);
+ Actor *actor = _game->getScreen()->getActorByPoint(point);
if (actor)
actor->onLeftClickMessage();
}
@@ -128,7 +128,7 @@ void PDAMgr::onLeftButtonUp() {
}
void PDAMgr::onMouseMove(Common::Point point) {
- Actor *actor = _game->getDirector()->getActorByPoint(point);
+ Actor *actor = _game->getScreen()->getActorByPoint(point);
if (actor && dynamic_cast<PDAButtonActor *>(actor))
actor->onMouseOver(point, &_cursorMgr);
else
diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp
index c5c934d3dc6..ceebd99c890 100644
--- a/engines/pink/pink.cpp
+++ b/engines/pink/pink.cpp
@@ -42,7 +42,7 @@ namespace Pink {
PinkEngine::PinkEngine(OSystem *system, const ADGameDescription *desc)
: Engine(system), _rnd("pink"), _exeResources(nullptr),
_desc(desc), _bro(nullptr), _menu(nullptr), _actor(nullptr),
- _module(nullptr), _director(nullptr), _pdaMgr(this) {
+ _module(nullptr), _screen(nullptr), _pdaMgr(this) {
const Common::FSNode gameDataDir(ConfMan.get("path"));
SearchMan.addSubDirectoryMatching(gameDataDir, "install");
@@ -58,7 +58,7 @@ PinkEngine::~PinkEngine() {
for (uint j = 0; j < _cursors.size(); ++j) {
delete _cursors[j];
}
- delete _director;
+ delete _screen;
}
Common::Error PinkEngine::init() {
@@ -72,7 +72,7 @@ Common::Error PinkEngine::init() {
}
setDebugger(new Console(this));
- _director = new Director(this);
+ _screen = new Screen(this);
initMenu();
@@ -123,7 +123,7 @@ Common::Error Pink::PinkEngine::run() {
while (!shouldQuit()) {
Common::Event event;
while (_eventMan->pollEvent(event)) {
- if (_director->processEvent(event))
+ if (_screen->processEvent(event))
continue;
switch (event.type) {
@@ -152,7 +152,7 @@ Common::Error Pink::PinkEngine::run() {
}
_actor->update();
- _director->update();
+ _screen->update();
_system->delayMillis(10);
}
@@ -180,7 +180,7 @@ void PinkEngine::initModule(const Common::String &moduleName, const Common::Stri
void PinkEngine::changeScene() {
setCursor(kLoadingCursor);
- _director->clear();
+ _screen->clear();
if (!_nextModule.empty() && _nextModule != _module->getName())
initModule(_nextModule, _nextPage, nullptr);
@@ -286,7 +286,7 @@ bool PinkEngine::hasFeature(Engine::EngineFeature f) const {
void PinkEngine::pauseEngineIntern(bool pause) {
Engine::pauseEngineIntern(pause);
- _director->pause(pause);
+ _screen->pause(pause);
}
bool PinkEngine::isPeril() const {
diff --git a/engines/pink/pink.h b/engines/pink/pink.h
index ccddd55ec95..6cdd5b4628b 100644
--- a/engines/pink/pink.h
+++ b/engines/pink/pink.h
@@ -70,7 +70,7 @@ struct WinCursorGroup;
namespace Pink {
class Console;
-class Director;
+class Screen;
class Archive;
class NamedObject;
class Module;
@@ -125,7 +125,7 @@ public:
OrbFile *getOrb() { return &_orb; }
BroFile *getBro() { return _bro; }
Common::RandomSource &getRnd() { return _rnd; };
- Director *getDirector() { return _director; }
+ Screen *getScreen() { return _screen; }
PDAMgr &getPdaMgr() { return _pdaMgr; }
void setNextExecutors(const Common::String &nextModule, const Common::String &nextPage) { _nextModule = nextModule; _nextPage = nextPage; }
@@ -158,7 +158,7 @@ private:
BroFile *_bro;
Graphics::MacMenu *_menu;
- Director *_director;
+ Screen *_screen;
LeadActor *_actor;
Module *_module;
Commit: 01d264569ca243552d6c65d9d2245ab3adb8bfb8
https://github.com/scummvm/scummvm/commit/01d264569ca243552d6c65d9d2245ab3adb8bfb8
Author: Avijeet (am388488 at gmail.com)
Date: 2022-06-27T14:15:34+03:00
Commit Message:
PINK: Rename director.h/cpp to screen.h/cpp
Changed paths:
A engines/pink/screen.cpp
A engines/pink/screen.h
R engines/pink/director.cpp
R engines/pink/director.h
engines/pink/gui.cpp
engines/pink/module.mk
engines/pink/objects/actions/action_cel.cpp
engines/pink/objects/actions/action_sound.cpp
engines/pink/objects/actions/action_text.cpp
engines/pink/objects/actors/lead_actor.cpp
engines/pink/objects/inventory.cpp
engines/pink/objects/pages/page.cpp
engines/pink/pda_mgr.cpp
engines/pink/pink.cpp
diff --git a/engines/pink/gui.cpp b/engines/pink/gui.cpp
index 37f93e36f28..b6099a0be29 100644
--- a/engines/pink/gui.cpp
+++ b/engines/pink/gui.cpp
@@ -28,7 +28,7 @@
#include "gui/message.h"
#include "pink/pink.h"
-#include "pink/director.h"
+#include "pink/screen.h"
#include "pink/objects/actors/lead_actor.h"
namespace Pink {
diff --git a/engines/pink/module.mk b/engines/pink/module.mk
index bc85597e2cf..33ac23a0400 100644
--- a/engines/pink/module.mk
+++ b/engines/pink/module.mk
@@ -6,7 +6,7 @@ MODULE_OBJS = \
cel_decoder.o \
console.o \
cursor_mgr.o \
- director.o \
+ screen.o \
file.o \
gui.o \
metaengine.o \
diff --git a/engines/pink/objects/actions/action_cel.cpp b/engines/pink/objects/actions/action_cel.cpp
index e098f33c0a9..5febcd318c7 100644
--- a/engines/pink/objects/actions/action_cel.cpp
+++ b/engines/pink/objects/actions/action_cel.cpp
@@ -24,7 +24,7 @@
#include "pink/archive.h"
#include "pink/cel_decoder.h"
-#include "pink/director.h"
+#include "pink/screen.h"
#include "pink/pink.h"
#include "pink/objects/actions/action_cel.h"
#include "pink/objects/actors/actor.h"
diff --git a/engines/pink/objects/actions/action_sound.cpp b/engines/pink/objects/actions/action_sound.cpp
index 665de953638..52b67fdaeb9 100644
--- a/engines/pink/objects/actions/action_sound.cpp
+++ b/engines/pink/objects/actions/action_sound.cpp
@@ -23,7 +23,7 @@
#include "pink/archive.h"
#include "pink/pink.h"
-#include "pink/director.h"
+#include "pink/screen.h"
#include "pink/sound.h"
#include "pink/objects/actions/action_sound.h"
#include "pink/objects/actors/actor.h"
diff --git a/engines/pink/objects/actions/action_text.cpp b/engines/pink/objects/actions/action_text.cpp
index 116a078a6b7..49099e55565 100644
--- a/engines/pink/objects/actions/action_text.cpp
+++ b/engines/pink/objects/actions/action_text.cpp
@@ -25,7 +25,7 @@
#include "graphics/transparent_surface.h"
#include "pink/archive.h"
-#include "pink/director.h"
+#include "pink/screen.h"
#include "pink/pink.h"
#include "pink/objects/actors/actor.h"
#include "pink/objects/actions/action_text.h"
diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp
index 5c94ac32c20..3206ba10623 100644
--- a/engines/pink/objects/actors/lead_actor.cpp
+++ b/engines/pink/objects/actors/lead_actor.cpp
@@ -22,7 +22,7 @@
#include "pink/archive.h"
#include "pink/cursor_mgr.h"
#include "pink/pink.h"
-#include "pink/director.h"
+#include "pink/screen.h"
#include "pink/objects/actions/action.h"
#include "pink/objects/actors/supporting_actor.h"
#include "pink/objects/actors/lead_actor.h"
diff --git a/engines/pink/objects/inventory.cpp b/engines/pink/objects/inventory.cpp
index a855e06f932..e2a69397244 100644
--- a/engines/pink/objects/inventory.cpp
+++ b/engines/pink/objects/inventory.cpp
@@ -22,7 +22,7 @@
#include "common/debug.h"
-#include "pink/director.h"
+#include "pink/screen.h"
#include "pink/pink.h"
#include "pink/objects/inventory.h"
#include "pink/objects/actions/action.h"
diff --git a/engines/pink/objects/pages/page.cpp b/engines/pink/objects/pages/page.cpp
index 99a79a845c8..134b8b84ca8 100644
--- a/engines/pink/objects/pages/page.cpp
+++ b/engines/pink/objects/pages/page.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "pink/director.h"
+#include "pink/screen.h"
#include "pink/pink.h"
#include "pink/objects/actors/lead_actor.h"
#include "pink/objects/pages/page.h"
diff --git a/engines/pink/pda_mgr.cpp b/engines/pink/pda_mgr.cpp
index 675a2a05856..1161052e107 100644
--- a/engines/pink/pda_mgr.cpp
+++ b/engines/pink/pda_mgr.cpp
@@ -21,7 +21,7 @@
#include "pink/pda_mgr.h"
#include "pink/pink.h"
-#include "pink/director.h"
+#include "pink/screen.h"
#include "pink/objects/actors/pda_button_actor.h"
#include "pink/objects/actors/lead_actor.h"
#include "pink/objects/pages/pda_page.h"
diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp
index ceebd99c890..587ed6cd4da 100644
--- a/engines/pink/pink.cpp
+++ b/engines/pink/pink.cpp
@@ -33,7 +33,7 @@
#include "pink/pink.h"
#include "pink/console.h"
-#include "pink/director.h"
+#include "pink/screen.h"
#include "pink/objects/module.h"
#include "pink/objects/actors/lead_actor.h"
diff --git a/engines/pink/director.cpp b/engines/pink/screen.cpp
similarity index 99%
rename from engines/pink/director.cpp
rename to engines/pink/screen.cpp
index 205926a51ae..f504d2a9a9e 100644
--- a/engines/pink/director.cpp
+++ b/engines/pink/screen.cpp
@@ -26,7 +26,7 @@
#include "pink/pink.h"
#include "pink/cel_decoder.h"
-#include "pink/director.h"
+#include "pink/screen.h"
#include "pink/objects/actions/action_sound.h"
#include "pink/objects/actions/action_cel.h"
#include "pink/objects/actions/action_text.h"
diff --git a/engines/pink/director.h b/engines/pink/screen.h
similarity index 98%
rename from engines/pink/director.h
rename to engines/pink/screen.h
index dd489c1c9d4..52918990673 100644
--- a/engines/pink/director.h
+++ b/engines/pink/screen.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef PINK_DIRECTOR_H
-#define PINK_DIRECTOR_H
+#ifndef PINK_SCREEN_H
+#define PINK_SCREEN_H
#include "common/array.h"
#include "common/rect.h"
More information about the Scummvm-git-logs
mailing list