diff options
| author | krzys-h <krzys_h@interia.pl> | 2014-10-19 16:18:36 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2014-10-19 16:18:36 +0200 |
| commit | 0245fdc6c328edf65b4fd9f45be4f440ef92b6eb (patch) | |
| tree | d8237bdeacdee273c2eabaefc14f21637c1f489a /src/app/system_windows.h | |
| parent | d7ef0a1a5f7cee44eb8faaafefb7bb78e69be1f6 (diff) | |
| parent | 83abb8ca8e74176d64944e9681d74aa11ef6cdf9 (diff) | |
| download | colobot-0245fdc6c328edf65b4fd9f45be4f440ef92b6eb.tar.gz colobot-0245fdc6c328edf65b4fd9f45be4f440ef92b6eb.tar.bz2 colobot-0245fdc6c328edf65b4fd9f45be4f440ef92b6eb.zip | |
Merge branch 'dev-physfs' into dev
Conflicts:
src/app/app.cpp
Diffstat (limited to 'src/app/system_windows.h')
| -rw-r--r-- | src/app/system_windows.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/app/system_windows.h b/src/app/system_windows.h index 2d8e146..9175a44 100644 --- a/src/app/system_windows.h +++ b/src/app/system_windows.h @@ -46,8 +46,7 @@ public: virtual long long GetTimeStampExactResolution() override; virtual long long TimeStampExactDiff(SystemTimeStamp *before, SystemTimeStamp *after) override; - virtual std::string GetProfileFileLocation() override; - virtual std::string GetSavegameDirectoryLocation() override; + virtual std::string GetSaveDir() override; private: std::string UTF8_Encode(const std::wstring &wstr); |