Removed the shared parameters structure (read more)

I've also stopped using a separate branch for sharing the CharacterData
structre. This commit won't build, mostly because I need to refactor
InWorld to handle the loss of the PlayerCharacter class.

I should probably rename SQL's tables too.
This commit is contained in:
Kayne Ruse
2014-05-27 22:24:30 +10:00
parent ac4a264f12
commit 5893342ad8
11 changed files with 149 additions and 95 deletions
+3 -3
View File
@@ -119,13 +119,13 @@ void ClientApplication::LoadScene(SceneList sceneIndex) {
activeScene = new OptionsMenu(&config);
break;
case SceneList::LOBBYMENU:
activeScene = new LobbyMenu(&config, &network, &params);
activeScene = new LobbyMenu(&config, &network, &clientIndex, &accountIndex, &characterIndex);
break;
case SceneList::INWORLD:
activeScene = new InWorld(&config, &network, &params);
activeScene = new InWorld(&config, &network, &clientIndex, &accountIndex, &characterIndex);
break;
case SceneList::INCOMBAT:
activeScene = new InCombat(&config, &network, &params);
activeScene = new InCombat(&config, &network, &clientIndex, &accountIndex, &characterIndex);
break;
default:
throw(std::logic_error("Failed to recognize the scene index"));