From 025a121e441e902df230087bbb3f785443fd4e4f Mon Sep 17 00:00:00 2001
From: Mathieu Schroeter <mathieu@schroetersa.ch>
Date: Thu, 23 Feb 2017 23:29:03 +0100
Subject: [PATCH] Fix locations of files

It fixes especially the navigation for the next
and previous exercise and mission.
---
 src/decio.cpp | 3 ++-
 src/event.cpp | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/decio.cpp b/src/decio.cpp
index 0691588..5c0946c 100644
--- a/src/decio.cpp
+++ b/src/decio.cpp
@@ -331,7 +331,8 @@ bool CDecor::FileExist (Sint32 rank, bool bUser, Sint32 &world, Sint32 &time,
         AddUserPath (filename);
     }
     else
-        sprintf (filename, "data/world%.3d.blp", rank);
+        snprintf (filename, sizeof (filename),
+                  (GetBaseDir () + "data/world%.3d.blp").c_str (), rank);
 
     file = fopen (filename, "rb");
     if (file == nullptr)
diff --git a/src/event.cpp b/src/event.cpp
index 92232e1..82acf39 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -4291,8 +4291,9 @@ void CEvent::DemoRecStop()
 
     if (m_pDemoBuffer != nullptr)
     {
-        unlink ("data/demo.blp");
-        file = fopen ("data/demo.blp", "wb");
+        const auto demo = GetBaseDir () + "data/demo.blp";
+        unlink (demo.c_str ());
+        file = fopen (demo.c_str (), "wb");
         if (file != nullptr)
         {
             memset (&header, 0, sizeof (DemoHeader));