Mercurial > hg > openttd
diff src/unix.cpp @ 5609:358c07fb3212 draft
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
| author | KUDr <KUDr@openttd.org> |
|---|---|
| date | Thu, 11 Jan 2007 17:29:39 +0000 (2007-01-11) |
| parents | c44c070c5032 |
| children | a9b2df5251d6 |
line wrap: on
line diff
--- a/src/unix.cpp +++ b/src/unix.cpp @@ -169,10 +169,10 @@ { char *s; - MallocT(&_paths.game_data_dir, MAX_PATH); + _paths.game_data_dir = MallocT<char>(MAX_PATH); ttd_strlcpy(_paths.game_data_dir, GAME_DATA_DIR, MAX_PATH); #if defined SECOND_DATA_DIR - MallocT(&_paths.second_data_dir, MAX_PATH); + _paths.second_data_dir = MallocT<char>(MAX_PATH); ttd_strlcpy(_paths.second_data_dir, SECOND_DATA_DIR, MAX_PATH); #endif @@ -190,7 +190,7 @@ #else /* not defined(USE_HOMEDIR) */ - MallocT(&_paths.personal_dir, MAX_PATH); + _paths.personal_dir = MallocT<char>(MAX_PATH); ttd_strlcpy(_paths.personal_dir, PERSONAL_DIR, MAX_PATH); // check if absolute or relative path @@ -226,7 +226,7 @@ #if defined CUSTOM_LANG_DIR // sets the search path for lng files to the custom one - MallocT(&_paths.lang_dir, MAX_PATH ); + _paths.lang_dir = MallocT<char>(MAX_PATH); ttd_strlcpy( _paths.lang_dir, CUSTOM_LANG_DIR, MAX_PATH); #else _paths.lang_dir = str_fmt("%slang/", _paths.game_data_dir);