[Scummvm-git-logs] scummvm master -> d4f52b8a611ba4cf17ccf4bbb7a708911f490c99
Strangerke
noreply at scummvm.org
Wed Jun 5 21:26:50 UTC 2024
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:
d4f52b8a61 BAGEL: Various renaming
Commit: d4f52b8a611ba4cf17ccf4bbb7a708911f490c99
https://github.com/scummvm/scummvm/commit/d4f52b8a611ba4cf17ccf4bbb7a708911f490c99
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-06-05T22:26:43+01:00
Commit Message:
BAGEL: Various renaming
Changed paths:
engines/bagel/spacebar/bibble_window.cpp
engines/bagel/spacebar/nav_window.cpp
engines/bagel/spacebar/nav_window.h
engines/bagel/spacebar/slot_wnd.cpp
engines/bagel/spacebar/slot_wnd.h
engines/bagel/spacebar/sraf_computer.cpp
engines/bagel/spacebar/thud.cpp
engines/bagel/spacebar/thud.h
diff --git a/engines/bagel/spacebar/bibble_window.cpp b/engines/bagel/spacebar/bibble_window.cpp
index 4ba37ed95d0..a25f55f66d0 100644
--- a/engines/bagel/spacebar/bibble_window.cpp
+++ b/engines/bagel/spacebar/bibble_window.cpp
@@ -193,7 +193,7 @@ static bool g_bBibbleHack = false;
CBetArea::CBetArea(const CBetAreaDef &def) :
- _cRect(def._left, def._top, def._right, def._bottom), _bWon(false),
+ _cRect(def._left, def._top, def._right, def._bottom),
_nBet(def._nBet), _nPayOff1(def._nPayOff1), _nPayOff2(def._nPayOff2),
_cAudioFile(def._cAudioFile), _cPayFile(def._cPayFile) {
}
diff --git a/engines/bagel/spacebar/nav_window.cpp b/engines/bagel/spacebar/nav_window.cpp
index 90bdd53cf3b..6b50b23958d 100644
--- a/engines/bagel/spacebar/nav_window.cpp
+++ b/engines/bagel/spacebar/nav_window.cpp
@@ -165,7 +165,7 @@ CNavWindow::CNavWindow() {
_pPustule = nullptr;
_pSwamprock = nullptr;
_pSlug = nullptr;
- _pMaggotsnest = nullptr;
+ _pMaggotsNest = nullptr;
_pPeggleboz = nullptr;
_pArcheroids = nullptr;
_pPackRat = nullptr;
@@ -174,11 +174,11 @@ CNavWindow::CNavWindow() {
_pLife = nullptr;
_pFuge = nullptr;
_pGarfunkel = nullptr;
- _pBattlefish = nullptr;
+ _pBattleFish = nullptr;
_pNoVacancy = nullptr;
_bNavAttached = false;
- _bmptwo = nullptr;
+ _bmpTwo = nullptr;
_fuel = 40;
_cargo = 0;
_ship = 120;
@@ -228,7 +228,7 @@ ErrorCode CNavWindow::attach() {
_pPustule = new CBofRect(180, 269, 189, 278);
_pSwamprock = new CBofRect(340, 234, 349, 243);
_pSlug = new CBofRect(36, 341, 45, 350);
- _pMaggotsnest = new CBofRect(251, 376, 260, 385);
+ _pMaggotsNest = new CBofRect(251, 376, 260, 385);
// navsim4
_pPeggleboz = new CBofRect(90, 20, 99, 29);
@@ -239,7 +239,7 @@ ErrorCode CNavWindow::attach() {
_pLife = new CBofRect(394, 234, 403, 243);
_pFuge = new CBofRect(270, 324, 279, 333);
_pGarfunkel = new CBofRect(90, 377, 99, 386);
- _pBattlefish = new CBofRect(359, 359, 368, 368);
+ _pBattleFish = new CBofRect(359, 359, 368, 368);
_pNoVacancy = new CBofRect(18, 107, 117, 116);
// Reset all levels
@@ -401,8 +401,8 @@ ErrorCode CNavWindow::detach() {
delete _pSwamprock;
_pSwamprock = nullptr;
- delete _pMaggotsnest;
- _pMaggotsnest = nullptr;
+ delete _pMaggotsNest;
+ _pMaggotsNest = nullptr;
delete _pPeggleboz;
_pPeggleboz = nullptr;
@@ -428,8 +428,8 @@ ErrorCode CNavWindow::detach() {
delete _pGarfunkel;
_pGarfunkel = nullptr;
- delete _pBattlefish;
- _pBattlefish = nullptr;
+ delete _pBattleFish;
+ _pBattleFish = nullptr;
delete _pCurLoc;
_pCurLoc = nullptr;
@@ -713,7 +713,7 @@ void CNavWindow::onLButtonDown(uint32 /*nFlags*/, CBofPoint *pPoint, void *) {
if (_pSlug->ptInRect(*pPoint))
onSlug();
- if (_pMaggotsnest->ptInRect(*pPoint))
+ if (_pMaggotsNest->ptInRect(*pPoint))
onMaggotsnest();
break;
@@ -746,7 +746,7 @@ void CNavWindow::onLButtonDown(uint32 /*nFlags*/, CBofPoint *pPoint, void *) {
if (_pGarfunkel->ptInRect(*pPoint))
onGarfunkel();
- if (_pBattlefish->ptInRect(*pPoint))
+ if (_pBattleFish->ptInRect(*pPoint))
onBattlefish();
break;
@@ -1313,8 +1313,8 @@ void CNavWindow::calcFuel(double hf) {
pause();
CBofString sNebDir(NEBSIM4_BMP);
fixPathName(sNebDir);
- _bmptwo = new CBofBitmap(sNebDir.getBuffer(), _pPal);
- setBackground(_bmptwo);
+ _bmpTwo = new CBofBitmap(sNebDir.getBuffer(), _pPal);
+ setBackground(_bmpTwo);
_cargo = 125 + 10 + 17 + 8 + 99 + 24;
_ship = 65;
_fuel = 45;
@@ -1330,14 +1330,14 @@ void CNavWindow::calcFuel(double hf) {
pause();
CBofString sNebDir(NEBSIM3_BMP);
fixPathName(sNebDir);
- _bmptwo = new CBofBitmap(sNebDir.getBuffer(), _pPal);
- setBackground(_bmptwo);
+ _bmpTwo = new CBofBitmap(sNebDir.getBuffer(), _pPal);
+ setBackground(_bmpTwo);
_cargo = 100 + 75 + 28 + 45 + 14;
_ship = 99;
_fuel = 36;
delete _pCurPos;
_pCurPos = nullptr;
- _pCurPos = new CBofRect(*_pMaggotsnest);
+ _pCurPos = new CBofRect(*_pMaggotsNest);
_level = 2;
_pLevel = g_levelTwo;
*_pPortName = "Maggot's Nest";
@@ -1348,8 +1348,8 @@ void CNavWindow::calcFuel(double hf) {
CBofString sNebDir(NEBSIM2_BMP);
fixPathName(sNebDir);
assert(_pBackdrop != nullptr);
- _bmptwo = new CBofBitmap(sNebDir.getBuffer(), _pPal);
- setBackground(_bmptwo);
+ _bmpTwo = new CBofBitmap(sNebDir.getBuffer(), _pPal);
+ setBackground(_bmpTwo);
_cargo = 54 + 119 + 20 + 127;
_ship = 120;
_fuel = 75;
@@ -1668,7 +1668,7 @@ void CNavWindow::onPustule() {
_pCurPos = new CBofRect(*_pPustule);
*_pPortName = "Pustule";
calcFuel(3.4);
- } else if (*_pCurPos == *_pMaggotsnest) {
+ } else if (*_pCurPos == *_pMaggotsNest) {
delete _pCurPos;
_pCurPos = nullptr;
_pCurPos = new CBofRect(*_pPustule);
@@ -1698,7 +1698,7 @@ void CNavWindow::onSwamprock() {
*_pPortName = "Swamp Rock";
_pCurPos = new CBofRect(*_pSwamprock);
calcFuel(1.3);
- } else if (*_pCurPos == *_pMaggotsnest) {
+ } else if (*_pCurPos == *_pMaggotsNest) {
delete _pCurPos;
_pCurPos = nullptr;
_pCurPos = new CBofRect(*_pSwamprock);
@@ -1731,7 +1731,7 @@ void CNavWindow::onSlug() {
_cargo -= 75;
}
calcFuel(3.4);
- } else if (*_pCurPos == *_pMaggotsnest) {
+ } else if (*_pCurPos == *_pMaggotsNest) {
delete _pCurPos;
_pCurPos = nullptr;
_pCurPos = new CBofRect(*_pSlug);
@@ -1747,28 +1747,28 @@ void CNavWindow::onSlug() {
}
void CNavWindow::onMaggotsnest() {
- if (*_pCurPos == *_pMaggotsnest) {
+ if (*_pCurPos == *_pMaggotsNest) {
delete _pCurPos;
_pCurPos = nullptr;
- _pCurPos = new CBofRect(*_pMaggotsnest);
+ _pCurPos = new CBofRect(*_pMaggotsNest);
*_pPortName = "Maggot's Nest";
calcFuel(0);
} else if (*_pCurPos == *_pPustule) {
delete _pCurPos;
_pCurPos = nullptr;
- _pCurPos = new CBofRect(*_pMaggotsnest);
+ _pCurPos = new CBofRect(*_pMaggotsNest);
*_pPortName = "Maggot's Nest";
calcFuel(2.3);
} else if (*_pCurPos == *_pSwamprock) {
delete _pCurPos;
_pCurPos = nullptr;
- _pCurPos = new CBofRect(*_pMaggotsnest);
+ _pCurPos = new CBofRect(*_pMaggotsNest);
*_pPortName = "Maggot's Nest";
calcFuel(1.9);
} else if (*_pCurPos == *_pSlug) {
delete _pCurPos;
_pCurPos = nullptr;
- _pCurPos = new CBofRect(*_pMaggotsnest);
+ _pCurPos = new CBofRect(*_pMaggotsNest);
*_pPortName = "Maggot's Nest";
calcFuel(1.7);
@@ -2026,7 +2026,7 @@ void CNavWindow::onLife() {
_pCurPos = new CBofRect(*_pLife);
*_pPortName = "Life";
calcFuel(3.1);
- } else if (*_pCurPos == *_pBattlefish) {
+ } else if (*_pCurPos == *_pBattleFish) {
delete _pCurPos;
_pCurPos = nullptr;
_pCurPos = new CBofRect(*_pLife);
@@ -2078,7 +2078,7 @@ void CNavWindow::onFuge() {
_cargo -= 10;
}
calcFuel(2.9);
- } else if (*_pCurPos == *_pBattlefish) {
+ } else if (*_pCurPos == *_pBattleFish) {
delete _pCurPos;
_pCurPos = nullptr;
_pCurPos = new CBofRect(*_pFuge);
@@ -2118,10 +2118,10 @@ void CNavWindow::onGarfunkel() {
}
void CNavWindow::onBattlefish() {
- if (*_pCurPos == *_pBattlefish) {
+ if (*_pCurPos == *_pBattleFish) {
delete _pCurPos;
_pCurPos = nullptr;
- _pCurPos = new CBofRect(*_pBattlefish);
+ _pCurPos = new CBofRect(*_pBattleFish);
*_pPortName = "Battlefish";
if (g_levelThree[8].cargo._pszCargo != nullptr && g_levelThree[8].cargo._bUsed) {
g_levelThree[8].cargo._bUsed = false;
@@ -2131,7 +2131,7 @@ void CNavWindow::onBattlefish() {
} else if (*_pCurPos == *_pFuge) {
delete _pCurPos;
_pCurPos = nullptr;
- _pCurPos = new CBofRect(*_pBattlefish);
+ _pCurPos = new CBofRect(*_pBattleFish);
*_pPortName = "Battlefish";
if (g_levelThree[8].cargo._pszCargo != nullptr && g_levelThree[8].cargo._bUsed) {
g_levelThree[8].cargo._bUsed = false;
@@ -2143,7 +2143,7 @@ void CNavWindow::onBattlefish() {
delete _pCurPos;
_pCurPos = nullptr;
- _pCurPos = new CBofRect(*_pBattlefish);
+ _pCurPos = new CBofRect(*_pBattleFish);
*_pPortName = "Battlefish";
if (g_levelThree[8].cargo._pszCargo != nullptr && g_levelThree[8].cargo._bUsed) {
g_levelThree[8].cargo._bUsed = false;
diff --git a/engines/bagel/spacebar/nav_window.h b/engines/bagel/spacebar/nav_window.h
index b3fe8b5b7ca..068ca163d1a 100644
--- a/engines/bagel/spacebar/nav_window.h
+++ b/engines/bagel/spacebar/nav_window.h
@@ -68,7 +68,7 @@ protected:
void onPaint(CBofRect *pRect) override;
void onMainLoop() override;
- // Split up the onmousedown method
+ // Split up the onMouseDown method
void refreshData(); // Added func to just paint text
void onPinna();
@@ -127,7 +127,7 @@ protected:
CBofSprite *_pMap;
CBofSprite *_pCurLoc;
CBofBitmap *_pNewMap;
- CBofBitmap *_bmptwo;
+ CBofBitmap *_bmpTwo;
CBofRect *_pCurPos;
CBofString *_pPortName;
CBofRect *_pWilbur;
@@ -146,7 +146,7 @@ protected:
CBofRect *_pPustule;
CBofRect *_pSwamprock;
CBofRect *_pSlug;
- CBofRect *_pMaggotsnest;
+ CBofRect *_pMaggotsNest;
CBofRect *_pPeggleboz;
CBofRect *_pArcheroids;
CBofRect *_pPackRat;
@@ -155,7 +155,7 @@ protected:
CBofRect *_pLife;
CBofRect *_pFuge;
CBofRect *_pGarfunkel;
- CBofRect *_pBattlefish;
+ CBofRect *_pBattleFish;
CBofRect *_pNoVacancy;
NPLANET *_pLevel;
diff --git a/engines/bagel/spacebar/slot_wnd.cpp b/engines/bagel/spacebar/slot_wnd.cpp
index 78518b93087..71ca602bbc5 100644
--- a/engines/bagel/spacebar/slot_wnd.cpp
+++ b/engines/bagel/spacebar/slot_wnd.cpp
@@ -91,7 +91,7 @@ SBarSlotWnd::SBarSlotWnd() : CBagStorageDevWnd() {
_pSlotButs[i] = nullptr;
}
- // Init all our slotbmp
+ // Init all our slot bmp
for (int i = 0; i < SLOT_NUM; i++) {
_cSlots[i]._nIdx = g_engine->getRandomNumber() % SLOT_BMP_NUM;
for (int j = 0; j < SLOT_BMP_NUM; j++) {
@@ -147,7 +147,7 @@ void SBarSlotWnd::onPaint(CBofRect *pRect) {
paintStorageDevice(nullptr, pBackBmp, pRect);
}
- // Paint all our slotbmp
+ // Paint all our slot bmp
for (int i = 0; i < SLOT_NUM; i++) {
if (_cSlots[i]._pSlotBmp[_cSlots[i]._nIdx] != nullptr) {
@@ -205,7 +205,7 @@ ErrorCode SBarSlotWnd::attach() {
// Hide the GO, LOSE Button until a bet is made
_pSlotButs[GO]->hide();
- // Build all our slotbmp
+ // Build all our slot bmp
for (int i = 0; i < SLOT_NUM; i++) {
_cSlots[i]._nIdx = g_engine->getRandomNumber() % SLOT_BMP_NUM;
for (int j = 0; j < SLOT_BMP_NUM; j++) {
@@ -301,7 +301,7 @@ ErrorCode SBarSlotWnd::detach() {
_pSlotButs[i] = nullptr;
}
- // Destroy all our slotbmp
+ // Destroy all our slot bmp
for (int i = 0; i < SLOT_NUM; i++) {
_cSlots[i]._nIdx = 0;
diff --git a/engines/bagel/spacebar/slot_wnd.h b/engines/bagel/spacebar/slot_wnd.h
index e9a9e471625..546d81d07e3 100644
--- a/engines/bagel/spacebar/slot_wnd.h
+++ b/engines/bagel/spacebar/slot_wnd.h
@@ -104,8 +104,8 @@ public:
virtual void onBofButton(CBofObject *pButton, int nState);
virtual void onMainLoop();
- virtual ErrorCode attach(); // This function attachs the background and necessary bitmaps
- virtual ErrorCode detach(); // This function detachs the background and necessary bitmaps
+ virtual ErrorCode attach(); // This function attaches the background and necessary bitmaps
+ virtual ErrorCode detach(); // This function detaches the background and necessary bitmaps
void addBet(int nBetVal);
void betAll();
diff --git a/engines/bagel/spacebar/sraf_computer.cpp b/engines/bagel/spacebar/sraf_computer.cpp
index 5e0d1c8a8d0..57f3080e493 100644
--- a/engines/bagel/spacebar/sraf_computer.cpp
+++ b/engines/bagel/spacebar/sraf_computer.cpp
@@ -54,7 +54,7 @@ namespace SpaceBar {
#define kDrivingTime 5
// Constants not linked to any one screen
-#define kCheckmark 'x'
+#define kCheckMark 'x'
#define kStandardIndentation 4
#define kStandardDoubleIndentation 8
@@ -71,9 +71,9 @@ namespace SpaceBar {
// Add instructions to the main screen
-#define kactivateFooterStr1 "NOTE: On any subsequent screens where the information displayed does"
-#define kactivateFooterStr2 "not fit on the screen, scroll up or down one line using up-arrow and"
-#define kactivateFooterStr3 "down-arrow. Scroll up or down a page using page-up or page-down."
+#define kActivateFooterStr1 "NOTE: On any subsequent screens where the information displayed does"
+#define kActivateFooterStr2 "not fit on the screen, scroll up or down one line using up-arrow and"
+#define kActivateFooterStr3 "down-arrow. Scroll up or down a page using page-up or page-down."
#define kBuyerBidsHeaderStr "BUYER Zn Ba Rg Ut Pn Sz 0 H20 LH CH ME TE AS PD ACCEPT"
#define kBuyerBidsMessage1 "Click on any buyer to see their biography. Click in the 'ACCEPT' column "
@@ -1721,7 +1721,7 @@ void SrafComputer::recalcDispatchList(int mExpansionFlag) {
sStr += "[ ] ";
sStr += g_stSellerNames[i - 1]._pszName;
if (g_stSellerNames[i - 1]._bMeetWith) {
- sStr.replaceCharAt(kStandardIndentation + 1, kCheckmark);
+ sStr.replaceCharAt(kStandardIndentation + 1, kCheckMark);
}
} else {
baddToTail = false;
@@ -1750,7 +1750,7 @@ void SrafComputer::recalcDispatchList(int mExpansionFlag) {
sStr += "[ ] ";
sStr += g_stBuyerBids[i - 2]._pszName;
if (g_stBuyerBids[i - 2]._bMeetWith) {
- sStr.replaceCharAt(kStandardIndentation + 1, kCheckmark);
+ sStr.replaceCharAt(kStandardIndentation + 1, kCheckMark);
}
}
} else {
@@ -1773,7 +1773,7 @@ void SrafComputer::recalcDispatchList(int mExpansionFlag) {
sStr += "[ ] ";
sStr += g_stOtherPartys[i - 3]._pszName;
if (g_stOtherPartys[i - 3]._bMeetWith) {
- sStr.replaceCharAt(kStandardIndentation + 1, kCheckmark);
+ sStr.replaceCharAt(kStandardIndentation + 1, kCheckMark);
}
} else {
baddToTail = false;
@@ -2912,7 +2912,7 @@ void SrafComputer::onListDispatchTeam() {
// If we have a new column to check, do that here.
if (bInMeetMemberColumn) {
sStr = _pLBox->getText(_nSelection);
- sStr.replaceCharAt(kStandardIndentation + 1, kCheckmark); // ??? works fine on mac, not sure what check mark is for pc
+ sStr.replaceCharAt(kStandardIndentation + 1, kCheckMark); // ??? works fine on mac, not sure what check mark is for pc
_pLBox->setText(_nSelection, sStr);
_pLBox->repaintItem(_nSelection);
}
@@ -2950,7 +2950,7 @@ void SrafComputer::onListDispatchTeam() {
if (g_staffers[nElementIndex]._bAvailable) {
char cNewChar = ' ';
if (g_staffers[nElementIndex]._bOnCurrentTeam == false) {
- cNewChar = kCheckmark;
+ cNewChar = kCheckMark;
}
// Negate
@@ -3657,13 +3657,13 @@ void SrafComputer::activateMainScreen() {
sStr = "";
_pLBox->addToTail(sStr, false);
- sStr = kactivateFooterStr1;
+ sStr = kActivateFooterStr1;
_pLBox->addToTail(sStr, false);
- sStr = kactivateFooterStr2;
+ sStr = kActivateFooterStr2;
_pLBox->addToTail(sStr, false);
- sStr = kactivateFooterStr3;
+ sStr = kActivateFooterStr3;
_pLBox->addToTail(sStr, false);
// Display the current time...
diff --git a/engines/bagel/spacebar/thud.cpp b/engines/bagel/spacebar/thud.cpp
index 1e10fe07f5c..88bc5fdd4cb 100644
--- a/engines/bagel/spacebar/thud.cpp
+++ b/engines/bagel/spacebar/thud.cpp
@@ -34,7 +34,7 @@ SBarThud::SBarThud(CBofWindow *pParent, const CBofRect &xRect) :
_xSDevType = SDEV_WIELD;
_xYouBmp = nullptr;
_nObjects = 0; // This should be changed on the attach
- _currObj = nullptr;
+ _currentObj = nullptr;
}
SBarThud::~SBarThud() {
diff --git a/engines/bagel/spacebar/thud.h b/engines/bagel/spacebar/thud.h
index bcff1c96860..0e1b446e4fd 100644
--- a/engines/bagel/spacebar/thud.h
+++ b/engines/bagel/spacebar/thud.h
@@ -30,7 +30,7 @@ namespace SpaceBar {
class SBarThud : public CBagStorageDevBmp {
private:
- CBagObject *_currObj;
+ CBagObject *_currentObj;
int _nObjects; // The number of currently active objects
CBofBitmap *_xYouBmp;
static int _nThudCursor;
@@ -38,11 +38,11 @@ public:
SBarThud(CBofWindow *pParent = nullptr, const CBofRect &xRect = CBofRect());
virtual ~SBarThud();
- CBagObject *getCurrObj() {
- return _currObj;
+ CBagObject *getCurrentObj() {
+ return _currentObj;
}
- CBagObject *setCurrObj(CBagObject *pObj) {
- return _currObj = pObj;
+ CBagObject *setCurrentObj(CBagObject *pObj) {
+ return _currentObj = pObj;
}
static int getThudCursor() {
More information about the Scummvm-git-logs
mailing list