Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DiscIO: Add missing company IDs #8367

Merged
merged 2 commits into from Nov 8, 2019

Conversation

@JosJuice
Copy link
Contributor

JosJuice commented Sep 21, 2019

No description provided.

@JosJuice JosJuice changed the title DiscIO: Add missing company IDs [WIP] DiscIO: Add missing company IDs Sep 21, 2019
@JosJuice JosJuice force-pushed the JosJuice:missing-company-ids branch from 6e7ad38 to 00590c1 Sep 21, 2019
@JosJuice JosJuice changed the title [WIP] DiscIO: Add missing company IDs DiscIO: Add missing company IDs Sep 21, 2019
@JosJuice JosJuice force-pushed the JosJuice:missing-company-ids branch from 00590c1 to 573e5e5 Sep 21, 2019
@iwubcode

This comment has been minimized.

Copy link
Contributor

iwubcode commented Sep 22, 2019

Just curious but what Gust game is on Wii/GC? I didn't realize there was one

@Pokechu22

This comment has been minimized.

Copy link
Contributor

Pokechu22 commented Sep 22, 2019

@JosJuice

This comment has been minimized.

Copy link
Contributor Author

JosJuice commented Sep 22, 2019

Yes, that wiki page is where I found that company ID.

{"LG", "Black Bean Games"},
{"LJ", "Legendo Entertainment"},
{"LL", "HB Studios"},
{"LP", "Left Field Productions"},
{"LR", "Koch Media"},
{"LT", "Legacy Interactive"},
{"LU", "Lexis Num\xc3\xa9rique"}, // We can't use a u8 prefix due to C++20's u8string

This comment has been minimized.

Copy link
@CookiePLMonster

CookiePLMonster Sep 22, 2019

Contributor

What do you mean here?

This comment has been minimized.

Copy link
@JosJuice

JosJuice Sep 22, 2019

Author Contributor

It would be convenient to write this string as u8"Lexis Numérique", but if I did that, compilation would fail when C++20 is supported since it would give us a const char8_t[] (instead of const char[]), which can't be automatically converted to the desired type std::string.

This comment has been minimized.

Copy link
@CookiePLMonster

CookiePLMonster Sep 22, 2019

Contributor

TIL! That's pretty nasty... Can char be converted to char8_t though? Sounds like it may be more future proof to migrate to u8string here (once applicable) and either let it convert implicitly or prefix them all with u8.

This comment has been minimized.

Copy link
@JosJuice

JosJuice Sep 22, 2019

Author Contributor

We would have to wait until all supported compilers have u8string support if we want to use u8string, which is going to take a while. And using u8string in this function doesn't really solve everything, since we have to convert it back to string at some point in the calling code anyway (barring a major move to u8string in large parts of Dolphin).

@JosJuice JosJuice force-pushed the JosJuice:missing-company-ids branch from 573e5e5 to 186e85b Sep 22, 2019
@JosJuice JosJuice force-pushed the JosJuice:missing-company-ids branch 3 times, most recently from 3006eb7 to 03724de Sep 22, 2019
@JosJuice JosJuice force-pushed the JosJuice:missing-company-ids branch from 03724de to f8a4975 Sep 25, 2019
@stenzek stenzek merged commit 9700b1e into dolphin-emu:master Nov 8, 2019
10 checks passed
10 checks passed
default Very basic checks passed, handed off to Buildbot.
Details
lint Build succeeded on builder lint
Details
pr-android Build succeeded on builder pr-android
Details
pr-deb-dbg-x64 Build succeeded on builder pr-deb-dbg-x64
Details
pr-deb-x64 Build succeeded on builder pr-deb-x64
Details
pr-freebsd-x64 Build succeeded on builder pr-freebsd-x64
Details
pr-osx-x64 Build succeeded on builder pr-osx-x64
Details
pr-ubu-x64 Build succeeded on builder pr-ubu-x64
Details
pr-win-dbg-x64 Build succeeded on builder pr-win-dbg-x64
Details
pr-win-x64 Build succeeded on builder pr-win-x64
Details
@JosJuice JosJuice deleted the JosJuice:missing-company-ids branch Nov 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
5 participants
You can’t perform that action at this time.