ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed string vs. string_view code that works in VS but not gcc/clang.

This commit is contained in:
Stephen Anthony 2024-05-10 20:51:40 -02:30
parent 5fd6e2328b
commit 8217b08128
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emucore/KidVid.cxx
View File

@ -241,7 +241,7 @@ bool KidVid::load(Serializer& in)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string KidVid::getFileName() const string KidVid::getFileName() const
{ {
static constexpr std::array<string, 6> fileNames = { static constexpr std::array<string_view, 6> fileNames = {
"KVS3.WAV", "KVS1.WAV", "KVS2.WAV", "KVS3.WAV", "KVS1.WAV", "KVS2.WAV",
"KVB3.WAV", "KVB1.WAV", "KVB2.WAV" "KVB3.WAV", "KVB1.WAV", "KVB2.WAV"
}; };
@ -249,7 +249,7 @@ string KidVid::getFileName() const
int i = myGame == Game::Smurfs ? myTape - 1 : myTape + 2; int i = myGame == Game::Smurfs ? myTape - 1 : myTape + 2;
if(myTape == 4) i = 3; if(myTape == 4) i = 3;
return fileNames[i]; return string{fileNames[i]};
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -