GameListCtrl: Improvements for reading custom game titles #2242

Stevoisiak · 2015-03-21T21:42:42Z

This PR brings 2 improvements.

Read from gametdb.txt if titles.txt doesn't exist
Fix reading custom titles for WAD files

Source/Core/DolphinWX/GameListCtrl.cpp

+			// TODO: Create function in volume class to fetch Game ID without the publisher code
+			else if (rISOFile.GetPlatform() == GameListItem::WII_WAD
+			         && line.substr(0, rISOFile.GetUniqueID().size() - 2) == (rISOFile.GetUniqueID()).substr(0, rISOFile.GetUniqueID().size() - 2) )
+					 {


Stevoisiak · 2015-03-22T18:53:01Z

~~Found an annoying issue I'm not sure how to fix.~~

There are certain Wii Game Channels that share the same ID as their retail counterparts. For example, Both Mario Kart Wii and the Mario Kart Channel have the ID RMCE01. GameTDB gets around this issue by using 4 digits for WADS.

~~Unfortunately, doing a 4 digit ID comparison means that the game channel IDs are matching with the retail Game IDs, causing the Mario Kart Channel to be labeled as Mario Kart Wii.~~

Edit: Disregard that. All fixed. This should be ready to go, assuming nobody finds any issues with it.

Source/Core/DolphinWX/GameListCtrl.cpp

+			if (rISOFile.GetPlatform() == GameListItem::WII_WAD)
+				game_id.erase(game_id.size() - 2);
+
+


JosJuice · 2015-03-23T20:51:04Z

~~I don't like that this code enforces particular whitespace around the = characters, but that's been there for a while, so I don't think it should be a concern for this PR.~~ LGTM.

Source/Core/DolphinWX/GameListCtrl.cpp

+			if (rISOFile.GetPlatform() == GameListItem::WII_WAD)
+				game_id.erase(game_id.size() - 2);
+
+			if (line.substr(0, line.find("=") - 1) == game_id)


lioncash · 2015-03-24T19:04:29Z

Can you append to the commit message of your second commit the reasons why it's an improvement?

Stevoisiak · 2015-03-27T17:56:03Z

Should be ready to go now.

RachelBryk · 2015-03-28T09:46:19Z

Wad files should probably check for 6 character id first, then for 4 if it's not found. GameTDB not including the publisher id is silly, and we should not enforce that (but supporting it too is okay).

JosJuice · 2015-03-28T09:55:29Z

That would reintroduce the Mario Kart Channel issue that Stevosiak mentioned before. I agree that not supporting 6-character IDs for WADs is a bit odd, though.

Stevoisiak · 2015-03-28T18:31:55Z

Actually, Dolphin is the odd one out in using 6 digit IDs for WADs. 4 digit IDs are used by GameTDB, Wiibrew.org, USB Loader GX, and many other places.

This is because, for WADs, the publisher ID is stored seperately from the game ID, where as for disc based games, they are stored together in the same location.

Stevoisiak · 2015-04-08T13:45:17Z

Can this be reviewed? I believe it is ready to be merged.

lioncash · 2015-04-09T03:42:30Z

You still haven't addressed what I posted.

Stevoisiak · 2015-04-09T03:43:43Z

I did amend the commit with a description

lioncash · 2015-04-09T03:44:51Z

#2242 (comment)

Stevoisiak · 2015-04-09T19:57:17Z

My bad. Should be fixed now.

Stevoisiak · 2015-04-19T20:39:06Z

Any other issues preventing this from being merged?

Stevoisiak · 2015-06-29T18:59:13Z

Updated to fix merge conflicts.

Source/Core/DolphinWX/GameListCtrl.cpp

 			{
-				name = StrToWxStr(line.substr(rISOFile.GetUniqueID().size() + 3));
+				name = StrToWxStr(line.substr(equals_index + 2));


Read game ID based on position of the "=" sign, rather than assuming game IDs are 6 characters in length.

waddlesplash · 2015-09-12T18:33:31Z

LGTM

GameListCtrl: Improvements for reading custom game titles

lioncash reviewed Mar 22, 2015
View reviewed changes

Stevoisiak force-pushed the Titles.txt branch from 030083b to d0a6b2e Compare March 22, 2015 00:27

Stevoisiak changed the title ~~GameListCtrl: Improvements for reading custom game titles~~ [WIP] GameListCtrl: Improvements for reading custom game titles Mar 22, 2015

Stevoisiak force-pushed the Titles.txt branch from 998703d to 4cf2cdd Compare March 22, 2015 23:54

Stevoisiak changed the title ~~[WIP] GameListCtrl: Improvements for reading custom game titles~~ GameListCtrl: Improvements for reading custom game titles Mar 22, 2015

JosJuice reviewed Mar 23, 2015
View reviewed changes

Source/Core/DolphinWX/GameListCtrl.cpp

if (rISOFile.GetPlatform() == GameListItem::WII_WAD)

game_id.erase(game_id.size() - 2);

This comment was marked as off-topic.

Sign in to view

Stevoisiak force-pushed the Titles.txt branch from 4cf2cdd to d1963e5 Compare March 23, 2015 22:22

lioncash reviewed Mar 24, 2015
View reviewed changes

Source/Core/DolphinWX/GameListCtrl.cpp

if (rISOFile.GetPlatform() == GameListItem::WII_WAD)

game_id.erase(game_id.size() - 2);

if (line.substr(0, line.find("=") - 1) == game_id)

This comment was marked as off-topic.

Sign in to view

Stevoisiak force-pushed the Titles.txt branch from d1963e5 to 0c9714b Compare March 25, 2015 15:17

Stevoisiak force-pushed the Titles.txt branch from 0c9714b to af998db Compare April 9, 2015 19:56

Stevoisiak force-pushed the Titles.txt branch 2 times, most recently from 30f3f30 to ce2b578 Compare June 29, 2015 18:00

Tilka reviewed Jul 3, 2015
View reviewed changes

Stevoisiak added 3 commits July 5, 2015 15:45

Read custom titles from wiitdb.txt if titles.txt is not found

c2bbcdd

Improve parsing custom game titles from titles.txt

90167ab

Read game ID based on position of the "=" sign, rather than assuming game IDs are 6 characters in length.

Fix reading custom titles from WAD files

afc1398

Stevoisiak force-pushed the Titles.txt branch from ce2b578 to afc1398 Compare July 7, 2015 18:52

phire added a commit that referenced this pull request Sep 13, 2015

Merge pull request #2242 from Stevoisiak/Titles.txt

45c1cfa

GameListCtrl: Improvements for reading custom game titles

phire merged commit 45c1cfa into dolphin-emu:master Sep 13, 2015

JosJuice mentioned this pull request May 15, 2017

Add an option to show the active title in the title #5429

Merged

Stevoisiak deleted the Titles.txt branch April 10, 2018 14:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GameListCtrl: Improvements for reading custom game titles #2242

GameListCtrl: Improvements for reading custom game titles #2242

Stevoisiak commented Mar 21, 2015

This comment was marked as off-topic.

Stevoisiak commented Mar 22, 2015

This comment was marked as off-topic.

JosJuice commented Mar 23, 2015

This comment was marked as off-topic.

lioncash commented Mar 24, 2015

Stevoisiak commented Mar 27, 2015

RachelBryk commented Mar 28, 2015

JosJuice commented Mar 28, 2015

Stevoisiak commented Mar 28, 2015

Stevoisiak commented Apr 8, 2015

lioncash commented Apr 9, 2015

Stevoisiak commented Apr 9, 2015

lioncash commented Apr 9, 2015

Stevoisiak commented Apr 9, 2015

Stevoisiak commented Apr 19, 2015

Stevoisiak commented Jun 29, 2015

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

waddlesplash commented Sep 12, 2015

		if (rISOFile.GetPlatform() == GameListItem::WII_WAD)
		game_id.erase(game_id.size() - 2);

GameListCtrl: Improvements for reading custom game titles #2242

GameListCtrl: Improvements for reading custom game titles #2242

Conversation

Stevoisiak commented Mar 21, 2015

This comment was marked as off-topic.

Stevoisiak commented Mar 22, 2015

This comment was marked as off-topic.

JosJuice commented Mar 23, 2015

This comment was marked as off-topic.

lioncash commented Mar 24, 2015

Stevoisiak commented Mar 27, 2015

RachelBryk commented Mar 28, 2015

JosJuice commented Mar 28, 2015

Stevoisiak commented Mar 28, 2015

Stevoisiak commented Apr 8, 2015

lioncash commented Apr 9, 2015

Stevoisiak commented Apr 9, 2015

lioncash commented Apr 9, 2015

Stevoisiak commented Apr 9, 2015

Stevoisiak commented Apr 19, 2015

Stevoisiak commented Jun 29, 2015

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

waddlesplash commented Sep 12, 2015