[Scummvm-git-logs] scummvm master -> f0654c5c2bd495ccbbac92a1b0710b70ba7d4400
dreammaster
noreply at scummvm.org
Sun Sep 14 05:05:36 UTC 2025
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
f0654c5c2b BAGEL: METAGAME: Resolve confusion between demo and full game main window class
Commit: f0654c5c2bd495ccbbac92a1b0710b70ba7d4400
https://github.com/scummvm/scummvm/commit/f0654c5c2bd495ccbbac92a1b0710b70ba7d4400
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-09-13T21:58:32-07:00
Commit Message:
BAGEL: METAGAME: Resolve confusion between demo and full game main window class
Changed paths:
A engines/bagel/hodjnpodj/metagame/demo/hodjpodj_demo.cpp
A engines/bagel/hodjnpodj/metagame/demo/hodjpodj_demo.h
R engines/bagel/hodjnpodj/metagame/demo/hodjpodj.cpp
R engines/bagel/hodjnpodj/metagame/demo/hodjpodj.h
engines/bagel/hodjnpodj/metagame/demo/app.cpp
engines/bagel/hodjnpodj/metagame/frame/app.cpp
engines/bagel/module.mk
diff --git a/engines/bagel/hodjnpodj/metagame/demo/app.cpp b/engines/bagel/hodjnpodj/metagame/demo/app.cpp
index 24bfd229e95..3fc9fd94fed 100644
--- a/engines/bagel/hodjnpodj/metagame/demo/app.cpp
+++ b/engines/bagel/hodjnpodj/metagame/demo/app.cpp
@@ -20,7 +20,7 @@
*/
#include "bagel/hodjnpodj/metagame/demo/app.h"
-#include "bagel/hodjnpodj/metagame/demo/hodjpodj.h"
+#include "bagel/hodjnpodj/metagame/demo/hodjpodj_demo.h"
#include "bagel/hodjnpodj/metagame/bgen/mgstat.h"
#include "bagel/boflib/sound.h"
@@ -42,7 +42,7 @@ bool CTheApp::InitApplication() {
bool CTheApp::InitInstance() {
// Main demo
- m_pMainWnd = new CHodjPodjWindow();
+ m_pMainWnd = new CHodjPodjDemoWindow();
m_pMainWnd->ShowWindow(SW_SHOWNORMAL);
m_pMainWnd->UpdateWindow();
diff --git a/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.cpp b/engines/bagel/hodjnpodj/metagame/demo/hodjpodj_demo.cpp
similarity index 85%
rename from engines/bagel/hodjnpodj/metagame/demo/hodjpodj.cpp
rename to engines/bagel/hodjnpodj/metagame/demo/hodjpodj_demo.cpp
index 6ccc12ba05a..87c54253f6b 100644
--- a/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.cpp
+++ b/engines/bagel/hodjnpodj/metagame/demo/hodjpodj_demo.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "bagel/hodjnpodj/metagame/demo/hodjpodj.h"
+#include "bagel/hodjnpodj/metagame/demo/hodjpodj_demo.h"
#include "bagel/hodjnpodj/metagame/zoom/init.h"
#include "bagel/hodjnpodj/hnplibs/bitmaps.h"
#include "bagel/hodjnpodj/hodjnpodj.h"
@@ -46,7 +46,7 @@ namespace Demo {
#define LOGO_MIDI "sound/maintitl.mid"
-BEGIN_MESSAGE_MAP(CHodjPodjWindow, CFrameWnd)
+BEGIN_MESSAGE_MAP(CHodjPodjDemoWindow, CFrameWnd)
ON_WM_TIMER()
ON_WM_LBUTTONDOWN()
ON_WM_CLOSE()
@@ -55,7 +55,7 @@ ON_WM_SYSCHAR()
ON_WM_PARENTNOTIFY()
END_MESSAGE_MAP()
-CHodjPodjWindow::CHodjPodjWindow() {
+CHodjPodjDemoWindow::CHodjPodjDemoWindow() {
CString WndClass;
CRect MainRect;
bool bTestDibDoc;
@@ -86,7 +86,7 @@ CHodjPodjWindow::CHodjPodjWindow() {
PostMessage(WM_COMMAND, IDC_SPLASH1);
}
-bool CHodjPodjWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
+bool CHodjPodjDemoWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
_currentCommand = wParam;
switch (wParam) {
@@ -125,7 +125,7 @@ bool CHodjPodjWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
return true;
}
-void CHodjPodjWindow::blackScreen() {
+void CHodjPodjDemoWindow::blackScreen() {
CDC *pDC;
CBrush Brush(RGB(0, 0, 0));
CPalette *pPalOld = nullptr;
@@ -152,7 +152,7 @@ void CHodjPodjWindow::blackScreen() {
ReleaseDC(pDC);
}
-void CHodjPodjWindow::drawBitmap(const char *filename) {
+void CHodjPodjDemoWindow::drawBitmap(const char *filename) {
CDC *dc = GetDC();
CBitmap *bitmap = FetchBitmap(dc, &pGamePalette, filename);
@@ -162,7 +162,7 @@ void CHodjPodjWindow::drawBitmap(const char *filename) {
ReleaseDC(dc);
}
-void CHodjPodjWindow::playMovie(const int nMovieId, const char *pszMovie, bool bScroll) {
+void CHodjPodjDemoWindow::playMovie(const int nMovieId, const char *pszMovie, bool bScroll) {
POINT ptMovie;
blackScreen();
@@ -176,14 +176,14 @@ void CHodjPodjWindow::playMovie(const int nMovieId, const char *pszMovie, bool b
}
-void CHodjPodjWindow::startBackgroundMidi() {
+void CHodjPodjDemoWindow::startBackgroundMidi() {
if (pBackgroundMidi == nullptr) {
pBackgroundMidi = new CSound(this, LOGO_MIDI, SOUND_MIDI | SOUND_LOOP /* | SOUND_DONT_LOOP_TO_END */);
(*pBackgroundMidi).play();
}
}
-void CHodjPodjWindow::stopBackgroundMidi() {
+void CHodjPodjDemoWindow::stopBackgroundMidi() {
if (pBackgroundMidi != nullptr) {
(*pBackgroundMidi).stop();
delete pBackgroundMidi;
@@ -191,7 +191,7 @@ void CHodjPodjWindow::stopBackgroundMidi() {
}
}
-void CHodjPodjWindow::OnTimer(uintptr nEventID) {
+void CHodjPodjDemoWindow::OnTimer(uintptr nEventID) {
switch (nEventID) {
case TIMER_SPLASH1:
KillTimer(TIMER_SPLASH1);
@@ -206,20 +206,20 @@ void CHodjPodjWindow::OnTimer(uintptr nEventID) {
}
}
-void CHodjPodjWindow::OnLButtonDown(uint nFlags, CPoint point) {
+void CHodjPodjDemoWindow::OnLButtonDown(uint nFlags, CPoint point) {
skipSplash();
}
-void CHodjPodjWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
+void CHodjPodjDemoWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
skipSplash();
}
-void CHodjPodjWindow::OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
+void CHodjPodjDemoWindow::OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
skipSplash();
}
-void CHodjPodjWindow::skipSplash() {
+void CHodjPodjDemoWindow::skipSplash() {
switch (_currentCommand) {
case IDC_SPLASH1:
OnTimer(TIMER_SPLASH1);
@@ -232,7 +232,7 @@ void CHodjPodjWindow::skipSplash() {
}
}
-void CHodjPodjWindow::OnClose() {
+void CHodjPodjDemoWindow::OnClose() {
stopBackgroundMidi();
KillTimer(TIMER_SPLASH1);
@@ -241,7 +241,7 @@ void CHodjPodjWindow::OnClose() {
CFrameWnd::OnClose();
}
-void CHodjPodjWindow::OnParentNotify(unsigned int msg, LPARAM lParam) {
+void CHodjPodjDemoWindow::OnParentNotify(unsigned int msg, LPARAM lParam) {
LPARAM nGameReturn;
// Ignore messages during app shutdown
@@ -276,7 +276,7 @@ void CHodjPodjWindow::OnParentNotify(unsigned int msg, LPARAM lParam) {
CWnd::OnParentNotify(msg, lParam);
}
-void CHodjPodjWindow::loadNewDLL(LPARAM lParam) {
+void CHodjPodjDemoWindow::loadNewDLL(LPARAM lParam) {
uint nWhichDLL;
CWinApp *pMyApp;
diff --git a/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.h b/engines/bagel/hodjnpodj/metagame/demo/hodjpodj_demo.h
similarity index 96%
rename from engines/bagel/hodjnpodj/metagame/demo/hodjpodj.h
rename to engines/bagel/hodjnpodj/metagame/demo/hodjpodj_demo.h
index 41bbeff4e94..ad688e31559 100644
--- a/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.h
+++ b/engines/bagel/hodjnpodj/metagame/demo/hodjpodj_demo.h
@@ -31,7 +31,7 @@ namespace HodjNPodj {
namespace Metagame {
namespace Demo {
-class CHodjPodjWindow : public CFrameWnd {
+class CHodjPodjDemoWindow : public CFrameWnd {
private:
Frame::CMovieWindow pMovie;
CPalette *pGamePalette = nullptr;
@@ -44,7 +44,7 @@ private:
void stopBackgroundMidi();
public:
- CHodjPodjWindow();
+ CHodjPodjDemoWindow();
void blackScreen();
diff --git a/engines/bagel/hodjnpodj/metagame/frame/app.cpp b/engines/bagel/hodjnpodj/metagame/frame/app.cpp
index 4bde1b34624..f653c4b6f4c 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/app.cpp
+++ b/engines/bagel/hodjnpodj/metagame/frame/app.cpp
@@ -61,7 +61,7 @@ bool CTheApp::InitApplication() {
bool CTheApp::InitInstance() {
if (_startupMinigame.empty()) {
// Main game
- m_pMainWnd = new CHodjPodjWindow();
+ m_pMainWnd = new Frame::CHodjPodjWindow();
m_pMainWnd->ShowWindow(SW_SHOWNORMAL);
m_pMainWnd->UpdateWindow();
diff --git a/engines/bagel/module.mk b/engines/bagel/module.mk
index ec2a3d19450..9b15b2222fc 100644
--- a/engines/bagel/module.mk
+++ b/engines/bagel/module.mk
@@ -184,7 +184,7 @@ MODULE_OBJS = \
hodjnpodj/metagame/bgen/note.o \
hodjnpodj/metagame/bgen/notebook.o \
hodjnpodj/metagame/demo/app.o \
- hodjnpodj/metagame/demo/hodjpodj.o \
+ hodjnpodj/metagame/demo/hodjpodj_demo.o \
hodjnpodj/metagame/frame/app.o \
hodjnpodj/metagame/frame/hodjpodj.o \
hodjnpodj/metagame/frame/maindlg.o \
More information about the Scummvm-git-logs
mailing list