[Scummvm-git-logs] scummvm master -> eeee4e478bac38210666ed7760334b03635f7d3f

[OMGPizzaGuy]

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

Summary:
eeee4e478b ULTIMA8: Rename game ini files in ultima8.dat to avoid collision with GOG configuration files


Commit: eeee4e478bac38210666ed7760334b03635f7d3f
    https://github.com/scummvm/scummvm/commit/eeee4e478bac38210666ed7760334b03635f7d3f
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2023-11-14T18:29:59-06:00

Commit Message:
ULTIMA8: Rename game ini files in ultima8.dat to avoid collision with GOG configuration files

Changed paths:
  A devtools/create_ultima8/remorsegame.ini
  A devtools/create_ultima8/u8game.ini
  R devtools/create_ultima8/remorse.ini
  R devtools/create_ultima8/remorsebindings.ini
  R devtools/create_ultima8/u8.ini
    dists/engine-data/ultima8.dat
    engines/ultima/ultima8/games/game_data.cpp


diff --git a/devtools/create_ultima8/remorsebindings.ini b/devtools/create_ultima8/remorsebindings.ini
deleted file mode 100644
index 1ea7a9f09fe..00000000000
--- a/devtools/create_ultima8/remorsebindings.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-[bindings]
-escape=MenuGump::showMenu
-e=GUIApp::togglePaintEditorItems
-h=GUIApp::toggleShowTouchingItems
-s=GUIApp::toggleAvatarInStasis
-t=GUIApp::engineStats
-f7=GUIApp::saveGame quicksave
-f8=GUIApp::loadGame quicksave
-f11=ShapeViewerGump::U8ShapeViewer
-f12=Kernel::toggleFrameByFrame
-space=Kernel::advanceFrame
-up=QuickAvatarMoverProcess::startMoveUp
-down=QuickAvatarMoverProcess::startMoveDown
-left=QuickAvatarMoverProcess::startMoveLeft
-right=QuickAvatarMoverProcess::startMoveRight
-home=QuickAvatarMoverProcess::startAscend
-end=QuickAvatarMoverProcess::startDescend
-<Release> up=QuickAvatarMoverProcess::stopMoveUp
-<Release> down=QuickAvatarMoverProcess::stopMoveDown
-<Release> left=QuickAvatarMoverProcess::stopMoveLeft
-<Release> right=QuickAvatarMoverProcess::stopMoveRight
-<Release> home=QuickAvatarMoverProcess::stopAscend
-<Release> end=QuickAvatarMoverProcess::stopDescend
-right-shift=QuickAvatarMoverProcess::toggleQuarterSpeed
-<Release> right-shift=QuickAvatarMoverProcess::toggleQuarterSpeed
-insert=QuickAvatarMoverProcess::toggleClipping
-tab=GameMapGump::toggleHighlightItems
-<Release> tab=GameMapGump::toggleHighlightItems
diff --git a/devtools/create_ultima8/remorse.ini b/devtools/create_ultima8/remorsegame.ini
similarity index 100%
rename from devtools/create_ultima8/remorse.ini
rename to devtools/create_ultima8/remorsegame.ini
diff --git a/devtools/create_ultima8/u8.ini b/devtools/create_ultima8/u8game.ini
similarity index 100%
rename from devtools/create_ultima8/u8.ini
rename to devtools/create_ultima8/u8game.ini
diff --git a/dists/engine-data/ultima8.dat b/dists/engine-data/ultima8.dat
index 7fcf17df10c..d50e47583ca 100644
Binary files a/dists/engine-data/ultima8.dat and b/dists/engine-data/ultima8.dat differ
diff --git a/engines/ultima/ultima8/games/game_data.cpp b/engines/ultima/ultima8/games/game_data.cpp
index 6729929ec28..4db0475c811 100644
--- a/engines/ultima/ultima8/games/game_data.cpp
+++ b/engines/ultima/ultima8/games/game_data.cpp
@@ -264,7 +264,7 @@ void GameData::loadU8Data() {
 	config->readConfigFile("u8weapons.ini", "weapons");
 	config->readConfigFile("u8armour.ini", "armour");
 	config->readConfigFile("u8monsters.ini", "monsters");
-	config->readConfigFile("u8.ini", "game");
+	config->readConfigFile("u8game.ini", "game");
 
 	// Load typeflags
 	Common::SeekableReadStream *tfs = filesystem->ReadFile("static/typeflag.dat");
@@ -542,7 +542,7 @@ void GameData::loadRemorseData() {
 	else
 		config->readConfigFile("regretweapons.ini", "weapons");
 
-	config->readConfigFile("remorse.ini", "game");
+	config->readConfigFile("remorsegame.ini", "game");
 
 	// Load typeflags
 	Common::SeekableReadStream *tfs = filesystem->ReadFile("static/typeflag.dat");