strings and beans

Themes/_fallback/BGAnimations/ScreenSystemLayer error.lua

@@ -1,2 +1,2 @@
 --die
-return {}
+return Def.ActorFrame { }

src/SongManager.cpp

@@ -618,7 +618,7 @@ SongManager::AddKeyedPointers(Song* new_song)
 {
 	const vector<Steps*> steps = new_song->GetAllSteps();
 	for (size_t i = 0; i < steps.size(); ++i) {
-		const RString& ck = steps[i]->GetChartKey();
+		const string& ck = steps[i]->GetChartKey();
 		if (!StepsByKey.count(ck)) {
 			StepsByKey.emplace(ck, steps[i]);
 			if (!SongsByKey.count(ck)) {
@@ -633,15 +633,15 @@ SongManager::AddKeyedPointers(Song* new_song)
 // Get a steps pointer given a chartkey, the assumption here is we want
 // _a_ matching steps, not the original steps - mina
 Steps*
-SongManager::GetStepsByChartkey(RString ck)
+SongManager::GetStepsByChartkey(const string& ck)
 {
 	if (StepsByKey.count(ck))
 		return StepsByKey[ck];
 	return nullptr;
 }
 
 Song*
-SongManager::GetSongByChartkey(RString ck)
+SongManager::GetSongByChartkey(const string& ck)
 {
 	if (SongsByKey.count(ck))
 		return SongsByKey[ck];

src/SongManager.h

@@ -67,9 +67,9 @@ class SongManager
 
 	// temporary solution to reorganizing the entire songid/stepsid system -
 	// mina
-	Steps* GetStepsByChartkey(RString ck);
-	Song* GetSongByChartkey(RString ck);
-	bool IsChartLoaded(RString ck)
+	Steps* GetStepsByChartkey(const string& ck);
+	Song* GetSongByChartkey(const string& ck);
+	bool IsChartLoaded(const string& ck)
 	{
 		return SongsByKey.count(ck) == 1 && StepsByKey.count(ck) == 1;	// shouldn't be necessary but apparently it is -mina
 	}