From 9ee90a35dc3ebdbc76b18cbeb72995345ee37052 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Sun, 8 Dec 2013 14:16:25 +0100
Subject: - MO now applies a minimum to the nmm-compatibility field. - bugfix:
 "visit on nexus" directed the browser to the servers meant for nmm - bugfix:
 url for "check all for updates" and "enorse/unendorse" were not constructed
 correctly

---
 src/shared/fallout3info.cpp  | 8 ++++++--
 src/shared/fallout3info.h    | 2 +-
 src/shared/falloutnvinfo.cpp | 8 ++++++--
 src/shared/falloutnvinfo.h   | 2 +-
 src/shared/gameinfo.h        | 2 +-
 src/shared/oblivioninfo.cpp  | 8 ++++++--
 src/shared/oblivioninfo.h    | 2 +-
 src/shared/skyriminfo.cpp    | 8 ++++++--
 src/shared/skyriminfo.h      | 2 +-
 9 files changed, 29 insertions(+), 13 deletions(-)

(limited to 'src/shared')

diff --git a/src/shared/fallout3info.cpp b/src/shared/fallout3info.cpp
index cc90d6fa..1808d1d9 100644
--- a/src/shared/fallout3info.cpp
+++ b/src/shared/fallout3info.cpp
@@ -153,9 +153,13 @@ std::wstring Fallout3Info::getSEName()
 }
 
 
-std::wstring Fallout3Info::getNexusPage()
+std::wstring Fallout3Info::getNexusPage(bool nmmScheme)
 {
-  return L"http://nmm.nexusmods.com/fallout3";
+  if (nmmScheme) {
+    return L"http://nmm.nexusmods.com/fallout3";
+  } else {
+    return L"http://www.nexusmods.com/fallout3";
+  }
 }
 
 
diff --git a/src/shared/fallout3info.h b/src/shared/fallout3info.h
index 4bcb9d37..9575103b 100644
--- a/src/shared/fallout3info.h
+++ b/src/shared/fallout3info.h
@@ -71,7 +71,7 @@ public:
 
   virtual std::wstring getSEName();
 
-  virtual std::wstring getNexusPage();
+  virtual std::wstring getNexusPage(bool nmmScheme = true);
   static std::wstring getNexusInfoUrlStatic();
   virtual std::wstring getNexusInfoUrl() { return Fallout3Info::getNexusInfoUrlStatic(); }
   static int getNexusModIDStatic();
diff --git a/src/shared/falloutnvinfo.cpp b/src/shared/falloutnvinfo.cpp
index abff9323..e7e747e2 100644
--- a/src/shared/falloutnvinfo.cpp
+++ b/src/shared/falloutnvinfo.cpp
@@ -207,9 +207,13 @@ std::wstring FalloutNVInfo::getSEName()
 }
 
 
-std::wstring FalloutNVInfo::getNexusPage()
+std::wstring FalloutNVInfo::getNexusPage(bool nmmScheme)
 {
-  return L"http://nmm.nexusmods.com/newvegas";
+  if (nmmScheme) {
+    return L"http://nmm.nexusmods.com/newvegas";
+  } else {
+    return L"http://www.nexusmods.com/newvegas";
+  }
 }
 
 
diff --git a/src/shared/falloutnvinfo.h b/src/shared/falloutnvinfo.h
index e25d2e02..8767fdb0 100644
--- a/src/shared/falloutnvinfo.h
+++ b/src/shared/falloutnvinfo.h
@@ -72,7 +72,7 @@ public:
 
   virtual std::wstring getSEName();
 
-  virtual std::wstring getNexusPage();
+  virtual std::wstring getNexusPage(bool nmmScheme = true);
   static std::wstring getNexusInfoUrlStatic();
   virtual std::wstring getNexusInfoUrl() { return FalloutNVInfo::getNexusInfoUrlStatic(); }
   static int getNexusModIDStatic();
diff --git a/src/shared/gameinfo.h b/src/shared/gameinfo.h
index d517fc1b..10775e6c 100644
--- a/src/shared/gameinfo.h
+++ b/src/shared/gameinfo.h
@@ -142,7 +142,7 @@ public:
 
   virtual std::wstring getSEName() = 0;
 
-  virtual std::wstring getNexusPage() = 0;
+  virtual std::wstring getNexusPage(bool nmmScheme = true) = 0;
   virtual std::wstring getNexusInfoUrl() = 0;
   virtual int getNexusModID() = 0;
   virtual int getNexusGameID() = 0;
diff --git a/src/shared/oblivioninfo.cpp b/src/shared/oblivioninfo.cpp
index c84f8b88..d8daa0f7 100644
--- a/src/shared/oblivioninfo.cpp
+++ b/src/shared/oblivioninfo.cpp
@@ -189,9 +189,13 @@ std::wstring OblivionInfo::getSEName()
 }
 
 
-std::wstring OblivionInfo::getNexusPage()
+std::wstring OblivionInfo::getNexusPage(bool nmmScheme)
 {
-  return L"http://nmm.nexusmods.com/oblivion";
+  if (nmmScheme) {
+    return L"http://nmm.nexusmods.com/oblivion";
+  } else {
+    return L"http://www.nexusmods.com/oblivion";
+  }
 }
 
 
diff --git a/src/shared/oblivioninfo.h b/src/shared/oblivioninfo.h
index dfa53575..ba27aa40 100644
--- a/src/shared/oblivioninfo.h
+++ b/src/shared/oblivioninfo.h
@@ -68,7 +68,7 @@ public:
 
   virtual std::wstring getSEName();
 
-  virtual std::wstring getNexusPage();
+  virtual std::wstring getNexusPage(bool nmmScheme = true);
   static std::wstring getNexusInfoUrlStatic();
   virtual std::wstring getNexusInfoUrl() { return OblivionInfo::getNexusInfoUrlStatic(); }
   static int getNexusModIDStatic();
diff --git a/src/shared/skyriminfo.cpp b/src/shared/skyriminfo.cpp
index 38b2cf37..1620bcc3 100644
--- a/src/shared/skyriminfo.cpp
+++ b/src/shared/skyriminfo.cpp
@@ -181,9 +181,13 @@ std::wstring SkyrimInfo::getSEName()
 }
 
 
-std::wstring SkyrimInfo::getNexusPage()
+std::wstring SkyrimInfo::getNexusPage(bool nmmScheme)
 {
-  return L"http://nmm.nexusmods.com/skyrim";
+  if (nmmScheme) {
+    return L"http://nmm.nexusmods.com/skyrim";
+  } else {
+    return L"http://www.nexusmods.com/skyrim";
+  }
 }
 
 
diff --git a/src/shared/skyriminfo.h b/src/shared/skyriminfo.h
index 7da523a1..438beb41 100644
--- a/src/shared/skyriminfo.h
+++ b/src/shared/skyriminfo.h
@@ -75,7 +75,7 @@ public:
 
   virtual std::wstring getSEName();
 
-  virtual std::wstring getNexusPage();
+  virtual std::wstring getNexusPage(bool nmmScheme = true);
 
   static std::wstring getNexusInfoUrlStatic();
   virtual std::wstring getNexusInfoUrl() { return SkyrimInfo::getNexusInfoUrlStatic(); }
-- 
cgit v1.3.1