[Scummvm-git-logs] scummvm master -> ec4e0436a653613ee37502659524b3f2e842b3cf
sev-
noreply at scummvm.org
Mon Jun 3 22:45:17 UTC 2024
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7cea6b895a BAGEL: Remove default values not used in create functions' definition, try to standardize the signature and fix virtual/
13127dcc40 BAGEL: Rename CBagMenuDlg::create to CBagMenuDlg::createDlg
eac14a7577 BAGEL: Rename CDevDlg::create() to CDevDlg::createWindow()
ec4e0436a6 BAGEL: Remove bagel/spacebar/inv.h & cpp
Commit: 7cea6b895a5da082d10146a5349ae4bd529bd596
https://github.com/scummvm/scummvm/commit/7cea6b895a5da082d10146a5349ae4bd529bd596
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-06-04T00:45:12+02:00
Commit Message:
BAGEL: Remove default values not used in create functions' definition, try to standardize the signature and fix virtual/override keywords
Changed paths:
engines/bagel/baglib/command_object.cpp
engines/bagel/baglib/dev_dlg.h
engines/bagel/baglib/master_win.cpp
engines/bagel/baglib/menu_dlg.cpp
engines/bagel/baglib/menu_dlg.h
engines/bagel/baglib/storage_dev_win.h
engines/bagel/boflib/gfx/palette.h
engines/bagel/boflib/gui/dialog.h
engines/bagel/boflib/gui/edit_text.h
engines/bagel/boflib/gui/window.cpp
engines/bagel/boflib/gui/window.h
engines/bagel/spacebar/inv.cpp
diff --git a/engines/bagel/baglib/command_object.cpp b/engines/bagel/baglib/command_object.cpp
index c05e5eccc76..dce9ad85507 100644
--- a/engines/bagel/baglib/command_object.cpp
+++ b/engines/bagel/baglib/command_object.cpp
@@ -263,7 +263,7 @@ bool CBagCommandObject::runObject() {
CBofString bmpName("$SBARDIR\\GENERAL\\POPUP\\THUDPOP.BMP");
fixPathName(bmpName);
CDevDlg dlg;
- dlg.create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::getApp()->getPalette(), &tmpRect);
+ dlg.create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::getApp()->getPalette(), &tmpRect, false);
dlg.doModal();
dlg.destroy();
@@ -272,7 +272,7 @@ bool CBagCommandObject::runObject() {
CBofString bmpName("$SBARDIR\\GENERAL\\POPUP\\FLEEDAT.BMP");
fixPathName(bmpName);
CDevDlg dlg;
- dlg.create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::getApp()->getPalette(), &tmpRect);
+ dlg.create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::getApp()->getPalette(), &tmpRect, false);
dlg.doModal();
dlg.destroy();
@@ -281,7 +281,7 @@ bool CBagCommandObject::runObject() {
CBofString bmpName("$SBARDIR\\GENERAL\\POPUP\\CLICKPOP.BMP");
fixPathName(bmpName);
CDevDlg dlg;
- dlg.create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::getApp()->getPalette(), &tmpRect);
+ dlg.create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::getApp()->getPalette(), &tmpRect, false);
dlg.doModal();
dlg.destroy();
@@ -290,7 +290,7 @@ bool CBagCommandObject::runObject() {
CBofString bmpName("$SBARDIR\\GENERAL\\POPUP\\CLICKDAT.BMP");
fixPathName(bmpName);
CDevDlg dlg;
- dlg.create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::getApp()->getPalette(), &tmpRect);
+ dlg.create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::getApp()->getPalette(), &tmpRect, false);
dlg.doModal();
dlg.destroy();
diff --git a/engines/bagel/baglib/dev_dlg.h b/engines/bagel/baglib/dev_dlg.h
index 111ed45b294..631f019c49c 100644
--- a/engines/bagel/baglib/dev_dlg.h
+++ b/engines/bagel/baglib/dev_dlg.h
@@ -45,7 +45,7 @@ public:
CDevDlg(int buttonX = -1, int buttonY = -1);
~CDevDlg();
- ErrorCode create(const char *bmp, CBofWindow *wnd, CBofPalette *pal, CBofRect *rect, bool useExtraFl = false);
+ ErrorCode create(const char *bmp, CBofWindow *wnd, CBofPalette *pal, CBofRect *rect, bool useExtraFl);
void paintText();
void setText(CBofString &, CBofRect *);
void onKeyHit(uint32 keyCode, uint32 repCount) override;
diff --git a/engines/bagel/baglib/master_win.cpp b/engines/bagel/baglib/master_win.cpp
index 8e93e3d0299..4139e8e78ad 100644
--- a/engines/bagel/baglib/master_win.cpp
+++ b/engines/bagel/baglib/master_win.cpp
@@ -96,7 +96,7 @@ CBagMasterWin::CBagMasterWin() {
_variableList = nullptr;
_diskId = 1;
- create(appName, &screenRect);
+ create(appName, &screenRect, nullptr);
// Assume default system screen
_sysScreen = "$SBARDIR\\GENERAL\\SYSTEM\\GAMBHALL.BMP";
diff --git a/engines/bagel/baglib/menu_dlg.cpp b/engines/bagel/baglib/menu_dlg.cpp
index f4d2e0cb40c..e5fb10fdb0b 100644
--- a/engines/bagel/baglib/menu_dlg.cpp
+++ b/engines/bagel/baglib/menu_dlg.cpp
@@ -573,7 +573,7 @@ CBagMenuDlg::~CBagMenuDlg() {
assert(isValidObject(this));
}
-ErrorCode CBagMenuDlg::create(CBofWindow *pWnd, CBofPalette *pPal, const CBofRect *pRect, uint32 /*nStyle*/) {
+ErrorCode CBagMenuDlg::create(CBofWindow *pWnd, CBofPalette *pPal, CBofRect *pRect, uint32 /*nStyle*/) {
CBofRect r;
_bMultipleDialogs = false;
diff --git a/engines/bagel/baglib/menu_dlg.h b/engines/bagel/baglib/menu_dlg.h
index 3085c0dd370..a786cca76e6 100644
--- a/engines/bagel/baglib/menu_dlg.h
+++ b/engines/bagel/baglib/menu_dlg.h
@@ -85,7 +85,7 @@ public:
CBagMenuDlg();
virtual ~CBagMenuDlg();
- ErrorCode create(CBofWindow *pWnd, CBofPalette *pPal, const CBofRect *cRect = nullptr, uint32 nStyle = 0);
+ ErrorCode create(CBofWindow *pWnd, CBofPalette *pPal, CBofRect *cRect, uint32 nStyle = 0);
virtual void onMouseMove(uint32 nFlags, CBofPoint *pPoint, void * = nullptr);
virtual void onLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr);
diff --git a/engines/bagel/baglib/storage_dev_win.h b/engines/bagel/baglib/storage_dev_win.h
index df2769dd1dd..39ed35930b1 100644
--- a/engines/bagel/baglib/storage_dev_win.h
+++ b/engines/bagel/baglib/storage_dev_win.h
@@ -513,7 +513,7 @@ public:
ErrorCode loadFile(const CBofString &sWldFile) override;
- ErrorCode create(const char *pszName, CBofRect *pRect = nullptr, CBofWindow *pParent = nullptr, uint32 nControlID = 0);
+ ErrorCode create(const char *pszName, CBofRect *pRect, CBofWindow *pParent, uint32 nControlID = 0) override;
ErrorCode attach() override; // This function attaches the background and necessary bitmaps
diff --git a/engines/bagel/boflib/gfx/palette.h b/engines/bagel/boflib/gfx/palette.h
index fa0d46542d7..29b3bc355bc 100644
--- a/engines/bagel/boflib/gfx/palette.h
+++ b/engines/bagel/boflib/gfx/palette.h
@@ -62,7 +62,7 @@ struct BOFRGBQUAD {
byte rgbReserved;
};
-#define GetRed(rgb) ((byte)((rgb)&0x000000FF))
+#define GetRed(rgb) ((byte)((rgb) & 0x000000FF))
#define GetGreen(rgb) ((byte)(((rgb) >> 8) & 0x000000FF))
#define GetBlue(rgb) ((byte)(((rgb) >> 16) & 0x000000FF))
diff --git a/engines/bagel/boflib/gui/dialog.h b/engines/bagel/boflib/gui/dialog.h
index 45185edf997..5eea6df0966 100644
--- a/engines/bagel/boflib/gui/dialog.h
+++ b/engines/bagel/boflib/gui/dialog.h
@@ -24,7 +24,6 @@
#include "bagel/boflib/gui/window.h"
#include "bagel/boflib/gfx/bitmap.h"
-#include "bagel/boflib/gfx/palette.h"
namespace Bagel {
@@ -53,8 +52,8 @@ protected:
virtual ErrorCode saveBackground();
virtual ErrorCode killBackground();
- virtual void onPaint(CBofRect *pRect);
- virtual void onClose();
+ void onPaint(CBofRect *pRect) override;
+ void onClose() override;
virtual void onInitDialog();
public:
@@ -84,7 +83,7 @@ public:
* @param nControlID Control Id
* @return Error return code
*/
- ErrorCode create(const char *pszName, int x = 0, int y = 0, int nWidth = USE_DEFAULT, int nHeight = USE_DEFAULT, CBofWindow *pParent = nullptr, uint32 nControlID = 0);
+ ErrorCode create(const char *pszName, int x, int y, int nWidth, int nHeight, CBofWindow *pParent, uint32 nControlID = 0) override;
/**
* Creates the dialog
@@ -94,7 +93,7 @@ public:
* @param nControlID Control Id
* @return Error return code
*/
- ErrorCode create(const char *pszName, CBofRect *pRect = nullptr, CBofWindow *pParent = nullptr, uint32 nControlID = 0);
+ ErrorCode create(const char *pszName, CBofRect *pRect, CBofWindow *pParent, uint32 nControlID = 0) override;
/**
* Set the dialog flags
diff --git a/engines/bagel/boflib/gui/edit_text.h b/engines/bagel/boflib/gui/edit_text.h
index 2cddf764808..0bd859b2f43 100644
--- a/engines/bagel/boflib/gui/edit_text.h
+++ b/engines/bagel/boflib/gui/edit_text.h
@@ -40,10 +40,10 @@ protected:
public:
CBofEditText() {}
- CBofEditText(const char *pszName, int x = 0, int y = 0, int nWidth = USE_DEFAULT, int nHeight = USE_DEFAULT, CBofWindow *pParent = nullptr);
+ CBofEditText(const char *pszName, int x, int y, int nWidth, int nHeight, CBofWindow *pParent);
- ErrorCode create(const char *pszName, int x = 0, int y = 0, int nWidth = USE_DEFAULT, int nHeight = USE_DEFAULT, CBofWindow *pParent = nullptr, uint32 nControlID = 0);
- ErrorCode create(const char *pszName, CBofRect *pRect = nullptr, CBofWindow *pParent = nullptr, uint32 nControlID = 0);
+ ErrorCode create(const char *pszName, int x, int y, int nWidth, int nHeight, CBofWindow *pParent, uint32 nControlID = 0) override;
+ ErrorCode create(const char *pszName, CBofRect *pRect, CBofWindow *pParent, uint32 nControlID = 0) override;
CBofString getText() const {
return _text;
diff --git a/engines/bagel/boflib/gui/window.cpp b/engines/bagel/boflib/gui/window.cpp
index c76278e5b01..9cd1860701f 100644
--- a/engines/bagel/boflib/gui/window.cpp
+++ b/engines/bagel/boflib/gui/window.cpp
@@ -178,7 +178,7 @@ void CBofWindow::setParent(CBofWindow *parent) {
}
-ErrorCode CBofWindow::create(const char *pszName, const CBofRect *pRect, CBofWindow *pParent, uint32 nControlID) {
+ErrorCode CBofWindow::create(const char *pszName, CBofRect *pRect, CBofWindow *pParent, uint32 nControlID) {
assert(isValidObject(this));
assert(pszName != nullptr);
diff --git a/engines/bagel/boflib/gui/window.h b/engines/bagel/boflib/gui/window.h
index 84bd2a04edf..f79b9fa71d3 100644
--- a/engines/bagel/boflib/gui/window.h
+++ b/engines/bagel/boflib/gui/window.h
@@ -81,7 +81,7 @@ public:
* @param nHeight Height of window to create (optional)
* @param pParent Parent of this window (optional)
*/
- CBofWindow(const char *pszName, int x = 0, int y = 0, int nWidth = USE_DEFAULT, int nHeight = USE_DEFAULT, CBofWindow *pParent = nullptr);
+ CBofWindow(const char *pszName, int x, int y, int nWidth, int nHeight, CBofWindow *pParent);
/**
* Destructor
@@ -103,7 +103,7 @@ public:
* @param nControlID User defined ID of this window
* @return Error return code
*/
- virtual ErrorCode create(const char *pszName, int x = 0, int y = 0, int nWidth = USE_DEFAULT, int nHeight = USE_DEFAULT, CBofWindow *pParent = nullptr, uint32 nControlID = 0);
+ virtual ErrorCode create(const char *pszName, int x, int y, int nWidth, int nHeight, CBofWindow *pParent, uint32 nControlID = 0);
/**
* Creates a window
@@ -113,7 +113,7 @@ public:
* @param nControlID User defined ID of this window
* @return Error return code
*/
- ErrorCode create(const char *pszName, const CBofRect *pRect = nullptr, CBofWindow *pParent = nullptr, uint32 nControlID = 0);
+ virtual ErrorCode create(const char *pszName, CBofRect *pRect, CBofWindow *pParent, uint32 nControlID = 0);
/**
* Destroys the Window attached to this CBofWindow (if any)
diff --git a/engines/bagel/spacebar/inv.cpp b/engines/bagel/spacebar/inv.cpp
index e9dde308fa3..c0f51c549c7 100644
--- a/engines/bagel/spacebar/inv.cpp
+++ b/engines/bagel/spacebar/inv.cpp
@@ -37,7 +37,7 @@ void SBarInventoryWindow::onLButtonDown(uint32, CBofPoint *, void *) {
bool SBarInventoryWindow::create(CBofWindow * /*pWnd*/, CBofPoint p) {
CBofRect tmpRect(p, CBofSize(100, 50));
loadFile("Inv.wld");
- CBofWindow::create("Inventory", &tmpRect);
+ CBofWindow::create("Inventory", &tmpRect, nullptr);
return true;
}
Commit: 13127dcc406968ac88b83673c5709614f8889d67
https://github.com/scummvm/scummvm/commit/13127dcc406968ac88b83673c5709614f8889d67
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-06-04T00:45:12+02:00
Commit Message:
BAGEL: Rename CBagMenuDlg::create to CBagMenuDlg::createDlg
Changed paths:
engines/bagel/baglib/menu_dlg.cpp
engines/bagel/baglib/menu_dlg.h
engines/bagel/baglib/text_object.cpp
diff --git a/engines/bagel/baglib/menu_dlg.cpp b/engines/bagel/baglib/menu_dlg.cpp
index e5fb10fdb0b..6a26a9500d7 100644
--- a/engines/bagel/baglib/menu_dlg.cpp
+++ b/engines/bagel/baglib/menu_dlg.cpp
@@ -424,7 +424,7 @@ bool CBagMenu::trackPopupMenu(uint32 /*nFlags*/, int x, int y, CBofWindow *pWnd,
CBofPalette xPal;
xPal.loadPalette(cString);
- dlg.create(pParent, &xPal, &tmpRect);
+ dlg.createDlg(pParent, &xPal, &tmpRect);
if (bCaption) {
// We need to move this back to the correct position
@@ -573,7 +573,7 @@ CBagMenuDlg::~CBagMenuDlg() {
assert(isValidObject(this));
}
-ErrorCode CBagMenuDlg::create(CBofWindow *pWnd, CBofPalette *pPal, CBofRect *pRect, uint32 /*nStyle*/) {
+ErrorCode CBagMenuDlg::createDlg(CBofWindow *pWnd, CBofPalette *pPal, CBofRect *pRect) {
CBofRect r;
_bMultipleDialogs = false;
diff --git a/engines/bagel/baglib/menu_dlg.h b/engines/bagel/baglib/menu_dlg.h
index a786cca76e6..edbef5e1fd6 100644
--- a/engines/bagel/baglib/menu_dlg.h
+++ b/engines/bagel/baglib/menu_dlg.h
@@ -85,7 +85,7 @@ public:
CBagMenuDlg();
virtual ~CBagMenuDlg();
- ErrorCode create(CBofWindow *pWnd, CBofPalette *pPal, CBofRect *cRect, uint32 nStyle = 0);
+ ErrorCode createDlg(CBofWindow *pWnd, CBofPalette *pPal, CBofRect *cRect);
virtual void onMouseMove(uint32 nFlags, CBofPoint *pPoint, void * = nullptr);
virtual void onLButtonUp(uint32 nFlags, CBofPoint *pPoint, void * = nullptr);
diff --git a/engines/bagel/baglib/text_object.cpp b/engines/bagel/baglib/text_object.cpp
index 5f93cde486a..d0661d13602 100644
--- a/engines/bagel/baglib/text_object.cpp
+++ b/engines/bagel/baglib/text_object.cpp
@@ -468,7 +468,7 @@ bool CBagTextObject::runObject() {
cBmp.fillRect(nullptr, pPal->getNearestIndex(RGB(92, 92, 92)));
CBagMenuDlg cDlg;
- cDlg.create(pParent, pPal, &cRect);
+ cDlg.createDlg(pParent, pPal, &cRect);
update(cDlg.getBackdrop(), cPoint, &cRect);
Commit: eac14a7577330d7d10ee17ede4981bd4f39984de
https://github.com/scummvm/scummvm/commit/eac14a7577330d7d10ee17ede4981bd4f39984de
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-06-04T00:45:12+02:00
Commit Message:
BAGEL: Rename CDevDlg::create() to CDevDlg::createWindow()
Changed paths:
engines/bagel/baglib/command_object.cpp
engines/bagel/baglib/dev_dlg.cpp
engines/bagel/baglib/dev_dlg.h
diff --git a/engines/bagel/baglib/command_object.cpp b/engines/bagel/baglib/command_object.cpp
index dce9ad85507..a4b852273c3 100644
--- a/engines/bagel/baglib/command_object.cpp
+++ b/engines/bagel/baglib/command_object.cpp
@@ -263,7 +263,7 @@ bool CBagCommandObject::runObject() {
CBofString bmpName("$SBARDIR\\GENERAL\\POPUP\\THUDPOP.BMP");
fixPathName(bmpName);
CDevDlg dlg;
- dlg.create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::getApp()->getPalette(), &tmpRect, false);
+ dlg.createWindow(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::getApp()->getPalette(), &tmpRect, false);
dlg.doModal();
dlg.destroy();
@@ -272,7 +272,7 @@ bool CBagCommandObject::runObject() {
CBofString bmpName("$SBARDIR\\GENERAL\\POPUP\\FLEEDAT.BMP");
fixPathName(bmpName);
CDevDlg dlg;
- dlg.create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::getApp()->getPalette(), &tmpRect, false);
+ dlg.createWindow(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::getApp()->getPalette(), &tmpRect, false);
dlg.doModal();
dlg.destroy();
@@ -281,7 +281,7 @@ bool CBagCommandObject::runObject() {
CBofString bmpName("$SBARDIR\\GENERAL\\POPUP\\CLICKPOP.BMP");
fixPathName(bmpName);
CDevDlg dlg;
- dlg.create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::getApp()->getPalette(), &tmpRect, false);
+ dlg.createWindow(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::getApp()->getPalette(), &tmpRect, false);
dlg.doModal();
dlg.destroy();
@@ -290,7 +290,7 @@ bool CBagCommandObject::runObject() {
CBofString bmpName("$SBARDIR\\GENERAL\\POPUP\\CLICKDAT.BMP");
fixPathName(bmpName);
CDevDlg dlg;
- dlg.create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::getApp()->getPalette(), &tmpRect, false);
+ dlg.createWindow(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::getApp()->getPalette(), &tmpRect, false);
dlg.doModal();
dlg.destroy();
@@ -299,7 +299,7 @@ bool CBagCommandObject::runObject() {
CBofString bmpName("$SBARDIR\\GENERAL\\POPUP\\DEVENPOP.BMP");
fixPathName(bmpName);
CDevDlg dlg;
- dlg.create(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::getApp()->getPalette(), &tmpRect, true);
+ dlg.createWindow(bmpName, CBagel::getBagApp()->getMasterWnd(), CBofApp::getApp()->getPalette(), &tmpRect, true);
dlg.doModal();
dlg.destroy();
diff --git a/engines/bagel/baglib/dev_dlg.cpp b/engines/bagel/baglib/dev_dlg.cpp
index f43c14ef9fd..26056b24d36 100644
--- a/engines/bagel/baglib/dev_dlg.cpp
+++ b/engines/bagel/baglib/dev_dlg.cpp
@@ -44,7 +44,7 @@ CDevDlg::~CDevDlg() {
_titleText = nullptr;
}
-ErrorCode CDevDlg::create(const char *bmp, CBofWindow *wnd, CBofPalette *pal, CBofRect *rect, bool useExtraFl) {
+ErrorCode CDevDlg::createWindow(const char *bmp, CBofWindow *wnd, CBofPalette *pal, CBofRect *rect, bool useExtraFl) {
assert(isValidObject(this));
assert(bmp != nullptr);
assert(wnd != nullptr);
diff --git a/engines/bagel/baglib/dev_dlg.h b/engines/bagel/baglib/dev_dlg.h
index 631f019c49c..cf2233ca516 100644
--- a/engines/bagel/baglib/dev_dlg.h
+++ b/engines/bagel/baglib/dev_dlg.h
@@ -45,7 +45,7 @@ public:
CDevDlg(int buttonX = -1, int buttonY = -1);
~CDevDlg();
- ErrorCode create(const char *bmp, CBofWindow *wnd, CBofPalette *pal, CBofRect *rect, bool useExtraFl);
+ ErrorCode createWindow(const char *bmp, CBofWindow *wnd, CBofPalette *pal, CBofRect *rect, bool useExtraFl);
void paintText();
void setText(CBofString &, CBofRect *);
void onKeyHit(uint32 keyCode, uint32 repCount) override;
Commit: ec4e0436a653613ee37502659524b3f2e842b3cf
https://github.com/scummvm/scummvm/commit/ec4e0436a653613ee37502659524b3f2e842b3cf
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-06-04T00:45:12+02:00
Commit Message:
BAGEL: Remove bagel/spacebar/inv.h & cpp
Changed paths:
R engines/bagel/spacebar/inv.cpp
R engines/bagel/spacebar/inv.h
engines/bagel/module.mk
diff --git a/engines/bagel/module.mk b/engines/bagel/module.mk
index 5d94431a4a8..ea959ef48ee 100644
--- a/engines/bagel/module.mk
+++ b/engines/bagel/module.mk
@@ -95,7 +95,6 @@ MODULE_OBJS = \
spacebar/computer.o \
spacebar/filter.o \
spacebar/full_wnd.o \
- spacebar/inv.o \
spacebar/main_link_object.o \
spacebar/main_window.o \
spacebar/master_win.o \
diff --git a/engines/bagel/spacebar/inv.cpp b/engines/bagel/spacebar/inv.cpp
deleted file mode 100644
index c0f51c549c7..00000000000
--- a/engines/bagel/spacebar/inv.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "bagel/spacebar/inv.h"
-#include "bagel/baglib/object.h"
-
-namespace Bagel {
-namespace SpaceBar {
-
-SBarInventoryWindow::SBarInventoryWindow() {
-}
-
-SBarInventoryWindow::~SBarInventoryWindow() {
-}
-
-void SBarInventoryWindow::onLButtonDown(uint32, CBofPoint *, void *) {
-}
-
-bool SBarInventoryWindow::create(CBofWindow * /*pWnd*/, CBofPoint p) {
- CBofRect tmpRect(p, CBofSize(100, 50));
- loadFile("Inv.wld");
- CBofWindow::create("Inventory", &tmpRect, nullptr);
- return true;
-}
-
-} // namespace SpaceBar
-} // namespace Bagel
diff --git a/engines/bagel/spacebar/inv.h b/engines/bagel/spacebar/inv.h
deleted file mode 100644
index 9db8b630d06..00000000000
--- a/engines/bagel/spacebar/inv.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef BAGEL_SPACEBAR_INV_H
-#define BAGEL_SPACEBAR_INV_H
-
-#include "bagel/baglib/storage_dev_win.h"
-
-namespace Bagel {
-namespace SpaceBar {
-
-/**
- * CBagPanWindow is a window that contains a slide bitmap object. It has specialized
- * functions for handling slide bitmaps and slide objects.
- */
-class SBarInventoryWindow : public CBagStorageDevWnd {
-public:
- SBarInventoryWindow();
- ~SBarInventoryWindow();
-
- bool create(CBofWindow *pWnd, CBofPoint p);
- void onLButtonDown(uint32, CBofPoint *, void * = nullptr);
-};
-
-} // namespace SpaceBar
-} // namespace Bagel
-
-#endif
More information about the Scummvm-git-logs
mailing list