summaryrefslogtreecommitdiff
path: root/src/unix.cpp
diff options
context:
space:
mode:
authorKUDr <kudr@openttd.org>2007-01-11 17:29:39 +0000
committerKUDr <kudr@openttd.org>2007-01-11 17:29:39 +0000
commit33be1ecfb1a9056b027d50d7b558cff87c5b744d (patch)
treed644a3831ca0947198b191fa3e4e8973d3a9786e /src/unix.cpp
parent91ff74641060445dc1647bbf05baeb03b45c3099 (diff)
downloadopenttd-33be1ecfb1a9056b027d50d7b558cff87c5b744d.tar.xz
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
Diffstat (limited to 'src/unix.cpp')
-rw-r--r--src/unix.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/unix.cpp b/src/unix.cpp
index ba15b8701..cd32b7631 100644
--- a/src/unix.cpp
+++ b/src/unix.cpp
@@ -169,10 +169,10 @@ void DeterminePaths(void)
{
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 @@ void DeterminePaths(void)
#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 @@ void DeterminePaths(void)
#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);