From e613f8acf22c0359791827be4232084213c41722 Mon Sep 17 00:00:00 2001 From: danij Date: Sun, 6 May 2012 15:25:45 +0100 Subject: [PATCH] -vdmap|Fixed: Logic error when mapping to the base path with "}" A logic error in the path argument handling resulted in an additional terminating slash when using the "}" base path mnemonic --- doomsday/engine/portable/src/fs_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doomsday/engine/portable/src/fs_main.c b/doomsday/engine/portable/src/fs_main.c index c9e196bbe6..2a496c1df5 100644 --- a/doomsday/engine/portable/src/fs_main.c +++ b/doomsday/engine/portable/src/fs_main.c @@ -2228,9 +2228,9 @@ void F_AddVirtualDirectoryMapping(const char* source, const char* destination) Str_Init(&src); Str_Set(&src, source); Str_Strip(&src); F_FixSlashes(&src, &src); - F_AppendMissingSlash(&src); F_ExpandBasePath(&src, &src); F_PrependWorkPath(&src, &src); + F_AppendMissingSlash(&src); // Have already mapped this source path? vdm = findVDMappingForSourcePath(Str_Text(&src)); @@ -2259,9 +2259,9 @@ void F_AddVirtualDirectoryMapping(const char* source, const char* destination) Str_Set(&vdm->destination, destination); Str_Strip(&vdm->destination); F_FixSlashes(&vdm->destination, &vdm->destination); - F_AppendMissingSlash(&vdm->destination); F_ExpandBasePath(&vdm->destination, &vdm->destination); F_PrependWorkPath(&vdm->destination, &vdm->destination); + F_AppendMissingSlash(&vdm->destination); VERBOSE(Con_Message("Resources in \"%s\" now mapped to \"%s\"\n", F_PrettyPath(Str_Text(&vdm->source)), F_PrettyPath(Str_Text(&vdm->destination))) ); }