[Scummvm-git-logs] scummvm master -> b7b4653371d1bf96f4508ae3e1caec194b1bd512
dreammaster
noreply at scummvm.org
Tue Sep 9 10:43:33 UTC 2025
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
8e9cd59ed4 BAGEL: DEMO: Added demo minigame Ids
f61f4c7210 BAGEL: DEMO: Hype dialogs display
b7b4653371 BAGEL: DEMO: All keypresses to skip splash screens
Commit: 8e9cd59ed454f93102124e0977af8b666464cf85
https://github.com/scummvm/scummvm/commit/8e9cd59ed454f93102124e0977af8b666464cf85
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-09-09T03:39:46-07:00
Commit Message:
BAGEL: DEMO: Added demo minigame Ids
Changed paths:
engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
diff --git a/engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp b/engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
index 07bc5f6bbc8..7b16ba80840 100644
--- a/engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
+++ b/engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
@@ -62,7 +62,7 @@ static const RECT MINIGAME_RECTS[21] = {
{ 402, 203, 433, 250 }
};
-static const int16 GAME_VALUES[21] = {
+static const int16 MINIGAME_VALUES[21] = {
// set the game values to return
MG_GAME_ARCHEROIDS,
MG_GAME_ARTPARTS,
@@ -86,6 +86,12 @@ static const int16 GAME_VALUES[21] = {
-1
};
+static const int16 DEMO_VALUES[30] = {
+ -1, 110, -1, -1, -1, MG_GAME_ARCHEROIDS, -1, -1, -1, -1, -1,
+ MG_GAME_ARTPARTS, MG_GAME_BARBERSHOP,
+ -1, -1, -1, -3, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2
+};
+
static const char *MINIGAME_DESC[21] = { // set the display names for when the cursor passes over a game rect
"Click Here To Play Archeroids",
"Click Here To Play Art Parts",
@@ -424,11 +430,13 @@ void CMainZoomWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
if (x != -1) {
// Check to see if player clicked on a game
- if (_isDemo || ((GAME_VALUES[x] == -1) && (m_bShowExit == false))) {
+ int game = (_isDemo ? DEMO_VALUES : MINIGAME_VALUES)[x];
+ if (game == -1 && m_bShowExit == false) {
CWnd::OnLButtonDown(nFlags, point);
return;
}
- nReturnValue = GAME_VALUES[x]; // if so then dispatch to game
+
+ nReturnValue = game; // if so then dispatch to game
PostMessage(WM_CLOSE);
return;
}
@@ -441,7 +449,8 @@ void CMainZoomWindow::OnMouseMove(unsigned int nFlags, CPoint point) {
// If cursor passes over a game rect
if (x != -1) {
- if (!_isDemo && (GAME_VALUES[x] == -1) && (m_bShowExit == false)) {
+ int game = (_isDemo ? DEMO_VALUES : MINIGAME_VALUES)[x];
+ if (game == -1 && m_bShowExit == false) {
CWnd::OnMouseMove(nFlags, point);
return;
}
Commit: f61f4c7210312a9a38a4ccb4d84139f36c0152a2
https://github.com/scummvm/scummvm/commit/f61f4c7210312a9a38a4ccb4d84139f36c0152a2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-09-09T03:39:47-07:00
Commit Message:
BAGEL: DEMO: Hype dialogs display
Changed paths:
engines/bagel/hodjnpodj/hnplibs/rules.cpp
engines/bagel/hodjnpodj/metagame/demo/app.cpp
engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
diff --git a/engines/bagel/hodjnpodj/hnplibs/rules.cpp b/engines/bagel/hodjnpodj/hnplibs/rules.cpp
index 8952b9a257a..e2f1a7e4c5b 100644
--- a/engines/bagel/hodjnpodj/hnplibs/rules.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/rules.cpp
@@ -43,7 +43,7 @@ namespace HodjNPodj {
#define SCROLL_STRIP_WIDTH 10 // width of scroll middle to reveal per interval
#define SCROLL_STRIP_DELAY 1000 // delay to wait after each partial scroll unfurling
-#define TEXT_BUFFER_SIZE 512 // # characters in the text input buffer
+#define TEXT_BUFFER_SIZE 1024 // # characters in the text input buffer
#define TEXT_LEFT_MARGIN 55 // left margin offset for display of text
#define TEXT_TOP_MARGIN 5 // top margin offset for display of text
#define TEXT_BOTTOM_MARGIN 20 // bottom margin offset for display of text
@@ -939,8 +939,7 @@ try_again:
if (chInBuf[i + n - 1] == '\r') {
crop_byte:
- Common::strcpy_s(&chInBuf[i + n - 1], 512 - (i + n - 1),
- &chInBuf[i + n]);
+ Common::copy(&chInBuf[i + n], chInBuf + nCount, &chInBuf[i + n - 1]);
nCount -= 1;
nCropped += 1;
continue;
diff --git a/engines/bagel/hodjnpodj/metagame/demo/app.cpp b/engines/bagel/hodjnpodj/metagame/demo/app.cpp
index 746aed82322..24bfd229e95 100644
--- a/engines/bagel/hodjnpodj/metagame/demo/app.cpp
+++ b/engines/bagel/hodjnpodj/metagame/demo/app.cpp
@@ -34,6 +34,7 @@ CTheApp::CTheApp() {
bool CTheApp::InitApplication() {
addResources("hnpdemo.exe");
+ addResources("hnpzm.dll");
addFontResource("msserif.fon");
return CWinApp::InitApplication();
diff --git a/engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp b/engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
index 7b16ba80840..7a6c6f7d9cd 100644
--- a/engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
+++ b/engines/bagel/hodjnpodj/metagame/zoom/zoommap.cpp
@@ -433,15 +433,20 @@ void CMainZoomWindow::OnLButtonDown(unsigned int nFlags, CPoint point) {
int game = (_isDemo ? DEMO_VALUES : MINIGAME_VALUES)[x];
if (game == -1 && m_bShowExit == false) {
CWnd::OnLButtonDown(nFlags, point);
- return;
+ } else if (game == -2) {
+ // Demo Hype dialog
+ Common::String txtName = Common::String::format("hype%02d.txt", x - 19);
+ Common::String wavName = Common::String::format("sound/q%02d.wav", x - 19);
+ CRules textDialog(this, txtName.c_str(), pGamePalette, wavName.c_str());
+ textDialog.DoModal();
+
+ } else {
+ nReturnValue = game; // if so then dispatch to game
+ PostMessage(WM_CLOSE);
}
-
- nReturnValue = game; // if so then dispatch to game
- PostMessage(WM_CLOSE);
- return;
+ } else {
+ CWnd::OnLButtonDown(nFlags, point);
}
-
- CWnd::OnLButtonDown(nFlags, point);
}
void CMainZoomWindow::OnMouseMove(unsigned int nFlags, CPoint point) {
Commit: b7b4653371d1bf96f4508ae3e1caec194b1bd512
https://github.com/scummvm/scummvm/commit/b7b4653371d1bf96f4508ae3e1caec194b1bd512
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-09-09T03:43:25-07:00
Commit Message:
BAGEL: DEMO: All keypresses to skip splash screens
Changed paths:
engines/bagel/hodjnpodj/metagame/demo/hodjpodj.cpp
engines/bagel/hodjnpodj/metagame/demo/hodjpodj.h
diff --git a/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.cpp b/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.cpp
index d60805f2262..09c59126d02 100644
--- a/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.cpp
+++ b/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.cpp
@@ -50,6 +50,8 @@ BEGIN_MESSAGE_MAP(CHodjPodjWindow, CFrameWnd)
ON_WM_TIMER()
ON_WM_LBUTTONDOWN()
ON_WM_CLOSE()
+ON_WM_KEYDOWN()
+ON_WM_SYSCHAR()
END_MESSAGE_MAP()
CHodjPodjWindow::CHodjPodjWindow() {
@@ -205,6 +207,19 @@ void CHodjPodjWindow::OnTimer(uintptr nEventID) {
}
void CHodjPodjWindow::OnLButtonDown(uint nFlags, CPoint point) {
+ skipSplash();
+}
+
+
+void CHodjPodjWindow::OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
+ skipSplash();
+}
+
+void CHodjPodjWindow::OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags) {
+ skipSplash();
+}
+
+void CHodjPodjWindow::skipSplash() {
switch (_currentCommand) {
case IDC_SPLASH1:
OnTimer(TIMER_SPLASH1);
diff --git a/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.h b/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.h
index e7f2ab73963..439b5debaee 100644
--- a/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.h
+++ b/engines/bagel/hodjnpodj/metagame/demo/hodjpodj.h
@@ -48,11 +48,14 @@ public:
void blackScreen();
void playMovie(const int, const char *, bool);
+ void skipSplash();
protected:
bool OnCommand(WPARAM wParam, LPARAM lParam) override;
void OnTimer(uintptr nEventID);
void OnLButtonDown(uint nFlags, CPoint point);
+ void OnKeyDown(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
+ void OnSysChar(unsigned int nChar, unsigned int nRepCnt, unsigned int nFlags);
void OnClose();
DECLARE_MESSAGE_MAP()
More information about the Scummvm-git-logs
mailing list