[Scummvm-cvs-logs] scummvm master -> 622f8a166c4dd9a3bb2f902e3976edfb1db23c36

[dreammaster]

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:
622f8a166c TSAGE: Changed game Id from 'ring' to 'ringworld'


Commit: 622f8a166c4dd9a3bb2f902e3976edfb1db23c36
    https://github.com/scummvm/scummvm/commit/622f8a166c4dd9a3bb2f902e3976edfb1db23c36
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-08-06T18:07:02-07:00

Commit Message:
TSAGE: Changed game Id from 'ring' to 'ringworld'

This should help avoid name conflicts in the future with the Ring engine

Changed paths:
    engines/tsage/detection.cpp
    engines/tsage/detection_tables.h



diff --git a/engines/tsage/detection.cpp b/engines/tsage/detection.cpp
index aaa9030..c8aa415 100644
--- a/engines/tsage/detection.cpp
+++ b/engines/tsage/detection.cpp
@@ -59,7 +59,7 @@ Common::String TSageEngine::getPrimaryFilename() const {
 
 static const PlainGameDescriptor tSageGameTitles[] = {
 	{ "tsage", "Unknown Tsunami TSAGE-based Game" },
-	{ "ring", "Ringworld: Revenge of the Patriarch" },
+	{ "ringworld", "Ringworld: Revenge of the Patriarch" },
 	{ "blueforce", "Blue Force" },
 	{ 0, 0 }
 };
diff --git a/engines/tsage/detection_tables.h b/engines/tsage/detection_tables.h
index 1792d29..7fbfa55 100644
--- a/engines/tsage/detection_tables.h
+++ b/engines/tsage/detection_tables.h
@@ -27,7 +27,7 @@ static const tSageGameDescription gameDescriptions[] = {
 	// Ringworld English CD and First Wave versions
 	{
 		{
-			"ring",
+			"ringworld",
 			"CD",
 			AD_ENTRY1s("ring.rlb", "466f0e6492d9d0f34d35c5cd088de90f", 37847618),
 			Common::EN_ANY,
@@ -41,7 +41,7 @@ static const tSageGameDescription gameDescriptions[] = {
 	// Ringworld Spanish CD
 	{
 		{
-			"ring",
+			"ringworld",
 			"CD",
 			AD_ENTRY1s("ring.rlb", "cb8bba91b30cd172712371d7123bd763", 7427980),
 			Common::ES_ESP,
@@ -55,7 +55,7 @@ static const tSageGameDescription gameDescriptions[] = {
 	// Ringworld English Floppy version
 	{
 		{
-			"ring",
+			"ringworld",
 			"Floppy",
 			AD_ENTRY1s("ring.rlb", "7b7f0c5b37b58fa5ec06ebb2ca0d0d9d", 8438770),
 			Common::EN_ANY,
@@ -69,7 +69,7 @@ static const tSageGameDescription gameDescriptions[] = {
 	// Ringworld English Floppy Demo #1 version
 	{
 		{
-			"ring",
+			"ringworld",
 			"Floppy Demo",
 			AD_ENTRY1s("tsage.rlb", "3b3604a97c06c91f3735d3e9d341f63f", 833453),
 			Common::EN_ANY,
@@ -84,7 +84,7 @@ static const tSageGameDescription gameDescriptions[] = {
 	// Ringworld English Floppy Demo #2 version
 	{
 		{
-			"ring",
+			"ringworld",
 			"Floppy Demo",
 			AD_ENTRY1s("demoring.rlb", "64050e1806203b15bb03876140eb4f56", 832206),
 			Common::EN_ANY,