From 6516a6b7c19713de28db7142612f1c095e541317 Mon Sep 17 00:00:00 2001 From: Tannin Date: Sun, 17 Feb 2013 09:26:29 +0100 Subject: - moved shared and uibase libraries to namespaces - bugfix: the "fix mods" function was accessing the save game data incorrectly, causing a crash --- src/shared/fallout3info.cpp | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) (limited to 'src/shared/fallout3info.cpp') diff --git a/src/shared/fallout3info.cpp b/src/shared/fallout3info.cpp index f9699145..a37e1119 100644 --- a/src/shared/fallout3info.cpp +++ b/src/shared/fallout3info.cpp @@ -1,22 +1,22 @@ -/* -Copyright (C) 2012 Sebastian Herbord. All rights reserved. - -This file is part of Mod Organizer. - -Mod Organizer is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -Mod Organizer is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Mod Organizer. If not, see . -*/ - +/* +Copyright (C) 2012 Sebastian Herbord. All rights reserved. + +This file is part of Mod Organizer. + +Mod Organizer is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +Mod Organizer is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with Mod Organizer. If not, see . +*/ + #include "fallout3info.h" #include "util.h" #include @@ -28,6 +28,8 @@ along with Mod Organizer. If not, see . #include #include +namespace MOShared { + Fallout3Info::Fallout3Info(const std::wstring &omoDirectory, const std::wstring &gameDirectory) : GameInfo(omoDirectory, gameDirectory) { @@ -178,7 +180,7 @@ void Fallout3Info::createProfile(const std::wstring &directory, bool useDefaults source << getGameDirectory() << L"\\fallout_default.ini"; } else { source << getMyGamesDirectory() << L"\\Fallout3"; - if (::FileExists(source.str(), L"fallout.ini")) { + if (FileExists(source.str(), L"fallout.ini")) { source << L"\\fallout.ini"; } else { source.str(L""); @@ -242,3 +244,4 @@ std::vector Fallout3Info::getExecutables() return result; } +} // namespace MOShared -- cgit v1.3.1