[Scummvm-git-logs] scummvm master -> 78b7c5fccbee2b0a5471c61fa2a5935f211bc564
dreammaster
noreply at scummvm.org
Thu May 25 02:31:41 UTC 2023
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:
77b871ea7f MM: MM1: Removed prior enhanced title screen
78b7c5fccb MM: MM1: Fix positioning of encounter monster list
Commit: 77b871ea7f6357a6e22d496ff2e8ed7f46ef10b2
https://github.com/scummvm/scummvm/commit/77b871ea7f6357a6e22d496ff2e8ed7f46ef10b2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-05-24T19:15:19-07:00
Commit Message:
MM: MM1: Removed prior enhanced title screen
Changed paths:
R engines/mm/mm1/views_enh/title.cpp
R engines/mm/mm1/views_enh/title.h
engines/mm/mm1/views_enh/dialogs.h
engines/mm/module.mk
diff --git a/engines/mm/mm1/views_enh/dialogs.h b/engines/mm/mm1/views_enh/dialogs.h
index 6aac7208446..8cee1368407 100644
--- a/engines/mm/mm1/views_enh/dialogs.h
+++ b/engines/mm/mm1/views_enh/dialogs.h
@@ -44,7 +44,6 @@
#include "mm/mm1/views_enh/quick_ref.h"
#include "mm/mm1/views_enh/rest.h"
#include "mm/mm1/views_enh/search.h"
-#include "mm/mm1/views_enh/title.h"
#include "mm/mm1/views_enh/trade.h"
#include "mm/mm1/views_enh/trap.h"
#include "mm/mm1/views_enh/unlock.h"
@@ -156,7 +155,6 @@ private:
ViewsEnh::QuickRef _quickRef;
ViewsEnh::Rest _rest;
ViewsEnh::Search _search;
- ViewsEnh::Title _title;
ViewsEnh::Trade _trade;
ViewsEnh::Trap _trap;
ViewsEnh::Unlock _unlock;
@@ -166,6 +164,7 @@ private:
ViewsEnh::WhoWillTry _whoWillTry;
ViewsEnh::WonGame _wonGame;
Views::Bash _bash;
+ Views::Title _title;
public:
Dialogs() {}
};
diff --git a/engines/mm/mm1/views_enh/title.cpp b/engines/mm/mm1/views_enh/title.cpp
deleted file mode 100644
index 70105c0ecb0..00000000000
--- a/engines/mm/mm1/views_enh/title.cpp
+++ /dev/null
@@ -1,54 +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 "mm/mm1/views_enh/title.h"
-#include "mm/mm1/globals.h"
-#include "mm/shared/utils/xeen_font.h"
-
-namespace MM {
-namespace MM1 {
-namespace ViewsEnh {
-
-#define ENHANCED_Y 150
-static const char *ENHANCED = "Enhanced";
-
-bool Title::msgFocus(const FocusMessage &msg) {
- Views::Title::msgFocus(msg);
-
- // Draw the Enhanced word on the title screen
- XeenFont &font = g_globals->_fontNormal;
- size_t strWidth = font.getStringWidth(ENHANCED);
- Graphics::ManagedSurface s(strWidth, 9);
- s.clear(255);
- s.setTransparentColor(255);
- font.drawString(&s, ENHANCED, 0, 0, strWidth, 0);
-
- Graphics::ManagedSurface &dest = _screens[1];
- dest.blitFrom(s, Common::Rect(0, 0, s.w, s.h),
- Common::Rect(320 - strWidth * 2 - 10, ENHANCED_Y,
- 320 - 10, ENHANCED_Y + 9 * 2));
-
- return true;
-}
-
-} // namespace ViewsEnh
-} // namespace MM1
-} // namespace MM
diff --git a/engines/mm/mm1/views_enh/title.h b/engines/mm/mm1/views_enh/title.h
deleted file mode 100644
index a100698da18..00000000000
--- a/engines/mm/mm1/views_enh/title.h
+++ /dev/null
@@ -1,43 +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 MM1_VIEWS_ENH_TITLE_H
-#define MM1_VIEWS_ENH_TITLE_H
-
-#include "mm/mm1/views/title.h"
-
-namespace MM {
-namespace MM1 {
-namespace ViewsEnh {
-
-class Title : public Views::Title {
-public:
- Title() : Views::Title() {}
- virtual ~Title() {}
-
- bool msgFocus(const FocusMessage &msg) override;
-};
-
-} // namespace ViewsEnh
-} // namespace MM1
-} // namespace MM
-
-#endif
diff --git a/engines/mm/module.mk b/engines/mm/module.mk
index 798c1978c90..59fd7724613 100644
--- a/engines/mm/module.mk
+++ b/engines/mm/module.mk
@@ -170,7 +170,6 @@ MODULE_OBJS += \
mm1/views_enh/select_number.o \
mm1/views_enh/text_entry.o \
mm1/views_enh/text_view.o \
- mm1/views_enh/title.o \
mm1/views_enh/trade.o \
mm1/views_enh/trap.o \
mm1/views_enh/unlock.o \
Commit: 78b7c5fccbee2b0a5471c61fa2a5935f211bc564
https://github.com/scummvm/scummvm/commit/78b7c5fccbee2b0a5471c61fa2a5935f211bc564
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-05-24T19:31:30-07:00
Commit Message:
MM: MM1: Fix positioning of encounter monster list
Changed paths:
engines/mm/mm1/views_enh/encounter.cpp
diff --git a/engines/mm/mm1/views_enh/encounter.cpp b/engines/mm/mm1/views_enh/encounter.cpp
index 3f364fe02b2..017b043883c 100644
--- a/engines/mm/mm1/views_enh/encounter.cpp
+++ b/engines/mm/mm1/views_enh/encounter.cpp
@@ -140,7 +140,7 @@ void Encounter::draw() {
setDisplayArea(true);
drawGraphic(enc._monsterImgNum);
- setBounds(Common::Rect(160, 10, 310, 140));
+ setBounds(Common::Rect(168, 10, 310, 140));
Graphics::ManagedSurface monArea = getSurface();
monArea.clear();
@@ -148,9 +148,9 @@ void Encounter::draw() {
setReduced(true);
setTextColor(4);
for (uint i = 0; i < enc._monsterList.size(); ++i) {
- writeString(12, 4 + i * 8,
+ writeString(12, i * 8,
Common::String::format("%c)", 'A' + i), ALIGN_RIGHT);
- writeString(18, 4 + i * 8, enc._monsterList[i]._name.c_str());
+ writeString(18, i * 8, enc._monsterList[i]._name.c_str());
}
}
More information about the Scummvm-git-logs
mailing list