[Scummvm-git-logs] scummvm master -> 20a2045afa8b7d3b2a12a77c510015d84f294cdb
sev-
sev at scummvm.org
Sun Aug 9 09:50:15 UTC 2020
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
16d7359498 GRAPHICS: MACGUI: Make cursor height variable in MacText
5b30501f18 GRAPHICS: MACGUI: Make cursor up/down movement more logical in MacText
8432933c04 GRAPHICS: MACGUI: Fixed moving cursor back to previous line in MacText
23953f0b1b DISTS: Added macgui.dat file
b767b04b16 DISTS: Added macgui.dat to distribution
20a2045afa DISTS: Updated README
Commit: 16d73594989a8d810a2399aa6048dffa98ee53f2
https://github.com/scummvm/scummvm/commit/16d73594989a8d810a2399aa6048dffa98ee53f2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-09T00:20:55+02:00
Commit Message:
GRAPHICS: MACGUI: Make cursor height variable in MacText
Changed paths:
graphics/macgui/mactext.cpp
diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 356b36096c..0ef7ac9621 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -37,7 +37,7 @@ namespace Graphics {
enum {
kConScrollStep = 12,
- kCursorHeight = 12
+ kCursorMaxHeight = 100
};
static void cursorTimerHandler(void *refCon);
@@ -236,11 +236,11 @@ void MacText::init() {
_cursorRow = getLineCount() - 1;
_cursorCol = getLineCharWidth(_cursorRow);
- _cursorRect = new Common::Rect(0, 0, 1, kCursorHeight);
+ _cursorRect = new Common::Rect(0, 0, 1, 0);
- _cursorSurface = new ManagedSurface(1, kCursorHeight);
+ _cursorSurface = new ManagedSurface(1, kCursorMaxHeight);
_cursorSurface->clear(_wm->_colorBlack);
- _cursorSurface2 = new ManagedSurface(1, kCursorHeight);
+ _cursorSurface2 = new ManagedSurface(1, kCursorMaxHeight);
_cursorSurface2->clear(_bgcolor);
reallocSurface();
@@ -1703,6 +1703,16 @@ void MacText::updateCursorPos() {
_cursorX = getLineWidth(_cursorRow, false, _cursorCol) + alignOffset + offset.x - 1;
}
+ int cursorHeight = getLineHeight(_cursorRow);
+
+ if (cursorHeight == 0)
+ cursorHeight = 12;
+
+ // Do not exceed max height and widget height
+ cursorHeight = MIN<int>(MIN<int>(cursorHeight, kCursorMaxHeight), _dims.height());
+
+ _cursorRect->setHeight(cursorHeight);
+
_cursorDirty = true;
}
Commit: 5b30501f186277376fe01d5a45014bd743125b80
https://github.com/scummvm/scummvm/commit/5b30501f186277376fe01d5a45014bd743125b80
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-09T00:20:55+02:00
Commit Message:
GRAPHICS: MACGUI: Make cursor up/down movement more logical in MacText
Changed paths:
graphics/macgui/mactext.cpp
diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 0ef7ac9621..097f255166 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -1139,8 +1139,6 @@ bool MacText::processEvent(Common::Event &event) {
return false;
}
- int ncol;
-
switch (event.kbd.keycode) {
case Common::KEYCODE_BACKSPACE:
if (_cursorRow > 0 || _cursorCol > 0) {
@@ -1190,11 +1188,7 @@ bool MacText::processEvent(Common::Event &event) {
_cursorRow--;
- if (_cursorCol > 0) {
- getRowCol(_cursorX, _textLines[_cursorRow].y, nullptr, nullptr, nullptr, &ncol);
- _cursorCol = ncol + 1;
- }
-
+ getRowCol(_cursorX + 1, _textLines[_cursorRow].y, nullptr, nullptr, &_cursorRow, &_cursorCol);
updateCursorPos();
return true;
@@ -1204,11 +1198,8 @@ bool MacText::processEvent(Common::Event &event) {
return true;
_cursorRow++;
- if (_cursorCol > 0) {
- getRowCol(_cursorX, _textLines[_cursorRow].y, nullptr, nullptr, nullptr, &ncol);
- _cursorCol = ncol + 1;
- }
+ getRowCol(_cursorX + 1, _textLines[_cursorRow].y, nullptr, nullptr, &_cursorRow, &_cursorCol);
updateCursorPos();
return true;
Commit: 8432933c04a7c17fcb9e376bd7a0d4aa16cacef3
https://github.com/scummvm/scummvm/commit/8432933c04a7c17fcb9e376bd7a0d4aa16cacef3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-09T00:20:55+02:00
Commit Message:
GRAPHICS: MACGUI: Fixed moving cursor back to previous line in MacText
Changed paths:
graphics/macgui/mactext.cpp
diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 097f255166..105ee9f3f7 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -1160,7 +1160,7 @@ bool MacText::processEvent(Common::Event &event) {
return true;
}
_cursorRow--;
- _cursorCol = getLineCharWidth(_cursorRow) - 1;
+ _cursorCol = getLineCharWidth(_cursorRow);
} else {
_cursorCol--;
}
Commit: 23953f0b1b46115aced838a06968d3f6171cf887
https://github.com/scummvm/scummvm/commit/23953f0b1b46115aced838a06968d3f6171cf887
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-09T10:29:11+02:00
Commit Message:
DISTS: Added macgui.dat file
Changed paths:
A dists/engine-data/macgui.dat
diff --git a/dists/engine-data/macgui.dat b/dists/engine-data/macgui.dat
new file mode 100644
index 0000000000..5988afd319
Binary files /dev/null and b/dists/engine-data/macgui.dat differ
Commit: b767b04b16d24d3bfd7c7951343efb33a4b6ffe8
https://github.com/scummvm/scummvm/commit/b767b04b16d24d3bfd7c7951343efb33a4b6ffe8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-09T10:36:13+02:00
Commit Message:
DISTS: Added macgui.dat to distribution
Changed paths:
dists/irix/scummvm.idb
dists/scummvm.rc
diff --git a/dists/irix/scummvm.idb b/dists/irix/scummvm.idb
index ea54d9f0f6..67aa1a7e49 100644
--- a/dists/irix/scummvm.idb
+++ b/dists/irix/scummvm.idb
@@ -7,6 +7,7 @@ f 0755 root sys usr/ScummVM/scummvm scummvm scummvm.sw.eoe tag('0x5260dbec')
f 0644 root sys usr/ScummVM/share/pixmaps/scummvm.xpm scummvm.xpm scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/drascula.dat drascula.dat scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/fonts.dat fonts.dat scummvm.sw.eoe
+f 0644 root sys usr/ScummVM/share/scummvm/macgui.dat macgui.dat scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/kyra.dat kyra.dat scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/lure.dat lure.dat scummvm.sw.eoe
f 0644 root sys usr/ScummVM/share/scummvm/pred.dic pred.dic scummvm.sw.eoe
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index b34cbd6cbf..daec71bad1 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -30,6 +30,7 @@ wwwroot.zip FILE "dists/networking/wwwroot.zip"
#ifdef USE_FREETYPE2
fonts.dat FILE "dists/engine-data/fonts.dat"
#endif
+macgui.zip FILE "dists/engine-data/macgui.zip"
#if PLUGIN_ENABLED_STATIC(ACCESS)
access.dat FILE "dists/engine-data/access.dat"
Commit: 20a2045afa8b7d3b2a12a77c510015d84f294cdb
https://github.com/scummvm/scummvm/commit/20a2045afa8b7d3b2a12a77c510015d84f294cdb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-09T10:36:31+02:00
Commit Message:
DISTS: Updated README
Changed paths:
dists/engine-data/README
diff --git a/dists/engine-data/README b/dists/engine-data/README
index 080fd6ab56..d6ef45c661 100644
--- a/dists/engine-data/README
+++ b/dists/engine-data/README
@@ -1,18 +1,21 @@
engine-data README
-------------------------------------------------------------------------------
-access.dat
+access.dat:
TODO
-cryo.dat
+cryo.dat:
This file contains a lot of hardcoded tables used by the Cryo engine.
-cryomni3d.dat
+cryomni3d.dat:
This file contains all strings and some file names depending only on platform/localization.
Some filenames depend on the edition, these are handled by game flags in engine code.
Those informations were stored in the original executables.
-drascula.dat
+drascula.dat:
+TODO
+
+fonts.dat:
TODO
hugo.dat:
@@ -24,7 +27,13 @@ The 'kyra.dat' file is created by extracting hardcoded data, like the
roomtable, inventory names, various strings, tables for shapes and sequence
scripts, from.
-lure.dat
+lure.dat:
+TODO
+
+macgui.dat:
+TODO
+
+macventure.dat
TODO
mort.dat:
@@ -35,6 +44,9 @@ English translation.
neverhood.dat:
TODO
+prince_translation.dat:
+TODO
+
queen.tbl:
'queen.tbl' contains a list of filenames, filesizes and offsets for the
individual files saved in QUEEN.1. This data was originally included in the
@@ -45,14 +57,14 @@ mp3/ogg/flac encoded need the datafile.
sky.cpt:
TODO
-supernova.dat
+supernova.dat:
File created partially by extracting the German text from the original source
code. It also contains the custom-made English translation.
-teenagent.dat
+teenagent.dat:
TODO
-titanic.dat
+titanic.dat:
TODO
tony.dat:
@@ -61,5 +73,11 @@ This file contains the font table used by the different versions of the game.
toon.dat:
This file contains all the strings hardcoded in the original executables.
-xeen.ccs
+ultima.dat:
+TODO
+
+wintermute.zip:
+TODO
+
+xeen.ccs:
This file contains all the various strings and figures needed for the games.
More information about the Scummvm-git-logs
mailing list