[Scummvm-git-logs] scummvm master -> d922ff7557faf629a66d12c1c267857d29ddb73e
mgerhardy
martin.gerhardy at gmail.com
Sun Jan 3 12:07:44 UTC 2021
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:
d69e6f2e1e COMMON: removed wild living semicolons
1d184f845c COMMON: removed trailing whitespaces
393b8e9211 TWINE: todo comment
0cdc57d070 TWINE: don't override the gameflags while initializing the config values
fb85ee2cd6 TWINE: lowercase for config variables
d922ff7557 TWINE: converted pcx code to gif (wip)
Commit: d69e6f2e1e1eaf8f8cbc1f3ffe5d229241cad6ac
https://github.com/scummvm/scummvm/commit/d69e6f2e1e1eaf8f8cbc1f3ffe5d229241cad6ac
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-01-03T13:06:23+01:00
Commit Message:
COMMON: removed wild living semicolons
Changed paths:
backends/graphics/graphics.h
common/system.h
diff --git a/backends/graphics/graphics.h b/backends/graphics/graphics.h
index 2473ba4a65..3576ac8cb4 100644
--- a/backends/graphics/graphics.h
+++ b/backends/graphics/graphics.h
@@ -45,14 +45,14 @@ public:
virtual const OSystem::GraphicsMode *getSupportedGraphicsModes() const {
static const OSystem::GraphicsMode noGraphicsModes[] = {{"NONE", "Normal", 0}, {nullptr, nullptr, 0 }};
return noGraphicsModes;
- };
+ }
virtual int getDefaultGraphicsMode() const { return 0; }
virtual bool setGraphicsMode(int mode, uint flags = OSystem::kGfxModeNoFlags) { return (mode == 0); }
virtual int getGraphicsMode() const { return 0; }
virtual const OSystem::GraphicsMode *getSupportedShaders() const {
static const OSystem::GraphicsMode no_shader[2] = {{"NONE", "Normal (no shader)", 0}, {0, 0, 0}};
return no_shader;
- };
+ }
virtual int getDefaultShader() const { return 0; }
virtual bool setShader(int id) { return false; }
virtual int getShader() const { return 0; }
diff --git a/common/system.h b/common/system.h
index 03db8394f9..1e365d2627 100644
--- a/common/system.h
+++ b/common/system.h
@@ -721,13 +721,13 @@ public:
#else
inline Graphics::PixelFormat getScreenFormat() const {
return Graphics::PixelFormat::createFormatCLUT8();
- };
+ }
inline Common::List<Graphics::PixelFormat> getSupportedFormats() const {
Common::List<Graphics::PixelFormat> list;
list.push_back(Graphics::PixelFormat::createFormatCLUT8());
return list;
- };
+ }
#endif
/**
Commit: 1d184f845c14a4c441fc22ef5473e47574d941aa
https://github.com/scummvm/scummvm/commit/1d184f845c14a4c441fc22ef5473e47574d941aa
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-01-03T13:06:23+01:00
Commit Message:
COMMON: removed trailing whitespaces
Changed paths:
common/system.h
diff --git a/common/system.h b/common/system.h
index 1e365d2627..1bbf7ef789 100644
--- a/common/system.h
+++ b/common/system.h
@@ -112,7 +112,7 @@ namespace LogMessageType {
/**
* Enumeration for log message types.
* @ingroup common_system
- *
+ *
*/
enum Type {
kInfo, /**< Info logs. */
@@ -254,7 +254,7 @@ protected:
/** Workaround for a bug in the osx_intel toolchain introduced by
* 014bef9eab9fb409cfb3ec66830e033e4aaa29a9. Adding this variable fixes it.
- */
+ */
bool _dummyUnused;
/** @} */
private:
@@ -309,10 +309,10 @@ public:
*/
virtual void engineDone() { }
- /**
+ /**
* @defgroup common_system_flags Feature flags
- * @ingroup common_system
- * @{
+ * @ingroup common_system
+ * @{
*/
/**
@@ -651,7 +651,7 @@ public:
* Switch to the specified graphics mode.
*
* If switching to the new mode fails, this method returns false.
- *
+ *
* The flag 'kGfxModeRender3d' is optional. It allows to switch to 3D-only rendering mode.
* In this mode, the game engine is allowed to use OpenGL(ES) directly.
*
@@ -666,7 +666,7 @@ public:
* Switch to the graphics mode with the given name.
*
* If @p name is unknown, or if switching to the new mode fails, this method returns false.
- *
+ *
* @param name Name of the new graphics mode.
*
* @return True if the switch was successful, false otherwise.
@@ -782,7 +782,7 @@ public:
* Switch to the shader mode with the given name.
*
* If @p name is unknown, or if switching to the new mode fails,
- * this method returns false.
+ * this method returns false.
*
* @param name Name of the new shader mode.
*
@@ -1000,7 +1000,7 @@ public:
* The real screen will not immediately be updated to reflect the changes.
* Client code must call updateScreen to ensure any changes are visible
* to the user. This can be used to optimize drawing and reduce flicker.
- *
+ *
* If the current pixel format has one byte per pixel, the graphics data
* uses 8 bits per pixel, using the palette specified via setPalette.
* If more than one byte per pixel is in use, the graphics data uses the
@@ -1090,7 +1090,7 @@ public:
* For example, when a character is speaking, they will have the focus.
* This allows for pan-and-scan style views where the backend
* can follow the speaking character or area of interest on the screen.
- *
+ *
* The backend is responsible for clipping the rectangle and deciding how best to
* zoom the screen to show any shape and size rectangle the engine provides.
*
@@ -1479,10 +1479,10 @@ public:
/**
* Display a message in an 'on-screen display'.
*
- * Displays a message in such a way that it is visible on or near the screen,
+ * Displays a message in such a way that it is visible on or near the screen,
* for example in a transparent rectangle over the regular screen content,
* or in a message box beneath it.
- *
+ *
* The message is expected to be provided in the current TranslationManager
* charset.
*
@@ -1513,12 +1513,12 @@ public:
*/
virtual void displayActivityIconOnOSD(const Graphics::Surface *icon) = 0;
/** @} */
-
+
/**
* @addtogroup common_system_module
- * @{
+ * @{
*/
-
+
/**
* Return the SaveFileManager, which is used to store and load savestates
* and other modifiable persistent game data.
@@ -1538,7 +1538,7 @@ public:
return _taskbarManager;
}
#endif
-
+
#if defined(USE_UPDATES)
/**
* Return the UpdateManager, which is used to handle auto-updating
@@ -1580,12 +1580,12 @@ public:
*/
virtual FilesystemFactory *getFilesystemFactory();
/** @} */
-
+
/**
* @addtogroup common_system_misc
* @{
*/
-
+
/** Add system-specific Common::Archive objects to the given SearchSet.
* For example, on Unix, the directory corresponding to DATA_PATH (if set), or, on
* Mac OS X, the 'Resource' dir in the app bundle.
Commit: 393b8e92112addaab027f0f424c12a690318dd17
https://github.com/scummvm/scummvm/commit/393b8e92112addaab027f0f424c12a690318dd17
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-01-03T13:06:23+01:00
Commit Message:
TWINE: todo comment
Changed paths:
engines/twine/flamovies.cpp
diff --git a/engines/twine/flamovies.cpp b/engines/twine/flamovies.cpp
index d71a977d74..f13c88604b 100644
--- a/engines/twine/flamovies.cpp
+++ b/engines/twine/flamovies.cpp
@@ -293,13 +293,13 @@ void FlaMovies::playPCXMovie(const char *flaName) {
preparePCX(10);
g_system->delayMillis(5000);
} else if (!strcmp(flaName, "capture")) {
- preparePCX(14);
+ preparePCX(14); // TODO: same as sendel?
g_system->delayMillis(5000);
} else if (!strcmp(flaName, "neige2")) {
preparePCX(11);
g_system->delayMillis(5000);
} else if (!strcmp(flaName, "sendel")) {
- preparePCX(14);
+ preparePCX(14); // TODO: same as capture?
g_system->delayMillis(5000);
} else if (!strcmp(flaName, "sendel2")) {
preparePCX(17);
Commit: 0cdc57d070941e3b2ddc2cf34b74c741b1e090c7
https://github.com/scummvm/scummvm/commit/0cdc57d070941e3b2ddc2cf34b74c741b1e090c7
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-01-03T13:06:23+01:00
Commit Message:
TWINE: don't override the gameflags while initializing the config values
Changed paths:
engines/twine/detection.h
engines/twine/resources/resources.h
engines/twine/twine.cpp
diff --git a/engines/twine/detection.h b/engines/twine/detection.h
index 8c8a1dbb5f..bb4b29db3b 100644
--- a/engines/twine/detection.h
+++ b/engines/twine/detection.h
@@ -33,7 +33,8 @@ enum TwineGameType {
enum TwineFeatureFlags {
TF_VERSION_EUROPE = (1 << 0),
TF_VERSION_USA = (1 << 1),
- TF_VERSION_CUSTOM = (1 << 2)
+ TF_VERSION_CUSTOM = (1 << 2),
+ TF_USE_PCX = (1 << 3)
};
} // End of namespace TwinE
diff --git a/engines/twine/resources/resources.h b/engines/twine/resources/resources.h
index f0b2fab038..b6766803eb 100644
--- a/engines/twine/resources/resources.h
+++ b/engines/twine/resources/resources.h
@@ -229,8 +229,6 @@ public:
static constexpr const char *HQR_FLASAMP_FILE = "flasamp.hqr";
static constexpr const char *HQR_MIDI_MI_DOS_FILE = "midi_mi.hqr";
static constexpr const char *HQR_MIDI_MI_WIN_FILE = "midi_mi_win.hqr";
- static constexpr const char *HQR_MIDI_MI_WIN_MP3_FILE = "midi_mi_win_mp3.hqr";
- static constexpr const char *HQR_MIDI_MI_WIN_OGG_FILE = "midi_mi_win_ogg.hqr";
};
} // namespace TwinE
diff --git a/engines/twine/twine.cpp b/engines/twine/twine.cpp
index 4944c89f44..56b2f9f3a9 100644
--- a/engines/twine/twine.cpp
+++ b/engines/twine/twine.cpp
@@ -140,14 +140,6 @@ TwinEEngine::TwinEEngine(OSystem *system, Common::Language language, uint32 flag
_input = new Input(this);
_debug = new Debug(this);
_debugScene = new DebugScene(this);
-
- if (_gameFlags & TwineFeatureFlags::TF_VERSION_EUROPE) {
- cfgfile.Version = EUROPE_VERSION;
- } else if (_gameFlags & TwineFeatureFlags::TF_VERSION_USA) {
- cfgfile.Version = USA_VERSION;
- } else if (_gameFlags & TwineFeatureFlags::TF_VERSION_CUSTOM) {
- cfgfile.Version = MODIFICATION_VERSION;
- }
}
TwinEEngine::~TwinEEngine() {
@@ -369,10 +361,21 @@ void TwinEEngine::initConfigurations() {
debug("Could not find midi hqr file");
}
}
- cfgfile.Version = ConfGetIntOrDefault("version", EUROPE_VERSION);
+
+ if (_gameFlags & TwineFeatureFlags::TF_VERSION_EUROPE) {
+ cfgfile.Version = EUROPE_VERSION;
+ } else if (_gameFlags & TwineFeatureFlags::TF_VERSION_USA) {
+ cfgfile.Version = USA_VERSION;
+ } else if (_gameFlags & TwineFeatureFlags::TF_VERSION_CUSTOM) {
+ cfgfile.Version = MODIFICATION_VERSION;
+ }
+
+ if (_gameFlags & TwineFeatureFlags::TF_USE_PCX) {
+ cfgfile.Movie = CONF_MOVIE_FLAPCX;
+ }
+
cfgfile.UseCD = ConfGetBoolOrDefault("usecd", false);
cfgfile.Sound = ConfGetBoolOrDefault("sound", true);
- cfgfile.Movie = ConfGetIntOrDefault("movie", CONF_MOVIE_FLA);
cfgfile.Fps = ConfGetIntOrDefault("fps", DEFAULT_FRAMES_PER_SECOND);
cfgfile.Debug = ConfGetBoolOrDefault("debug", false);
cfgfile.Mouse = ConfGetIntOrDefault("mouse", true);
Commit: fb85ee2cd65817b118ef8223c05f474c8ac2d5c8
https://github.com/scummvm/scummvm/commit/fb85ee2cd65817b118ef8223c05f474c8ac2d5c8
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-01-03T13:06:23+01:00
Commit Message:
TWINE: lowercase for config variables
Changed paths:
engines/twine/twine.cpp
diff --git a/engines/twine/twine.cpp b/engines/twine/twine.cpp
index 56b2f9f3a9..85bf785c83 100644
--- a/engines/twine/twine.cpp
+++ b/engines/twine/twine.cpp
@@ -247,10 +247,10 @@ Common::Error TwinEEngine::run() {
}
}
- ConfMan.setInt("CombatAuto", _actor->autoAgressive ? 1 : 0);
- ConfMan.setInt("Shadow", cfgfile.ShadowMode);
- ConfMan.setInt("SceZoom", cfgfile.SceZoom ? 1 : 0);
- ConfMan.setInt("PolygonDetails", cfgfile.PolygonDetails);
+ ConfMan.setInt("combatauto", _actor->autoAgressive ? 1 : 0);
+ ConfMan.setInt("shadow", cfgfile.ShadowMode);
+ ConfMan.setInt("scezoom", cfgfile.SceZoom ? 1 : 0);
+ ConfMan.setInt("polygondetails", cfgfile.PolygonDetails);
_sound->stopSamples();
_music->stopTrackMusic();
Commit: d922ff7557faf629a66d12c1c267857d29ddb73e
https://github.com/scummvm/scummvm/commit/d922ff7557faf629a66d12c1c267857d29ddb73e
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-01-03T13:06:23+01:00
Commit Message:
TWINE: converted pcx code to gif (wip)
The dos floppy version is the only version without fla movies I could find.
Also http://lbafileinfo.kazekr.net/index.php?title=LBA1:Fla_gif.hqr and no
FLA_PCX was ever mentioned. Not sure where why pcx code was added, maybe a
conversion from gif to pcx
The GIFDecoder is still missing, that's why this code is deactivated
Changed paths:
engines/twine/detection.cpp
engines/twine/detection.h
engines/twine/flamovies.cpp
engines/twine/flamovies.h
engines/twine/twine.cpp
engines/twine/twine.h
diff --git a/engines/twine/detection.cpp b/engines/twine/detection.cpp
index 560c252b9f..d1c5994d48 100644
--- a/engines/twine/detection.cpp
+++ b/engines/twine/detection.cpp
@@ -211,7 +211,7 @@ static const ADGameDescription twineGameDescriptions[] = {
AD_ENTRY1s("FLA_GIF.HQR", "3f7383f65afa212e3eec430627828b64", 1784466),
Common::EN_ANY,
Common::kPlatformDOS,
- ADGF_TESTING,
+ ADGF_TESTING | TwinE::TF_USE_GIF,
GUIO1(GUIO_NONE)
},
diff --git a/engines/twine/detection.h b/engines/twine/detection.h
index bb4b29db3b..9fc439d93e 100644
--- a/engines/twine/detection.h
+++ b/engines/twine/detection.h
@@ -34,7 +34,7 @@ enum TwineFeatureFlags {
TF_VERSION_EUROPE = (1 << 0),
TF_VERSION_USA = (1 << 1),
TF_VERSION_CUSTOM = (1 << 2),
- TF_USE_PCX = (1 << 3)
+ TF_USE_GIF = (1 << 3)
};
} // End of namespace TwinE
diff --git a/engines/twine/flamovies.cpp b/engines/twine/flamovies.cpp
index f13c88604b..93ed6e6222 100644
--- a/engines/twine/flamovies.cpp
+++ b/engines/twine/flamovies.cpp
@@ -23,7 +23,6 @@
#include "twine/flamovies.h"
#include "common/file.h"
#include "common/system.h"
-#include "image/pcx.h"
#include "twine/audio/music.h"
#include "twine/audio/sound.h"
#include "twine/input.h"
@@ -232,87 +231,79 @@ void FlaMovies::processFrame() {
FlaMovies::FlaMovies(TwinEEngine *engine) : _engine(engine) {}
-void FlaMovies::preparePCX(int index) {
- Image::PCXDecoder pcxDecoder;
- Common::SeekableReadStream *stream = HQR::makeReadStream("FLA_PCX.HQR", index);
- if (stream != nullptr) {
- if (!pcxDecoder.loadStream(*stream)) {
- delete stream;
- return;
- }
+void FlaMovies::prepareGIF(int index) {
+#if 0
+ Image::GIFDecoder decoder;
+ Common::SeekableReadStream *stream = HQR::makeReadStream("FLA_GIF.HQR", index);
+ if (stream == nullptr) {
+ warning("Failed to load gif hqr entry with id %i from FLA_GIF.HQR", index);
+ return;
+ }
+ if (!decoder.loadStream(*stream)) {
+ delete stream;
+ warning("Failed to load gif with id %i from FLA_GIF.HQR", index);
+ return;
}
- const Graphics::Surface *surface = pcxDecoder.getSurface();
- if (surface != nullptr) {
- const Common::Rect srect(0, 0, surface->w, surface->h);
- _engine->frontVideoBuffer.transBlitFrom(*surface, srect, _engine->frontVideoBuffer.getBounds());
+ const Graphics::Surface *surface = decoder.getSurface();
+ const bool state = Graphics::crossBlit((uint8*)_engine->imageBuffer.getPixels(), (const uint8*)surface->getPixels(), _engine->imageBuffer.pitch, surface->pitch, surface->w, surface->h, _engine->imageBuffer.format, surface->format);
+ if (!state) {
+ error("Failed to blit");
}
+ _engine->frontVideoBuffer.transBlitFrom(_engine->imageBuffer, _engine->imageBuffer.getBounds(), _engine->frontVideoBuffer.getBounds());
+ debug(2, "Show gif with id %i from FLA_GIF.HQR", index);
+ _engine->flip();
delete stream;
- // TODO FLA_GIF.HQR
+ g_system->delayMillis(5000);
+#endif
}
-void FlaMovies::playPCXMovie(const char *flaName) {
- if (!Common::File::exists("FLA_PCX.HQR") || !Common::File::exists("FLA_GIF.HQR")) {
- warning("FLA_PCX file doesn't exist!");
+void FlaMovies::playGIFMovie(const char *flaName) {
+ if (!Common::File::exists("FLA_GIF.HQR")) {
+ warning("FLA_GIF file doesn't exist!");
return;
}
+ debug("Play gif %s", flaName);
// TODO: use the HQR 23th entry (movies informations)
if (!strcmp(flaName, FLA_INTROD)) {
- preparePCX(1);
- g_system->delayMillis(5000);
- preparePCX(2);
- g_system->delayMillis(5000);
- preparePCX(3);
- g_system->delayMillis(5000);
- preparePCX(4);
- g_system->delayMillis(5000);
- preparePCX(5);
- g_system->delayMillis(5000);
+ prepareGIF(3);
+ prepareGIF(4);
+ prepareGIF(5);
} else if (!strcmp(flaName, "BAFFE") || !strcmp(flaName, "BAFFE2") || !strcmp(flaName, "BAFFE3") || !strcmp(flaName, "BAFFE4")) {
- preparePCX(6);
- g_system->delayMillis(5000);
+ prepareGIF(6);
} else if (!strcmp(flaName, "bateau") || !strcmp(flaName, "bateau2")) {
- preparePCX(7);
- g_system->delayMillis(5000);
- } else if (!strcmp(flaName, "flute2")) {
- preparePCX(8);
- g_system->delayMillis(5000);
+ prepareGIF(7);
} else if (!strcmp(flaName, "navette")) {
- preparePCX(15);
- g_system->delayMillis(5000);
+ prepareGIF(15);
} else if (!strcmp(flaName, "templebu")) {
- preparePCX(12);
- g_system->delayMillis(5000);
+ prepareGIF(12);
+ } else if (!strcmp(flaName, "flute2")) {
+ prepareGIF(8); // TODO: same as glass2?
} else if (!strcmp(flaName, "glass2")) {
- preparePCX(8);
- g_system->delayMillis(5000);
+ prepareGIF(8); // TODO: same as flute2?
} else if (!strcmp(flaName, "surf")) {
- preparePCX(9);
- g_system->delayMillis(5000);
+ prepareGIF(9);
} else if (!strcmp(flaName, "verser") || !strcmp(flaName, "verser2")) {
- preparePCX(10);
- g_system->delayMillis(5000);
- } else if (!strcmp(flaName, "capture")) {
- preparePCX(14); // TODO: same as sendel?
- g_system->delayMillis(5000);
+ prepareGIF(10);
} else if (!strcmp(flaName, "neige2")) {
- preparePCX(11);
- g_system->delayMillis(5000);
+ prepareGIF(11);
+ } else if (!strcmp(flaName, "capture")) {
+ prepareGIF(14); // TODO: same as sendel?
} else if (!strcmp(flaName, "sendel")) {
- preparePCX(14); // TODO: same as capture?
- g_system->delayMillis(5000);
+ prepareGIF(14); // TODO: same as capture?
} else if (!strcmp(flaName, "sendel2")) {
- preparePCX(17);
- g_system->delayMillis(5000);
+ prepareGIF(17);
+ } else if (!strcmp(flaName, FLA_DRAGON3)) {
+ prepareGIF(1);
+ prepareGIF(2);
}
}
void FlaMovies::playFlaMovie(const char *flaName) {
_engine->_sound->stopSamples();
- // Play FLA PCX instead of movies
- if (_engine->cfgfile.Movie == CONF_MOVIE_FLAPCX) {
- playPCXMovie(flaName);
+ if (_engine->cfgfile.Movie == CONF_MOVIE_FLAGIF) {
+ playGIFMovie(flaName);
return;
}
diff --git a/engines/twine/flamovies.h b/engines/twine/flamovies.h
index 9b92477795..c3cdf56e9d 100644
--- a/engines/twine/flamovies.h
+++ b/engines/twine/flamovies.h
@@ -93,8 +93,8 @@ private:
void scaleFla2x();
void processFrame();
- void preparePCX(int index);
- void playPCXMovie(const char *flaName);
+ void prepareGIF(int index);
+ void playGIFMovie(const char *flaName);
public:
FlaMovies(TwinEEngine *engine);
diff --git a/engines/twine/twine.cpp b/engines/twine/twine.cpp
index 85bf785c83..209134ce33 100644
--- a/engines/twine/twine.cpp
+++ b/engines/twine/twine.cpp
@@ -370,8 +370,8 @@ void TwinEEngine::initConfigurations() {
cfgfile.Version = MODIFICATION_VERSION;
}
- if (_gameFlags & TwineFeatureFlags::TF_USE_PCX) {
- cfgfile.Movie = CONF_MOVIE_FLAPCX;
+ if (_gameFlags & TwineFeatureFlags::TF_USE_GIF) {
+ cfgfile.Movie = CONF_MOVIE_FLAGIF;
}
cfgfile.UseCD = ConfGetBoolOrDefault("usecd", false);
diff --git a/engines/twine/twine.h b/engines/twine/twine.h
index c4e86e82a4..cd129ea600 100644
--- a/engines/twine/twine.h
+++ b/engines/twine/twine.h
@@ -77,7 +77,7 @@ enum MovieType {
CONF_MOVIE_NONE = 0,
CONF_MOVIE_FLA = 1,
CONF_MOVIE_FLAWIDE = 2,
- CONF_MOVIE_FLAPCX = 3
+ CONF_MOVIE_FLAGIF = 3
};
/** Configuration file structure
More information about the Scummvm-git-logs
mailing list