diff options
| author | peter1138 <peter1138@openttd.org> | 2008-01-12 19:58:06 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2008-01-12 19:58:06 +0000 |
| commit | ab8382c0db353d9d1ba6b7a9690d56aa2415258c (patch) | |
| tree | f23fb584e594e0c9ff5a9ad650d97c493714078d /src/players.cpp | |
| parent | a222fe2e86d2736217f3bba43b28e95297b8d71e (diff) | |
| download | openttd-ab8382c0db353d9d1ba6b7a9690d56aa2415258c.tar.xz | |
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
no limit to the amount of names.
-Fix: NewGRF engines could not be renamed.
Diffstat (limited to 'src/players.cpp')
| -rw-r--r-- | src/players.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/players.cpp b/src/players.cpp index c2f587f9a..a383aa170 100644 --- a/src/players.cpp +++ b/src/players.cpp @@ -612,10 +612,12 @@ static void DeletePlayerStuff(PlayerID pi) DeletePlayerWindows(pi); p = GetPlayer(pi); - DeleteName(p->name_1); - DeleteName(p->president_name_1); - p->name_1 = 0; - p->president_name_1 = 0; + p->name_1 = STR_NULL; + p->president_name_1 = STR_NULL; + free(p->name); + free(p->president_name); + p->name = NULL; + p->president_name = NULL; } /** Change engine renewal parameters @@ -1096,9 +1098,11 @@ void LoadFromHighScore() static const SaveLoad _player_desc[] = { SLE_VAR(Player, name_2, SLE_UINT32), SLE_VAR(Player, name_1, SLE_STRINGID), + SLE_CONDSTR(Player, name, SLE_STR, 0, 84, SL_MAX_VERSION), SLE_VAR(Player, president_name_1,SLE_UINT16), SLE_VAR(Player, president_name_2,SLE_UINT32), + SLE_CONDSTR(Player, president_name, SLE_STR, 0, 84, SL_MAX_VERSION), SLE_VAR(Player, face, SLE_UINT32), |