diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-03-09 20:36:23 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-03-09 20:36:23 +0300 |
commit | 1708ac07231cd222f269d3c0ddb9e22aba7aeec4 (patch) | |
tree | f4e8736ae34fac2e614f127d4ceae24a9454410a /source/gameengine | |
parent | 26272d4c58de0b80056092de190bb35b44532f2e (diff) |
rename some functions to use easier to understand names.
'BLI_makestringcode' --> 'BLI_path_rel'
'BLI_convertstringcwd' --> 'BLI_path_cwd'
'BLI_convertstringframe' --> 'BLI_path_frame'
'BLI_convertstringframe_range' --> 'BLI_path_frame_range'
'BLI_make_cwdpath' --> 'BLI_path_cwd'
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp | 4 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_ghost.cpp | 6 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp index 1688be6d528..00f556b3e96 100644 --- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp +++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp @@ -283,7 +283,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c // to the first file but that makes no sense, relative paths in // blend files should be relative to that file, not some other file // that happened to be loaded first - BLI_convertstringcode(basedpath, pathname); + BLI_path_abs(basedpath, pathname); bfd = load_game_data(basedpath); // if it wasn't loaded, try it forced relative @@ -294,7 +294,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c strcpy(temppath, "//"); strcat(temppath, basedpath); - BLI_convertstringcode(temppath, pathname); + BLI_path_abs(temppath, pathname); bfd = load_game_data(temppath); } diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index 95370beeeb3..9d87adb7400 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -681,7 +681,7 @@ int main(int argc, char** argv) get_filename(argc_py_clamped, argv, filename); if(filename[0]) - BLI_convertstringcwd(filename); + BLI_path_cwd(filename); do { @@ -695,7 +695,7 @@ int main(int argc, char** argv) // base the actuator filename relative to the last file strcpy(basedpath, exitstring.Ptr()); - BLI_convertstringcode(basedpath, pathname); + BLI_path_abs(basedpath, pathname); bfd = load_game_data(basedpath); @@ -706,7 +706,7 @@ int main(int argc, char** argv) strcpy(temppath, "//"); strcat(temppath, basedpath); - BLI_convertstringcode(temppath, pathname); + BLI_path_abs(temppath, pathname); bfd = load_game_data(temppath); } } diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index c30939fba54..7dec4e4f97f 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -209,7 +209,7 @@ static PyObject* gPyExpandPath(PyObject*, PyObject* args) return NULL; BLI_strncpy(expanded, filename, FILE_MAXDIR + FILE_MAXFILE); - BLI_convertstringcode(expanded, gp_GamePythonPath); + BLI_path_abs(expanded, gp_GamePythonPath); return PyUnicode_FromString(expanded); } @@ -471,7 +471,7 @@ static PyObject* gPyGetBlendFileList(PyObject*, PyObject* args) if (searchpath) { BLI_strncpy(cpath, searchpath, FILE_MAXDIR + FILE_MAXFILE); - BLI_convertstringcode(cpath, gp_GamePythonPath); + BLI_path_abs(cpath, gp_GamePythonPath); } else { /* Get the dir only */ BLI_split_dirfile(gp_GamePythonPath, cpath, NULL); @@ -1787,7 +1787,7 @@ static void initPySysObjects__append(PyObject *sys_path, char *filename) char expanded[FILE_MAXDIR + FILE_MAXFILE]; BLI_split_dirfile(filename, expanded, NULL); /* get the dir part of filename only */ - BLI_convertstringcode(expanded, gp_GamePythonPath); /* filename from lib->filename is (always?) absolute, so this may not be needed but it wont hurt */ + BLI_path_abs(expanded, gp_GamePythonPath); /* filename from lib->filename is (always?) absolute, so this may not be needed but it wont hurt */ BLI_cleanup_file(gp_GamePythonPath, expanded); /* Dont use BLI_cleanup_dir because it adds a slash - BREAKS WIN32 ONLY */ item= PyUnicode_FromString(expanded); |