diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
| commit | d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a (patch) | |
| tree | 5f128768c66436eefd70632f02889607596609d4 /src/client.cpp | |
| parent | f1e92aca00a4859047e83fab76220767b9a2f814 (diff) | |
| parent | e93e6beb456d105987da3190c2a80847b6900081 (diff) | |
| download | manaverse-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.gz manaverse-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.bz2 manaverse-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.xz manaverse-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.zip | |
Merge branch 'master' into strippedstripped1.1.10.16
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
Diffstat (limited to 'src/client.cpp')
| -rw-r--r-- | src/client.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client.cpp b/src/client.cpp index 8497d337b..c90d1886f 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1145,7 +1145,7 @@ int Client::exec() { logger->log("Memorizing selected character %s", player_node->getName().c_str()); - config.setValue("lastCharacter", + serverConfig.setValue("lastCharacter", player_node->getName()); if (mumbleManager) mumbleManager->setPlayer(player_node->getName()); |