[Scummvm-git-logs] scummvm master -> 2cfc3b4ed29f133730a9d54db3b7e45503d55068
somaen
noreply at scummvm.org
Fri May 27 08:40:05 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:
5ba099f408 TINSEL: Rename IsConvAndNotMove -> isConvAndNotMove
2cfc3b4ed2 TINSEL: Refactor Notebook and System reels to follow naming conventions
Commit: 5ba099f408f7a78206a10dc4ee8b52360d208504
https://github.com/scummvm/scummvm/commit/5ba099f408f7a78206a10dc4ee8b52360d208504
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2022-05-27T10:29:38+02:00
Commit Message:
TINSEL: Rename IsConvAndNotMove -> isConvAndNotMove
Changed paths:
engines/tinsel/dialogs.cpp
engines/tinsel/dialogs.h
engines/tinsel/tinlib.cpp
diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp
index e2d89ac0fce..fec0af0e308 100644
--- a/engines/tinsel/dialogs.cpp
+++ b/engines/tinsel/dialogs.cpp
@@ -5616,7 +5616,7 @@ void Dialogs::redraw() {
}
// Noir
-bool Dialogs::IsConvAndNotMove() {
+bool Dialogs::isConvAndNotMove() {
// TODO: Ensure that the used global is correct
// If this is the right mapping, the variable is reversed in Noir
return isConvWindow() && !_bMoveOnUnHide;
diff --git a/engines/tinsel/dialogs.h b/engines/tinsel/dialogs.h
index 57c89c80511..de52cfd35a6 100644
--- a/engines/tinsel/dialogs.h
+++ b/engines/tinsel/dialogs.h
@@ -369,7 +369,7 @@ public:
void redraw();
// Noir
- bool IsConvAndNotMove();
+ bool isConvAndNotMove();
bool _noLanguage;
int _glitterIndex;
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 523d29fa4e5..723d167e358 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -5830,7 +5830,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
case HELDOBJECTORTOPIC:
// Noir
- if (_vm->_dialogs->IsConvAndNotMove()) {
+ if (_vm->_dialogs->isConvAndNotMove()) {
pp[0] = HeldObject();
} else {
pp[0] = Topic();
Commit: 2cfc3b4ed29f133730a9d54db3b7e45503d55068
https://github.com/scummvm/scummvm/commit/2cfc3b4ed29f133730a9d54db3b7e45503d55068
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2022-05-27T10:39:56+02:00
Commit Message:
TINSEL: Refactor Notebook and System reels to follow naming conventions
Changed paths:
engines/tinsel/debugger.cpp
engines/tinsel/dialogs.cpp
engines/tinsel/events.cpp
engines/tinsel/multiobj.cpp
engines/tinsel/noir/notebook.cpp
engines/tinsel/noir/notebook.h
engines/tinsel/noir/notebook_page.cpp
engines/tinsel/noir/notebook_page.h
engines/tinsel/noir/sysreel.cpp
engines/tinsel/noir/sysreel.h
engines/tinsel/tinlib.cpp
diff --git a/engines/tinsel/debugger.cpp b/engines/tinsel/debugger.cpp
index d4c5fcd8d5e..ba1606b4b9c 100644
--- a/engines/tinsel/debugger.cpp
+++ b/engines/tinsel/debugger.cpp
@@ -175,14 +175,14 @@ bool Console::cmd_add_clue(int argc, const char **argv) {
return true;
}
- _vm->_notebook->AddClue(strToInt(argv[1]));
+ _vm->_notebook->addClue(strToInt(argv[1]));
return false;
}
bool Console::cmd_add_all_clues(int argc, const char **argv) {
auto clues = _vm->_dialogs->getAllNotebookClues();
for (auto clue : clues) {
- _vm->_notebook->AddClue(clue);
+ _vm->_notebook->addClue(clue);
}
return false;
}
@@ -194,7 +194,7 @@ bool Console::cmd_cross_clue(int argc, const char **argv) {
return true;
}
- _vm->_notebook->CrossClue(strToInt(argv[1]));
+ _vm->_notebook->crossClue(strToInt(argv[1]));
return false;
}
diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp
index fec0af0e308..3e07d742ba1 100644
--- a/engines/tinsel/dialogs.cpp
+++ b/engines/tinsel/dialogs.cpp
@@ -1269,7 +1269,7 @@ void Dialogs::inventoryIconCursor(bool bNewItem) {
auto invObj = getInvObject(_heldItem);
if (invObj->hasAttribute(InvObjAttr::NOTEBOOK_CLUE)) {
- _heldFilm = _vm->_systemReel->Get((SysReel)objIndex);
+ _heldFilm = _vm->_systemReel->get((SysReel)objIndex);
} else {
_heldFilm = _invFilms[objIndex];
}
@@ -1293,11 +1293,11 @@ bool Dialogs::inventoryActive() {
}
bool Dialogs::inventoryOrNotebookActive() {
- return inventoryActive() || ((TinselVersion == 3) && _vm->_notebook->IsOpen());
+ return inventoryActive() || ((TinselVersion == 3) && _vm->_notebook->isOpen());
}
int Dialogs::whichInventoryOpen() {
- if (TinselVersion == 3 && _vm->_notebook->IsOpen()) {
+ if (TinselVersion == 3 && _vm->_notebook->isOpen()) {
return INV_NOTEBOOK;
}
if (_inventoryState != ACTIVE_INV)
@@ -1798,8 +1798,8 @@ enum { I_NOTIN,
*/
int Dialogs::invArea(int x, int y) {
if (TinselVersion == 3) {
- if (_vm->_notebook->IsOpen()) {
- if (_vm->_notebook->HandlePointer(Common::Point(x, y)) != 0) {
+ if (_vm->_notebook->isOpen()) {
+ if (_vm->_notebook->handlePointer(Common::Point(x, y)) != 0) {
return I_ENDCHANGE;
}
return I_NOTIN;
@@ -2867,7 +2867,7 @@ void Dialogs::constructOtherInventory(int menuId) {
if (cd.bExtraWin) {
warning("TODO: Complete scrollbar implementation");
- SCNHANDLE sliderReel = _vm->_systemReel->Get(SysReel::SLIDER);
+ SCNHANDLE sliderReel = _vm->_systemReel->get(SysReel::SLIDER);
const FILM *pfilm = (const FILM *)_vm->_handle->LockMem(sliderReel);
_objArray[3] = _slideObject = InsertReelObj(pfilm->reels);
MultiSetAniXYZ(_slideObject,
@@ -5019,7 +5019,7 @@ void Dialogs::eventToInventory(PLR_EVENT pEvent, const Common::Point &coOrds) {
if (TinselVersion == 3) {
// If the Notebook handles the event, it has been consumed.
- if (_vm->_notebook->HandleEvent(pEvent, coOrds)) {
+ if (_vm->_notebook->handleEvent(pEvent, coOrds)) {
return;
}
}
@@ -5611,7 +5611,7 @@ void Dialogs::redraw() {
}
}
if (TinselVersion == 3) {
- _vm->_notebook->StepAnimScripts();
+ _vm->_notebook->stepAnimScripts();
}
}
diff --git a/engines/tinsel/events.cpp b/engines/tinsel/events.cpp
index 6701102c033..5c76aab7751 100644
--- a/engines/tinsel/events.cpp
+++ b/engines/tinsel/events.cpp
@@ -400,8 +400,8 @@ void ProcessKeyEvent(PLR_EVENT ke) {
}
void CloseOpenInventories() {
- if (_vm->_notebook->IsOpen()) {
- _vm->_notebook->Close();
+ if (_vm->_notebook->isOpen()) {
+ _vm->_notebook->close();
} else {
if (_vm->_dialogs->inventoryActive()) {
if (_vm->_dialogs->whichInventoryOpen() != INV_3) {
@@ -474,7 +474,7 @@ void PlayerEvent(PLR_EVENT pEvent, const Common::Point &coOrds) {
case PLR_NOTEBOOK:
if (TinselVersion == 3) {
CloseOpenInventories();
- _vm->_notebook->Show(false);
+ _vm->_notebook->show(false);
}
break;
diff --git a/engines/tinsel/multiobj.cpp b/engines/tinsel/multiobj.cpp
index 466cb301b79..f239916629c 100644
--- a/engines/tinsel/multiobj.cpp
+++ b/engines/tinsel/multiobj.cpp
@@ -102,7 +102,7 @@ OBJECT *InsertReelObj(const FREEL *reels) {
}
const FILM *GetSystemReelFilm(SysReel reelIndex) {
- SCNHANDLE hFilm = _vm->_systemReel->Get(reelIndex);
+ SCNHANDLE hFilm = _vm->_systemReel->get(reelIndex);
const FILM *pfilm = (const FILM *)_vm->_handle->LockMem(hFilm);
return pfilm;
}
diff --git a/engines/tinsel/noir/notebook.cpp b/engines/tinsel/noir/notebook.cpp
index b30032084ff..8d66982abab 100644
--- a/engines/tinsel/noir/notebook.cpp
+++ b/engines/tinsel/noir/notebook.cpp
@@ -41,7 +41,7 @@ Notebook::~Notebook() {
delete _polygons;
}
-void Notebook::AddHyperlink(int32 id1, int32 id2) {
+void Notebook::addHyperlink(int32 id1, int32 id2) {
auto *invObject = _vm->_dialogs->getInvObjectT3(id1);
if (invObject->getTitle() != 0) {
@@ -77,29 +77,29 @@ void Notebook::AddHyperlink(int32 id1, int32 id2) {
error("Too many hyperlinks");
}
-void Notebook::ClearNotebookPage() {
+void Notebook::clearNotebookPage() {
if (_prevPage != -1) {
- _pages[_prevPage].Clear();
+ _pages[_prevPage].clear();
}
_prevPage = -1;
- _pages[_currentPage].Clear();
+ _pages[_currentPage].clear();
}
-void Notebook::Refresh() {
+void Notebook::refresh() {
auto reel = (_currentPage == 0 ? SysReel::NOTEPAD_CLOSED : SysReel::NOTEPAD_OPEN);
auto film = GetSystemReelFilm(reel);
InitStepAnimScript(&_anim, _object, film->reels->script, ONE_SECOND / film->frate);
- ClearNotebookPage();
+ clearNotebookPage();
if (_currentPage != 0) {
- _pages[_currentPage].FillIn();
+ _pages[_currentPage].fillIn();
}
}
-int Notebook::AddTitle(const InventoryObjectT3 &invObject) {
+int Notebook::addTitle(const InventoryObjectT3 &invObject) {
int id = invObject.getId();
assert(invObject.isNotebookTitle());
for (int i = 0; i < _numPages; i++) {
- if (_pages[i].GetTitle() == id) {
+ if (_pages[i].getTitle() == id) {
return i;
}
}
@@ -108,15 +108,15 @@ int Notebook::AddTitle(const InventoryObjectT3 &invObject) {
// 0 page is the closed notebook, has no entries.
if (linkedFromPage != 0) {
// Allocate a line on the linked from page.
- assert(_pages[linkedFromPage].GetTitle() != 0);
- _pages[linkedFromPage].AddLine(id);
+ assert(_pages[linkedFromPage].getTitle() != 0);
+ _pages[linkedFromPage].addLine(id);
}
int pageIndex = _numPages++;
- _pages[pageIndex].SetTitle(id);
+ _pages[pageIndex].setTitle(id);
return pageIndex;
}
-void Notebook::AddClue(const InventoryObjectT3 &invObject) {
+void Notebook::addClue(const InventoryObjectT3 &invObject) {
if (invObject.getUnknown() == 0) {
// This affects two clues, that should get special treatment.
warning("TODO: Handle clues with no parent page");
@@ -124,34 +124,34 @@ void Notebook::AddClue(const InventoryObjectT3 &invObject) {
}
// Add title if missing, otherwise just get the page it's on.
auto titleObject = _vm->_dialogs->getInvObjectT3(invObject.getUnknown());
- int pageIndex = AddTitle(*titleObject);
- _pages[pageIndex].AddLine(invObject.getId());
+ int pageIndex = addTitle(*titleObject);
+ _pages[pageIndex].addLine(invObject.getId());
if (invObject.getTitle() != 0) {
auto secondTitleObject = _vm->_dialogs->getInvObjectT3(invObject.getTitle());
- pageIndex = AddTitle(*secondTitleObject);
- _pages[pageIndex].AddLine(invObject.getId());
+ pageIndex = addTitle(*secondTitleObject);
+ _pages[pageIndex].addLine(invObject.getId());
}
}
-void Notebook::AddClue(int id) {
+void Notebook::addClue(int id) {
auto invObject = _vm->_dialogs->getInvObjectT3(id);
if (invObject->isNotebookTitle()) {
- AddTitle(*invObject);
+ addTitle(*invObject);
} else {
- AddClue(*invObject);
+ addClue(*invObject);
}
}
-int Notebook::GetPageWithTitle(int id) {
+int Notebook::getPageWithTitle(int id) {
for (int i = 0; i < _numPages; i++) {
- if (_pages[i].GetTitle() == id) {
+ if (_pages[i].getTitle() == id) {
return i;
}
}
return -1;
}
-void Notebook::CrossClue(int id) {
+void Notebook::crossClue(int id) {
auto invObject = _vm->_dialogs->getInvObjectT3(id);
if (invObject->isNotebookTitle()) {
return;
@@ -164,9 +164,9 @@ void Notebook::CrossClue(int id) {
if (titles[i] == 0) {
continue;
}
- int page = GetPageWithTitle(titles[i]);
+ int page = getPageWithTitle(titles[i]);
if (page != -1) {
- _pages[page].CrossClue(id);
+ _pages[page].crossClue(id);
}
}
}
@@ -179,48 +179,48 @@ void InitNotebookAnim(OBJECT **obj, ANIM &anim, SysReel reel, int zPosition) {
InitStepAnimScript(&anim, *obj, film->reels->script, ONE_SECOND / film->frate);
}
-void Notebook::SetNextPage(int pageIndex) {
+void Notebook::setNextPage(int pageIndex) {
assert(_prevPage == -1 || _prevPage == _currentPage); // Check that we've cleaned any outstanding page.
_prevPage = _currentPage;
_currentPage = pageIndex;
}
-void Notebook::PageFlip(bool up) {
+void Notebook::pageFlip(bool up) {
int nextPage = _currentPage + (up ? -1 : 1);
if (nextPage <= 0) {
- SetNextPage(0);
- Refresh();
+ setNextPage(0);
+ refresh();
return;
} else if (nextPage == 1) {
// TODO: Should possibly just call whatever function we use to open.
InitNotebookAnim(&_object, _anim, SysReel::NOTEPAD_OPENING, Z_INV_RFRAME);
_state = BOOKSTATE::OPEN_ANIMATING;
- SetNextPage(nextPage);
+ setNextPage(nextPage);
return;
}
- SetNextPage(nextPage);
+ setNextPage(nextPage);
SysReel reel = (up ? SysReel::NOTEPAD_FLIPUP : SysReel::NOTEPAD_FLIPDOWN);
InitNotebookAnim(&_pageObject, _pageAnim, reel, 19);
_state = BOOKSTATE::PAGEFLIP;
}
-void Notebook::Show(bool isOpen) {
+void Notebook::show(bool isOpen) {
auto reel = (isOpen ? SysReel::NOTEPAD_OPEN : SysReel::NOTEPAD_OPENING);
InitNotebookAnim(&_object, _anim, reel, Z_INV_MFRAME);
_state = (isOpen ? BOOKSTATE::OPENED : BOOKSTATE::OPEN_ANIMATING);
- SetNextPage(1);
- Refresh();
+ setNextPage(1);
+ refresh();
DisableTags(); // Tags disabled in Notebook
DisablePointing(); // Pointing disabled in Notebook
}
-bool Notebook::IsOpen() const {
+bool Notebook::isOpen() const {
return _state != BOOKSTATE::CLOSED;
}
-void Notebook::Close() {
- ClearNotebookPage();
+void Notebook::close() {
+ clearNotebookPage();
MultiDeleteObjectIfExists(FIELD_STATUS, &_object);
MultiDeleteObjectIfExists(FIELD_STATUS, &_pageObject);
_state = BOOKSTATE::CLOSED;
@@ -230,12 +230,12 @@ void Notebook::Close() {
}
}
-void Notebook::StepAnimScripts() {
+void Notebook::stepAnimScripts() {
if (_state == BOOKSTATE::OPEN_ANIMATING) {
auto state = StepAnimScript(&_anim);
if (state == ScriptFinished) {
_state = BOOKSTATE::OPENED;
- Refresh();
+ refresh();
}
}
if (_state == BOOKSTATE::PAGEFLIP) {
@@ -243,7 +243,7 @@ void Notebook::StepAnimScripts() {
if (state == ScriptFinished) {
MultiDeleteObjectIfExists(FIELD_STATUS, &_pageObject);
_state = BOOKSTATE::OPENED;
- Refresh();
+ refresh();
}
}
}
@@ -252,24 +252,24 @@ int Notebook::GetPointedClue(const Common::Point &point) const {
if (_currentPage == 0 || _currentPage > _numPages) {
return 0;
}
- return _pages[_currentPage].GetClueForLine(_polygons->lineHit(point));
+ return _pages[_currentPage].getClueForLine(_polygons->lineHit(point));
}
-bool Notebook::HandlePointer(const Common::Point &point) {
- if (!IsOpen()) {
+bool Notebook::handlePointer(const Common::Point &point) {
+ if (!isOpen()) {
return 0;
}
auto inside = _polygons->isInsideNotebook(point);
if (inside) {
auto hit = _polygons->lineHit(point);
- _pages[_currentPage].HandlePointAtLine(hit);
+ _pages[_currentPage].handlePointAtLine(hit);
return true; // We handled the pointer
}
return false;
}
-bool Notebook::HandleEvent(PLR_EVENT pEvent, const Common::Point &coOrds) {
- if (!IsOpen()) { // TODO: Clicking outside should close the notebook
+bool Notebook::handleEvent(PLR_EVENT pEvent, const Common::Point &coOrds) {
+ if (!isOpen()) { // TODO: Clicking outside should close the notebook
return false;
}
auto inside = _polygons->isInsideNotebook(coOrds);
@@ -289,13 +289,13 @@ bool Notebook::HandleEvent(PLR_EVENT pEvent, const Common::Point &coOrds) {
auto poly = _polygons->mostSpecificHit(coOrds);
switch (poly) {
case NoteBookPoly::NEXT:
- HandleEvent(PLR_PGUP, coOrds);
+ handleEvent(PLR_PGUP, coOrds);
return true;
case NoteBookPoly::PREV:
- HandleEvent(PLR_PGDN, coOrds);
+ handleEvent(PLR_PGDN, coOrds);
return true;
case NoteBookPoly::NONE:
- HandleEvent(PLR_ESCAPE, coOrds);
+ handleEvent(PLR_ESCAPE, coOrds);
return true;
default:
return true;
@@ -303,13 +303,13 @@ bool Notebook::HandleEvent(PLR_EVENT pEvent, const Common::Point &coOrds) {
}
case PLR_ESCAPE:
- Close();
+ close();
return true;
case PLR_PGUP:
- PageFlip(true);
+ pageFlip(true);
return true;
case PLR_PGDN:
- PageFlip(false);
+ pageFlip(false);
return true;
case PLR_HOME:
case PLR_END:
diff --git a/engines/tinsel/noir/notebook.h b/engines/tinsel/noir/notebook.h
index 445301980a6..799c30d2573 100644
--- a/engines/tinsel/noir/notebook.h
+++ b/engines/tinsel/noir/notebook.h
@@ -63,35 +63,35 @@ public:
~Notebook();
// Adds a connection between a clue/title
- void AddHyperlink(int32 id1, int32 id2);
- void AddClue(int id);
- void CrossClue(int id);
+ void addHyperlink(int32 id1, int32 id2);
+ void addClue(int id);
+ void crossClue(int id);
// Called within InventoryProcess loop
- void Redraw();
+ void redraw();
// Called from OPENNOTEBOOK
- void Show(bool isOpen);
- bool IsOpen() const;
- void Close();
+ void show(bool isOpen);
+ bool isOpen() const;
+ void close();
- bool HandlePointer(const Common::Point &point);
- bool HandleEvent(PLR_EVENT pEvent, const Common::Point &coOrds);
- void StepAnimScripts();
- void Refresh();
+ bool handlePointer(const Common::Point &point);
+ bool handleEvent(PLR_EVENT pEvent, const Common::Point &coOrds);
+ void stepAnimScripts();
+ void refresh();
NoteBookPolygons *_polygons = nullptr;
private:
- int AddTitle(const InventoryObjectT3 &invObject);
- void AddClue(const InventoryObjectT3 &invObject);
- int GetPageWithTitle(int id);
+ int addTitle(const InventoryObjectT3 &invObject);
+ void addClue(const InventoryObjectT3 &invObject);
+ int getPageWithTitle(int id);
- void PageFlip(bool up);
+ void pageFlip(bool up);
int32 GetPointedClue(const Common::Point &point) const;
- void ClearNotebookPage();
+ void clearNotebookPage();
- void SetNextPage(int pageIndex);
+ void setNextPage(int pageIndex);
const static uint32 MAX_PAGES = 0x15;
const static uint32 MAX_HYPERS = 0xf;
diff --git a/engines/tinsel/noir/notebook_page.cpp b/engines/tinsel/noir/notebook_page.cpp
index cac6c35d9e1..68f19991e6b 100644
--- a/engines/tinsel/noir/notebook_page.cpp
+++ b/engines/tinsel/noir/notebook_page.cpp
@@ -32,7 +32,7 @@
namespace Tinsel {
-void NotebookLine::Clear() {
+void NotebookLine::clear() {
MultiDeleteObjectIfExists(FIELD_STATUS, &_obj);
}
@@ -66,7 +66,7 @@ int FindReelIndexForEntry(const FILM *pFilm, int pageLine) {
return -1;
}
-void NotebookLine::FillIn(int pageLine) {
+void NotebookLine::fillIn(int pageLine) {
const FILM *pFilm = _vm->_dialogs->getObjectFilm(_id);
if (!pFilm)
return;
@@ -89,12 +89,12 @@ void NotebookLine::FillIn(int pageLine) {
}
}
-void NotebookLine::CrossOut() {
+void NotebookLine::crossOut() {
_crossedOut = true;
}
-void NotebookPage::HandlePointAtLine(int line) {
- auto objId = GetClueForLine(line);
+void NotebookPage::handlePointAtLine(int line) {
+ auto objId = getClueForLine(line);
if (objId != 0 && objId != _pointedClue) {
auto obj = _vm->_dialogs->getInvObject(objId);
_vm->_dialogs->invPointEvent(obj, -1);
@@ -102,7 +102,7 @@ void NotebookPage::HandlePointAtLine(int line) {
}
}
-int NotebookPage::IndexOfClue(int id) const {
+int NotebookPage::indexOfClue(int id) const {
for (int i = 0; i < _numLines; i++) {
if (_lines[i]._id == id) {
return i;
@@ -111,48 +111,48 @@ int NotebookPage::IndexOfClue(int id) const {
return -1;
}
-bool NotebookPage::ContainsClue(int id) {
- return IndexOfClue(id) != -1;
+bool NotebookPage::containsClue(int id) {
+ return indexOfClue(id) != -1;
}
-void NotebookPage::CrossClue(int id) {
- int index = IndexOfClue(id);
+void NotebookPage::crossClue(int id) {
+ int index = indexOfClue(id);
assert(index != -1);
- _lines[index].CrossOut();
+ _lines[index].crossOut();
}
-void NotebookPage::AddLine(int id) {
- if (ContainsClue(id)) {
+void NotebookPage::addLine(int id) {
+ if (containsClue(id)) {
return;
}
assert(_numLines < MAX_ENTRIES_PER_PAGE);
_lines[_numLines++]._id = id;
}
-void NotebookPage::SetTitle(int id) {
+void NotebookPage::setTitle(int id) {
_lines[0]._id = id;
if (_numLines == 0) {
_numLines++;
}
}
-int32 NotebookPage::GetTitle() const {
+int32 NotebookPage::getTitle() const {
return _lines[0]._id;
}
-void NotebookPage::FillIn() {
+void NotebookPage::fillIn() {
for (int i = 0; i < _numLines; i++) {
- _lines[i].FillIn(i);
+ _lines[i].fillIn(i);
}
}
-void NotebookPage::Clear() {
+void NotebookPage::clear() {
for (int i = 0; i < _numLines; i++) {
- _lines[i].Clear();
+ _lines[i].clear();
}
_pointedClue = -1;
}
-int NotebookPage::GetClueForLine(int line) const {
+int NotebookPage::getClueForLine(int line) const {
if (line >= _numLines) {
return 0;
}
diff --git a/engines/tinsel/noir/notebook_page.h b/engines/tinsel/noir/notebook_page.h
index 1a1a01b3191..7a394700062 100644
--- a/engines/tinsel/noir/notebook_page.h
+++ b/engines/tinsel/noir/notebook_page.h
@@ -32,9 +32,9 @@ namespace Tinsel {
class NotebookLine {
public:
int _id = 0;
- void CrossOut();
- void Clear();
- void FillIn(int pageLine);
+ void crossOut();
+ void clear();
+ void fillIn(int pageLine);
private:
bool _crossedOut = false;
ANIM _anim = {};
@@ -45,18 +45,18 @@ private:
class NotebookPage {
public:
- bool ContainsClue(int id);
- void CrossClue(int id);
- void AddLine(int id);
- void SetTitle(int id);
- int32 GetTitle() const;
- void FillIn();
- void Clear();
- int GetPointedClue(const Common::Point &point) const;
- int GetClueForLine(int line) const;
- void HandlePointAtLine(int line);
+ bool containsClue(int id);
+ void crossClue(int id);
+ void addLine(int id);
+ void setTitle(int id);
+ int32 getTitle() const;
+ void fillIn();
+ void clear();
+ int getPointedClue(const Common::Point &point) const;
+ int getClueForLine(int line) const;
+ void handlePointAtLine(int line);
private:
- int IndexOfClue(int id) const;
+ int indexOfClue(int id) const;
int _pointedClue = -1;
const static uint32 MAX_ENTRIES_PER_PAGE = 8;
diff --git a/engines/tinsel/noir/sysreel.cpp b/engines/tinsel/noir/sysreel.cpp
index 15512876818..b2224538adb 100644
--- a/engines/tinsel/noir/sysreel.cpp
+++ b/engines/tinsel/noir/sysreel.cpp
@@ -34,7 +34,7 @@ namespace Tinsel {
*
* @param index reel to get the handle to
*/
-SCNHANDLE SystemReel::Get(SysReel index) {
+SCNHANDLE SystemReel::get(SysReel index) {
assert((int)index >= 0 && (int)index < MAX_SYSREELS);
return _reels[(int)index];
@@ -46,7 +46,7 @@ SCNHANDLE SystemReel::Get(SysReel index) {
* @param index where to store the reel
* @param reel handle to the reel
*/
-void SystemReel::Set(int32 index, SCNHANDLE reel) {
+void SystemReel::set(int32 index, SCNHANDLE reel) {
assert(index >= 0 && index < MAX_SYSREELS);
if (index == (int)SysReel::LOADSCREEN) {
diff --git a/engines/tinsel/noir/sysreel.h b/engines/tinsel/noir/sysreel.h
index f1d2cc46133..febbd8155f9 100644
--- a/engines/tinsel/noir/sysreel.h
+++ b/engines/tinsel/noir/sysreel.h
@@ -52,8 +52,8 @@ class SystemReel {
public:
SystemReel() = default;
- SCNHANDLE Get(SysReel index);
- void Set(int32 index, SCNHANDLE reel);
+ SCNHANDLE get(SysReel index);
+ void set(int32 index, SCNHANDLE reel);
private:
const static int32 MAX_SYSREELS = 0x28;
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 723d167e358..e8115ab90f7 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -2786,7 +2786,7 @@ static void SetPalette(SCNHANDLE hPal, bool escOn, int myEscape) {
* Set system reel
*/
static void SetSystemReel(int index, SCNHANDLE reel) {
- _vm->_systemReel->Set(index, reel);
+ _vm->_systemReel->set(index, reel);
}
/**
@@ -5398,7 +5398,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
case ADDNOTEBOOK:
// Noir Only
- _vm->_notebook->AddClue(pp[0]);
+ _vm->_notebook->addClue(pp[0]);
return -1;
case ADDOPENINV:
@@ -5425,7 +5425,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
case BOOKADDHYPERLINK:
// Noir
pp -= 1; // 2 parameters
- _vm->_notebook->AddHyperlink(pp[0], pp[1]);
+ _vm->_notebook->addHyperlink(pp[0], pp[1]);
return -2;
case BLOCKING:
@@ -5575,7 +5575,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
case CROSSCLUE:
// Noir only
- _vm->_notebook->CrossClue(pp[0]);
+ _vm->_notebook->crossClue(pp[0]);
return -1;
case CURSOR:
@@ -6067,7 +6067,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
case OPENNOTEBOOK:
// Noir only
- _vm->_notebook->Show(0);
+ _vm->_notebook->show(0);
return 0;
case PAUSE:
More information about the Scummvm-git-logs
mailing list