[Scummvm-git-logs] scummvm branch-2-9 -> df81366902f9c1a9ad4e3af2e2b928095a6ba2d5

bluegr noreply at scummvm.org
Sat Nov 30 10:15:16 UTC 2024


This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e43c845e6c GOB: adjust gob1 german cd-i entry
e18c2bf2c8 GOB: Fix Blount becoming inactive in the Gob3 brain level - bug #5760
3d513ebd25 DGDS: Fix accidental replacement of 320 with SCREEN_WIDTH
df81366902 NEWS: Add more changes for 2.9.0


Commit: e43c845e6cae7fb69c19802ba5e5b67200ccd5f0
    https://github.com/scummvm/scummvm/commit/e43c845e6cae7fb69c19802ba5e5b67200ccd5f0
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-11-30T12:14:31+02:00

Commit Message:
GOB: adjust gob1 german cd-i entry

This version of Gobliins was shipped on various german CD-i Adi versions

Changed paths:
    engines/gob/detection/tables_gob1.h


diff --git a/engines/gob/detection/tables_gob1.h b/engines/gob/detection/tables_gob1.h
index eb52f8fce5b..4c1a16765ca 100644
--- a/engines/gob/detection/tables_gob1.h
+++ b/engines/gob/detection/tables_gob1.h
@@ -687,6 +687,9 @@
 	kFeaturesNone,
 	0, 0, 0
 },
+
+// -- CD-i --
+
 {
 	{
 		"gob1",
@@ -726,10 +729,10 @@
 	kFeaturesAdLib,
 	0, "AVT003.TOT", 0
 },
-{ // Found on ADI Spielerisch lernen Deutsch Klasse 1 & 2 CD-i 
+{ // Found on ADI Spielerisch lernen (German CD-i version) Found on Klasse 1&2 also on 3&4
 	{
 		"gob1",
-		"Deutsch Klasse 1 & 2",
+		"",
 		AD_ENTRY1s("intro.stk", "0acc50f67f9323c3654921915dab2d63", 7098368),
 		DE_DEU,
 		kPlatformCDi,


Commit: e18c2bf2c89afeb349d83993ef03d686e92242b2
    https://github.com/scummvm/scummvm/commit/e18c2bf2c89afeb349d83993ef03d686e92242b2
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-30T12:14:37+02:00

Commit Message:
GOB: Fix Blount becoming inactive in the Gob3 brain level - bug #5760

Changed paths:
    engines/gob/goblin_v2.cpp


diff --git a/engines/gob/goblin_v2.cpp b/engines/gob/goblin_v2.cpp
index aa85a34c422..1e4b2f72250 100644
--- a/engines/gob/goblin_v2.cpp
+++ b/engines/gob/goblin_v2.cpp
@@ -102,6 +102,15 @@ void Goblin_v2::placeObject(Gob_Object *objDesc, char animated,
 			objAnim->isPaused = 0;
 			objAnim->isStatic = 0;
 			objAnim->newCycle = _vm->_scenery->getAnimLayer(animation, layer)->framesCount;
+
+			// WORKAROUND: In the brain level of Gob3, where Blount and Were-blount are
+			// separated, Blount may be declared as inactive and can't move when exiting
+			// and reentering the level - bug #5760.
+			// Change his animation type here to mark him as enabled
+			if (_vm->getGameType() == kGameTypeGob3 && _vm->isCurrentTot("EMAP1018.TOT") && index == 0 &&
+				x == 3 && y == 33 && state == 9 && layer == 27 && animation == 0 && objAnim->animType == 1)
+				objAnim->animType = 100;
+
 			_vm->_scenery->updateAnim(layer, 0, animation, 0, *obj->pPosX, *obj->pPosY, 0);
 			if (!_vm->_map->hasBigTiles())
 				*obj->pPosY = (y + 1) * _vm->_map->getTilesHeight()


Commit: 3d513ebd25efdf606a22d1e6fd14e7db857aec37
    https://github.com/scummvm/scummvm/commit/3d513ebd25efdf606a22d1e6fd14e7db857aec37
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2024-11-30T12:14:38+02:00

Commit Message:
DGDS: Fix accidental replacement of 320 with SCREEN_WIDTH

This 320 represents the number of palette fade steps.

Changed paths:
    engines/dgds/ttm.cpp


diff --git a/engines/dgds/ttm.cpp b/engines/dgds/ttm.cpp
index f434ff50655..3a403a6ec80 100644
--- a/engines/dgds/ttm.cpp
+++ b/engines/dgds/ttm.cpp
@@ -784,7 +784,7 @@ void TTMInterpreter::handleOperation(TTMEnviro &env, TTMSeq &seq, uint16 op, byt
 			// Speed 4 should complete fade in 2 seconds (eg, Dynamix logo fade)
 
 			// TODO: this is a pretty bad way to do it - should pump messages in this loop?
-			for (int i = 0; i < SCREEN_WIDTH; i += ivals[3]) {
+			for (int i = 0; i < 320; i += ivals[3]) {
 				int fade = MIN(i / 5, 63);
 				_vm->getGamePals()->setFade(ivals[0], ivals[1], ivals[2], fade * 4);
 				g_system->updateScreen();


Commit: df81366902f9c1a9ad4e3af2e2b928095a6ba2d5
    https://github.com/scummvm/scummvm/commit/df81366902f9c1a9ad4e3af2e2b928095a6ba2d5
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-30T12:14:38+02:00

Commit Message:
NEWS: Add more changes for 2.9.0

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index 4e7f61ce90e..3e3016b134e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -34,12 +34,17 @@ For a more comprehensive changelog of the latest experimental code, see:
 
  ADL:
    - Added Apple II checkerboard cursor as a visual option.
+   - Removed broken strings in Time Zone.
+   - Fixed picking up all items via "GET ALL" from a scene.
+   - Fixed restoring the state of unvisited rooms.
 
  AGI:
    - Fixed duration of timed text boxes. They were shown only half as long as
      they should be, making e.g. the King's Quest III intro hard to read.
    - The predictive input dialog popup when clicking on the prompt line or in an input field
      is now an optional game setting, disabled by default.
+   - Fixed timed events (e.g. Tigger and mist) in Winnie the Pooh.
+   - Fixed logic for dropping objects in Winnie the Pooh.
 
  AGOS:
    - Added keymapper support.
@@ -47,7 +52,7 @@ For a more comprehensive changelog of the latest experimental code, see:
      Waxworks Egypt Level 3 and Power Points not regenerating in Elvira 2.
 
  AGS:
-   - Syncronized with upstream AGS 3.6.1.29.
+   - Syncronized with upstream AGS 3.6.1.30.
    - Added commandline --language option to specify the game language overriding the GUI.
    - Fixed glitchy staircase in old Maniac Mansion Mania episodes, caused by
      imperfect pathfinding.
@@ -109,6 +114,10 @@ For a more comprehensive changelog of the latest experimental code, see:
  GLK/ADVSYS:
    - Fixed parsing for input commands.
 
+ Gob:
+   - Fixed Blount becoming inactive in the Gob3 brain level.
+   - Fixed flickering cursor during some videos in Gob3 and Lost in Time.
+
  Groovie:
    - Added keymapper support.
 
@@ -138,6 +147,9 @@ For a more comprehensive changelog of the latest experimental code, see:
  Lure:
    - Added keymapper support.
 
+ M4:
+   - Fixed restoring conversation state.
+
  MADE:
    - Added keymapper support.
 
@@ -258,6 +270,7 @@ For a more comprehensive changelog of the latest experimental code, see:
  3DS port:
    - Integrated the port-specific options dialog with the main GUI.
    - Increased available memory on the Old 3DS.
+   - Fixed crashes in new 3DS models due to different memory handling.
 
 
 #### 2.8.1 (2024-03-31)




More information about the Scummvm-git-logs mailing list