Revert "Fixed Uri-to-string conversions"

This reverts commit a037458.
skyjake · Dec 28, 2011 · a227228 · a227228
1 parent a037458
commit a227228
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/doomsday/engine/portable/src/edit_bias.c b/doomsday/engine/portable/src/edit_bias.c
@@ -393,7 +393,7 @@ static boolean SBE_Save(const char* name)
     Str_Init(&fileName);
     if(!name || !name[0])
     {
-        Str_Appendf(&fileName, "%s.ded", Str_Text(Uri_Path(P_MapUri(map))));
+        Str_Appendf(&fileName, "%s.ded", P_MapUri(map));
     }
     else
     {

diff --git a/doomsday/engine/portable/src/r_world.c b/doomsday/engine/portable/src/r_world.c
@@ -1376,7 +1376,6 @@ void R_SetupMap(int mode, int flags)
     case DDSMM_FINALIZE: {
         gamemap_t* map = P_GetCurrentMap();
         ded_mapinfo_t* mapInfo;
-        ddstring_t* str = 0;
         float startTime;
         char cmd[80];
         int i;
@@ -1419,10 +1418,7 @@ void R_SetupMap(int mode, int flags)
         }
 
         // Run the special map setup command, which the user may alias to do something useful.
-        sprintf(cmd, "init-%s", Str_Text(Uri_Path(P_MapUri(map))));
-#ifdef _DEBUG
-        Con_Message("R_SetupMap: Setup command: %s\n", cmd);
-#endif
+        sprintf(cmd, "init-%s", P_MapUri(map));
         if(Con_IsValidCommand(cmd))
         {
             Con_Executef(CMDS_SCRIPT, false, "%s", cmd);