[Scummvm-git-logs] scummvm master -> 83dbdf0c1f367467744494b812c374ce85d8b737
dreammaster
paulfgilbert at gmail.com
Mon Jul 27 02:29:56 UTC 2020
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
315af395f1 GLK: Fix local unicode variables to be bool
c414c43c20 ULTIMA: Mark engine as build by default
83dbdf0c1f GLK: Mark engine as build by default
Commit: 315af395f12718d165ffa36e39ebfada516cd164
https://github.com/scummvm/scummvm/commit/315af395f12718d165ffa36e39ebfada516cd164
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-07-26T19:29:41-07:00
Commit Message:
GLK: Fix local unicode variables to be bool
Changed paths:
engines/glk/window_text_buffer.cpp
engines/glk/window_text_grid.cpp
diff --git a/engines/glk/window_text_buffer.cpp b/engines/glk/window_text_buffer.cpp
index d341c4e4b2..5ceeadda5c 100644
--- a/engines/glk/window_text_buffer.cpp
+++ b/engines/glk/window_text_buffer.cpp
@@ -741,7 +741,7 @@ void TextBufferWindow::cancelLineEvent(Event *ev) {
int len;
void *inbuf;
int inmax;
- int unicode = _lineRequestUni;
+ bool unicode = _lineRequestUni;
Event dummyEv;
if (!ev)
@@ -1399,7 +1399,7 @@ void TextBufferWindow::acceptLine(uint32 keycode) {
Common::U32String s, o;
int inmax;
gidispatch_rock_t inarrayrock;
- int unicode = _lineRequestUni;
+ bool unicode = _lineRequestUni;
if (!_inBuf)
return;
diff --git a/engines/glk/window_text_grid.cpp b/engines/glk/window_text_grid.cpp
index d4839a1d6b..591886a8cb 100644
--- a/engines/glk/window_text_grid.cpp
+++ b/engines/glk/window_text_grid.cpp
@@ -362,7 +362,7 @@ void TextGridWindow::cancelLineEvent(Event *ev) {
int ix;
void *inbuf;
int inmax;
- int unicode = _lineRequestUni;
+ bool unicode = _lineRequestUni;
gidispatch_rock_t inarrayrock;
TextGridRow *ln = &_lines[_inOrgY];
Event dummyEv;
@@ -454,7 +454,7 @@ void TextGridWindow::acceptLine(uint32 keycode) {
int inmax;
gidispatch_rock_t inarrayrock;
TextGridRow *ln = &(_lines[_inOrgY]);
- int unicode = _lineRequestUni;
+ bool unicode = _lineRequestUni;
if (!_inBuf)
return;
Commit: c414c43c209a39d088481d38a1eb77c4189f5824
https://github.com/scummvm/scummvm/commit/c414c43c209a39d088481d38a1eb77c4189f5824
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-07-26T19:29:41-07:00
Commit Message:
ULTIMA: Mark engine as build by default
Changed paths:
engines/ultima/configure.engine
engines/ultima/detection_tables.h
diff --git a/engines/ultima/configure.engine b/engines/ultima/configure.engine
index 9bc793e814..6447e3eb7f 100644
--- a/engines/ultima/configure.engine
+++ b/engines/ultima/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine ultima "Ultima" no "" "" "highres 16bit freetype2"
+add_engine ultima "Ultima" yes "" "" "highres 16bit freetype2"
diff --git a/engines/ultima/detection_tables.h b/engines/ultima/detection_tables.h
index 7f452bfa71..6f7f5c590f 100644
--- a/engines/ultima/detection_tables.h
+++ b/engines/ultima/detection_tables.h
@@ -85,7 +85,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
AD_ENTRY1s("britain.ult", "304fe52ce5f34b9181052363d74d7505", 1280),
Common::EN_ANY,
Common::kPlatformDOS,
- ADGF_TESTING,
+ ADGF_NO_FLAGS,
GUIO1(GUIO_NOSPEECH)
},
GAME_ULTIMA4,
@@ -100,7 +100,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
AD_ENTRY1s("britain.ult", "304fe52ce5f34b9181052363d74d7505", 1280),
Common::EN_ANY,
Common::kPlatformDOS,
- ADGF_TESTING,
+ ADGF_NO_FLAGS,
GUIO1(GUIO_NOSPEECH)
},
GAME_ULTIMA4,
@@ -115,7 +115,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
AD_ENTRY1s("converse.a", "5065716423ef1389e3f7b4946d815c26", 162615),
Common::EN_ANY,
Common::kPlatformDOS,
- ADGF_TESTING,
+ ADGF_NO_FLAGS,
GUIO0()
},
GAME_ULTIMA6,
@@ -130,7 +130,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
AD_ENTRY1s("converse.a", "5065716423ef1389e3f7b4946d815c26", 162615),
Common::EN_ANY,
Common::kPlatformDOS,
- ADGF_TESTING,
+ ADGF_NO_FLAGS,
GUIO0()
},
GAME_ULTIMA6,
@@ -146,7 +146,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
AD_ENTRY1s("converse.a", "ae979230b97f8813bdf8f82698847435", 198627),
Common::DE_DEU,
Common::kPlatformDOS,
- ADGF_TESTING,
+ ADGF_NO_FLAGS,
GUIO0()
},
GAME_ULTIMA6,
@@ -162,7 +162,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
AD_ENTRY1s("converse.a", "ae979230b97f8813bdf8f82698847435", 198627),
Common::DE_DEU,
Common::kPlatformDOS,
- ADGF_TESTING,
+ ADGF_NO_FLAGS,
GUIO0()
},
GAME_ULTIMA6,
@@ -192,7 +192,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
AD_ENTRY1s("eusecode.flx", "87c8b584e2947e5e4d99bd8bff6cea2e", 1251108),
Common::EN_ANY,
Common::kPlatformDOS,
- ADGF_TESTING,
+ ADGF_NO_FLAGS,
GUIO1(GUIO_NOMIDI)
},
GAME_ULTIMA8,
@@ -207,7 +207,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
AD_ENTRY1s("eusecode.flx", "c61f1dacde591cb39d452264e281f234", 1251108),
Common::EN_ANY,
Common::kPlatformDOS,
- ADGF_TESTING,
+ ADGF_NO_FLAGS,
GUIO1(GUIO_NOMIDI)
},
GAME_ULTIMA8,
@@ -221,7 +221,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
AD_ENTRY1s("fusecode.flx", "4017eb8678ee24af0ce8c7647a05509b", 1300957),
Common::FR_FRA,
Common::kPlatformDOS,
- ADGF_TESTING,
+ ADGF_NO_FLAGS,
GUIO1(GUIO_NOMIDI)
},
GAME_ULTIMA8,
@@ -235,7 +235,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
AD_ENTRY1s("gusecode.flx", "d69599a46870b66c1b7c02710ed185bd", 1378604),
Common::DE_DEU,
Common::kPlatformDOS,
- ADGF_TESTING,
+ ADGF_NO_FLAGS,
GUIO1(GUIO_NOMIDI)
},
GAME_ULTIMA8,
@@ -250,7 +250,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
AD_ENTRY1s("gusecode.flx", "dc981f82c6303548ad1c967cdef1a0ea", 1335445),
Common::DE_DEU,
Common::kPlatformDOS,
- ADGF_TESTING,
+ ADGF_NO_FLAGS,
GUIO1(GUIO_NOMIDI)
},
GAME_ULTIMA8,
@@ -264,7 +264,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
AD_ENTRY1s("eusecode.flx", "1abad7a58e052ff3d9664df1ab2ddb86", 1136206),
Common::ES_ESP,
Common::kPlatformDOS,
- ADGF_TESTING,
+ ADGF_NO_FLAGS,
GUIO1(GUIO_NOMIDI)
},
GAME_ULTIMA8,
Commit: 83dbdf0c1f367467744494b812c374ce85d8b737
https://github.com/scummvm/scummvm/commit/83dbdf0c1f367467744494b812c374ce85d8b737
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-07-26T19:29:41-07:00
Commit Message:
GLK: Mark engine as build by default
Changed paths:
engines/glk/configure.engine
engines/glk/detection.h
diff --git a/engines/glk/configure.engine b/engines/glk/configure.engine
index 4824419071..bca92e8608 100644
--- a/engines/glk/configure.engine
+++ b/engines/glk/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine glk "Glk Interactive Fiction games" no "" "" "16bit freetype2 jpeg png"
+add_engine glk "Glk Interactive Fiction games" yes "" "" "16bit freetype2 jpeg png"
diff --git a/engines/glk/detection.h b/engines/glk/detection.h
index d7db11dae0..7ce50bc5b4 100644
--- a/engines/glk/detection.h
+++ b/engines/glk/detection.h
@@ -97,9 +97,9 @@ struct GameDescriptor {
GameDescriptor(const char *gameId, const char *description, uint options) :
_gameId(gameId), _description(description), _options(options),
- _supportLevel(kTestingGame) {}
+ _supportLevel(kStableGame) {}
GameDescriptor(const PlainGameDescriptor &gd) : _gameId(gd.gameId),
- _description(gd.description), _options(0), _supportLevel(kTestingGame) {}
+ _description(gd.description), _options(0), _supportLevel(kStableGame) {}
static PlainGameDescriptor empty() {
return GameDescriptor(nullptr, nullptr, 0);
@@ -119,14 +119,14 @@ struct GameDescriptor {
class GlkDetectedGame : public DetectedGame {
public:
GlkDetectedGame(const char *id, const char *desc, const Common::String &filename,
- GameSupportLevel supportLevel = kTestingGame);
+ GameSupportLevel supportLevel = kStableGame);
GlkDetectedGame(const char *id, const char *desc, const Common::String &filename,
- Common::Language lang, GameSupportLevel supportLevel = kTestingGame);
+ Common::Language lang, GameSupportLevel supportLevel = kStableGame);
GlkDetectedGame(const char *id, const char *desc, const Common::String &filename,
- const Common::String &md5, size_t filesize, GameSupportLevel supportLevel = kTestingGame);
+ const Common::String &md5, size_t filesize, GameSupportLevel supportLevel = kStableGame);
GlkDetectedGame(const char *id, const char *desc, const char *extra,
const Common::String &filename, Common::Language lang,
- GameSupportLevel supportLevel = kTestingGame);
+ GameSupportLevel supportLevel = kStableGame);
static Common::String getGlkGUIOptions();
};
More information about the Scummvm-git-logs
mailing list