diff options
| author | Tannin <devnull@localhost> | 2014-07-15 20:45:29 +0200 |
|---|---|---|
| committer | Tannin <devnull@localhost> | 2014-07-15 20:45:29 +0200 |
| commit | 0a152ceadfc90650359b15dc448751f702e1070c (patch) | |
| tree | 02e468fb58330d25fd765974e48ab681bf360cab /src/shared | |
| parent | d412060d59b1597ae1d11d793662610e90863fc9 (diff) | |
| parent | 5718af351034c1936a91a3782651733dfecdc4e5 (diff) | |
Merge
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/fallout3info.cpp | 5 | ||||
| -rw-r--r-- | src/shared/fallout3info.h | 1 | ||||
| -rw-r--r-- | src/shared/falloutnvinfo.cpp | 5 | ||||
| -rw-r--r-- | src/shared/falloutnvinfo.h | 1 | ||||
| -rw-r--r-- | src/shared/gameinfo.h | 3 | ||||
| -rw-r--r-- | src/shared/oblivioninfo.cpp | 6 | ||||
| -rw-r--r-- | src/shared/oblivioninfo.h | 1 | ||||
| -rw-r--r-- | src/shared/shared.pro | 6 | ||||
| -rw-r--r-- | src/shared/skyriminfo.cpp | 5 | ||||
| -rw-r--r-- | src/shared/skyriminfo.h | 2 |
10 files changed, 32 insertions, 3 deletions
diff --git a/src/shared/fallout3info.cpp b/src/shared/fallout3info.cpp index 68fd515e..ea73c7f6 100644 --- a/src/shared/fallout3info.cpp +++ b/src/shared/fallout3info.cpp @@ -122,6 +122,11 @@ std::vector<std::wstring> Fallout3Info::getDLCPlugins() ;
}
+std::vector<std::wstring> Fallout3Info::getSavegameAttachmentExtensions()
+{
+ return std::vector<std::wstring>();
+}
+
std::vector<std::wstring> Fallout3Info::getIniFileNames()
{
return boost::assign::list_of(L"fallout.ini")(L"falloutprefs.ini");
diff --git a/src/shared/fallout3info.h b/src/shared/fallout3info.h index e9a818e2..7c61ca6d 100644 --- a/src/shared/fallout3info.h +++ b/src/shared/fallout3info.h @@ -59,6 +59,7 @@ public: virtual std::vector<std::wstring> getVanillaBSAs();
virtual std::vector<std::wstring> getDLCPlugins();
+ virtual std::vector<std::wstring> getSavegameAttachmentExtensions();
// file name of this games ini (no path)
virtual std::vector<std::wstring> getIniFileNames();
diff --git a/src/shared/falloutnvinfo.cpp b/src/shared/falloutnvinfo.cpp index 366c72c3..1715912d 100644 --- a/src/shared/falloutnvinfo.cpp +++ b/src/shared/falloutnvinfo.cpp @@ -127,13 +127,16 @@ std::vector<std::wstring> FalloutNVInfo::getDLCPlugins() ;
}
+std::vector<std::wstring> FalloutNVInfo::getSavegameAttachmentExtensions()
+{
+ return std::vector<std::wstring>();
+}
std::vector<std::wstring> FalloutNVInfo::getIniFileNames()
{
return boost::assign::list_of(L"fallout.ini")(L"falloutprefs.ini");
}
-
std::wstring FalloutNVInfo::getSaveGameExtension()
{
return L"*.fos";
diff --git a/src/shared/falloutnvinfo.h b/src/shared/falloutnvinfo.h index e6f6b5d0..4de67a19 100644 --- a/src/shared/falloutnvinfo.h +++ b/src/shared/falloutnvinfo.h @@ -61,6 +61,7 @@ public: virtual std::vector<std::wstring> getVanillaBSAs();
virtual std::vector<std::wstring> getDLCPlugins();
+ virtual std::vector<std::wstring> getSavegameAttachmentExtensions();
// file name of this games ini (no path)
virtual std::vector<std::wstring> getIniFileNames();
diff --git a/src/shared/gameinfo.h b/src/shared/gameinfo.h index 69cd38f6..33467cb9 100644 --- a/src/shared/gameinfo.h +++ b/src/shared/gameinfo.h @@ -130,6 +130,9 @@ public: virtual std::vector<std::wstring> getVanillaBSAs() = 0;
+ // get a list of file extensions for additional files belonging to a save game
+ virtual std::vector<std::wstring> getSavegameAttachmentExtensions() = 0;
+
// get a set of esp/esm files that are part of known dlcs
virtual std::vector<std::wstring> getDLCPlugins() = 0;
diff --git a/src/shared/oblivioninfo.cpp b/src/shared/oblivioninfo.cpp index 85f31042..532e49b8 100644 --- a/src/shared/oblivioninfo.cpp +++ b/src/shared/oblivioninfo.cpp @@ -133,6 +133,12 @@ std::vector<std::wstring> OblivionInfo::getDLCPlugins() }
+std::vector<std::wstring> OblivionInfo::getSavegameAttachmentExtensions()
+{
+ return boost::assign::list_of(L"obse");
+}
+
+
std::vector<std::wstring> OblivionInfo::getIniFileNames()
{
return boost::assign::list_of(L"oblivion.ini")(L"oblivionprefs.ini");
diff --git a/src/shared/oblivioninfo.h b/src/shared/oblivioninfo.h index f9c8fa47..121cad43 100644 --- a/src/shared/oblivioninfo.h +++ b/src/shared/oblivioninfo.h @@ -57,6 +57,7 @@ public: virtual std::vector<std::wstring> getVanillaBSAs();
virtual std::vector<std::wstring> getDLCPlugins();
+ virtual std::vector<std::wstring> getSavegameAttachmentExtensions();
// file name of this games ini (no path)
virtual std::vector<std::wstring> getIniFileNames();
diff --git a/src/shared/shared.pro b/src/shared/shared.pro index 992fd7f2..c5925c24 100644 --- a/src/shared/shared.pro +++ b/src/shared/shared.pro @@ -21,11 +21,13 @@ INCLUDEPATH += ../bsatk "$(BOOSTPATH)" CONFIG(debug, debug|release) {
LIBS += -L$$OUT_PWD/../bsatk/debug
- LIBS += -lDbgHelp
+ LIBS += -lDbgHelp
QMAKE_CXXFLAGS_DEBUG -= -Zi
QMAKE_CXXFLAGS += -Z7
+ PRE_TARGETDEPS += $$OUT_PWD/../bsatk/debug/bsatk.lib
} else {
- LIBS += -L$$OUT_PWD/../bsatk/release
+ LIBS += -L$$OUT_PWD/../bsatk/release
+ PRE_TARGETDEPS += $$OUT_PWD/../bsatk/release/bsatk.lib
}
LIBS += -lbsatk
diff --git a/src/shared/skyriminfo.cpp b/src/shared/skyriminfo.cpp index 5711e2fd..5017da38 100644 --- a/src/shared/skyriminfo.cpp +++ b/src/shared/skyriminfo.cpp @@ -158,6 +158,11 @@ std::vector<std::wstring> SkyrimInfo::getDLCPlugins() ;
}
+std::vector<std::wstring> SkyrimInfo::getSavegameAttachmentExtensions()
+{
+ return boost::assign::list_of(L"skse");
+}
+
std::vector<std::wstring> SkyrimInfo::getIniFileNames()
{
return boost::assign::list_of(L"skyrim.ini")(L"skyrimprefs.ini");
diff --git a/src/shared/skyriminfo.h b/src/shared/skyriminfo.h index 2794555f..3b3b6d8e 100644 --- a/src/shared/skyriminfo.h +++ b/src/shared/skyriminfo.h @@ -65,6 +65,8 @@ public: virtual std::vector<std::wstring> getVanillaBSAs();
virtual std::vector<std::wstring> getDLCPlugins();
+ virtual std::vector<std::wstring> getSavegameAttachmentExtensions();
+
// file name of this games ini (no path)
virtual std::vector<std::wstring> getIniFileNames();
|