diff --git a/NifExport/KfExport.cpp b/NifExport/KfExport.cpp index 40a6c8ff85f1190dfc521a534cc4d12387818cfd..08579feef9e09e0bb943f01b0a0ba4bc8daf8cc7 100644 --- a/NifExport/KfExport.cpp +++ b/NifExport/KfExport.cpp @@ -116,12 +116,12 @@ static INT_PTR CALLBACK KfExportOptionsDlgProc(HWND hWnd,UINT message,WPARAM wPa GetDlgItemText(hWnd, IDC_CB_VERSION, tmp, MAX_PATH); if (tmp[0] != 0) { - int nifVersion = ParseVersionString(tmp); - if (!IsSupportedVersion(nifVersion)) - { - MessageBox(hWnd, FormatString("Version '%s' is not a supported version.", tmp).c_str(), "NifExport", MB_OK|MB_ICONSTOP); - return FALSE; - } + int nifVersion = ParseVersionString(tmp); + if (!IsSupportedVersion(nifVersion)) + { + MessageBox(hWnd, FormatString("Version '%s' is not a supported version.", tmp).c_str(), "NifExport", MB_OK|MB_ICONSTOP); + return FALSE; + } } Exporter::mExportHidden = IsDlgButtonChecked(hWnd, IDC_CHK_HIDDEN); @@ -192,8 +192,8 @@ KfExport::KfExport() iniFileName = iniName; shortDescription = GetIniValue<TSTR>("System", "ShortDescription", "Netimmerse/Gamebryo", iniFileName); fileVersion = GetFileVersion(NULL); - webSite = GetIniValue<TSTR>("System", "Website", "http://www.niftools.org", iniFileName); - wikiSite = GetIniValue<TSTR>("System", "Wiki", "http://www.niftools.org/wiki/index.php/3ds_Max", iniFileName); + webSite = GetIniValue<TSTR>("System", "Website", "http://niftools.sourceforge.net", iniFileName); + wikiSite = GetIniValue<TSTR>("System", "Wiki", "http://niftools.sourceforge.net/wiki/3ds_Max", iniFileName); } KfExport::~KfExport() @@ -228,17 +228,17 @@ const TCHAR *KfExport::AuthorName() const TCHAR *KfExport::CopyrightMessage() { - return _T("http://www.niftools.org"); + return _T("http://niftools.sourceforge.net"); } const TCHAR *KfExport::OtherMessage1() { - return _T("http://www.niftools.org"); + return _T("http://niftools.sourceforge.net"); } const TCHAR *KfExport::OtherMessage2() { - return _T("http://www.niftools.org"); + return _T("http://niftools.sourceforge.net"); } unsigned int KfExport::Version() @@ -259,8 +259,8 @@ BOOL KfExport::SupportsOptions(int ext, DWORD options) int KfExport::DoExport(const TCHAR *name, ExpInterface *ei, Interface *i, BOOL suppressPrompts, DWORD options) { - try - { + try + { // read application settings AppSettings::Initialize(i); @@ -314,50 +314,50 @@ int KfExport::DoExport(const TCHAR *name, ExpInterface *ei, Interface *i, BOOL s appSettings->NiVersion = Exporter::mNifVersion; appSettings->NiUserVersion = Exporter::mNifUserVersion; appSettings->WriteSettings(i); - } + } - int nifVersion = VER_20_0_0_5; - int nifUserVer = Exporter::mNifUserVersion; - - if (!Exporter::mNifVersion.empty()) - { - nifVersion = ParseVersionString(Exporter::mNifVersion); - if (!IsSupportedVersion(nifVersion)) - throw exception(FormatString("Version '%s' is not a supported version.").c_str()); - } - - Exporter::mSelectedOnly = (options&SCENE_EXPORT_SELECTED) != 0; - Exporter exp(i, appSettings); - - Ref<NiControllerSequence> root = new NiControllerSequence(); - - TCHAR fname[MAX_PATH]; - _tcscpy(fname, PathFindFileName(name)); - PathRemoveExtension(fname); - root->SetName(fname); + int nifVersion = VER_20_0_0_5; + int nifUserVer = Exporter::mNifUserVersion; + + if (!Exporter::mNifVersion.empty()) + { + nifVersion = ParseVersionString(Exporter::mNifVersion); + if (!IsSupportedVersion(nifVersion)) + throw exception(FormatString("Version '%s' is not a supported version.").c_str()); + } + + Exporter::mSelectedOnly = (options&SCENE_EXPORT_SELECTED) != 0; + Exporter exp(i, appSettings); + + Ref<NiControllerSequence> root = new NiControllerSequence(); + + TCHAR fname[MAX_PATH]; + _tcscpy(fname, PathFindFileName(name)); + PathRemoveExtension(fname); + root->SetName(fname); Exporter::Result result = exp.doAnimExport(root); if (result!=Exporter::Ok) throw exception("Unknown error."); - - Niflib::NifInfo info(nifVersion, nifUserVer, nifUserVer); - info.creator = Exporter::mCreatorName; - info.exportInfo1 = "Niflib"; - info.exportInfo2 = FormatText("Niftools Max Plugins %s", fileVersion.data()); - WriteNifTree(name, StaticCast<NiObject>(root), info); - } - - catch (exception &e) - { - MessageBox(NULL, e.what(), "Export Error", MB_OK); - return true; + + Niflib::NifInfo info(nifVersion, nifUserVer, nifUserVer); + info.creator = Exporter::mCreatorName; + info.exportInfo1 = "Niflib"; + info.exportInfo2 = FormatText("Niftools Max Plugins %s", fileVersion.data()); + WriteNifTree(name, StaticCast<NiObject>(root), info); + } + + catch (exception &e) + { + MessageBox(NULL, e.what(), "Export Error", MB_OK); + return true; } catch (...) { - MessageBox(NULL, "Unknown error.", "Export Error", MB_OK); - return true; + MessageBox(NULL, "Unknown error.", "Export Error", MB_OK); + return true; } return TRUE; diff --git a/NifExport/NifExport.cpp b/NifExport/NifExport.cpp index 7c82ac3ad7587d653359e3755548cf5cb2da91be..a0eba2bdc949128216f596ded8c8da7a2bb89309 100755 --- a/NifExport/NifExport.cpp +++ b/NifExport/NifExport.cpp @@ -287,8 +287,8 @@ NifExport::NifExport() shortDescription = GetIniValue<TSTR>("System", "ShortDescription", "Netimmerse/Gamebryo", iniFileName); fileVersion = GetFileVersion(NULL); - webSite = GetIniValue<TSTR>("System", "Website", "http://www.niftools.org", iniFileName); - wikiSite = GetIniValue<TSTR>("System", "Wiki", "http://www.niftools.org/wiki/index.php/3ds_Max", iniFileName); + webSite = GetIniValue<TSTR>("System", "Website", "http://niftools.sourceforge.net", iniFileName); + wikiSite = GetIniValue<TSTR>("System", "Wiki", "http://niftools.sourceforge.net/wiki/3ds_Max", iniFileName); } NifExport::~NifExport() @@ -328,17 +328,17 @@ const TCHAR *NifExport::AuthorName() const TCHAR *NifExport::CopyrightMessage() { - return _T("http://www.niftools.org"); + return _T("http://niftools.sourceforge.net"); } const TCHAR *NifExport::OtherMessage1() { - return _T("http://www.niftools.org"); + return _T("http://niftools.sourceforge.net"); } const TCHAR *NifExport::OtherMessage2() { - return _T("http://www.niftools.org"); + return _T("http://niftools.sourceforge.net"); } unsigned int NifExport::Version() diff --git a/NifExport/NifExport.rc b/NifExport/NifExport.rc index 426da24f69db56ab19bcc90d49f9796af39827d8..c60ca4a3d767a92eee45b2ea72a8b8f9f5a524bd 100755 --- a/NifExport/NifExport.rc +++ b/NifExport/NifExport.rc @@ -104,7 +104,7 @@ BEGIN EDITTEXT IDC_CB_USER_VERSION,167,89,30,12,ES_AUTOHSCROLL DEFPUSHBUTTON "&Export",IDOK,5,109,34,14 PUSHBUTTON "&Cancel",IDCANCEL,45,109,33,14 - CONTROL "http://www.niftools.org",IDC_LBL_LINK,"Button",BS_OWNERDRAW | WS_TABSTOP,103,109,95,14 + CONTROL "http://niftools.sourceforge.net",IDC_LBL_LINK,"Button",BS_OWNERDRAW | WS_TABSTOP,80,109,120,14 END IDD_NIF_PANEL DIALOGEX 0, 0, 229, 287 @@ -160,7 +160,7 @@ BEGIN PUSHBUTTON "&Cancel",IDCANCEL,45,266,33,14 CONTROL "Gen. Bone Collision",IDC_CHK_BONE_COLL,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,151,7,73,10 CONTROL "&Remap Indices",IDC_CHK_REMAP,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,152,7,72,10 - LTEXT "www.niftools.org",IDC_LBL_LINK,137,266,60,14,SS_NOTIFY | SS_CENTERIMAGE + LTEXT "niftools.sourceforge.net",IDC_LBL_LINK,110,266,80,14,SS_NOTIFY | SS_CENTERIMAGE LTEXT "Wiki",IDC_LBL_WIKI,203,266,22,14,SS_NOTIFY | SS_CENTERIMAGE END diff --git a/NifImport/BaseImporter.h b/NifImport/BaseImporter.h index 12c271e729b09e0a335529524873e33a0926474f..9e17281af593b5b54865d636f5cae2df07a5fe02 100644 --- a/NifImport/BaseImporter.h +++ b/NifImport/BaseImporter.h @@ -69,8 +69,8 @@ public: } } - webSite = GetIniValue<TSTR>("System", "Website", "http://www.niftools.org"); - wikiSite = GetIniValue<TSTR>("System", "Wiki", "http://www.niftools.org/wiki/index.php/3ds_Max"); + webSite = GetIniValue<TSTR>("System", "Website", "http://niftools.sourceforge.net"); + wikiSite = GetIniValue<TSTR>("System", "Wiki", "http://niftools.sourceforge.net/wiki/3ds_Max"); nifVersion = Niflib::GetNifVersion(this->name); diff --git a/NifImport/MaxNifImport.cpp b/NifImport/MaxNifImport.cpp index 3202ae7290329f8287df814c488e3dcfede55dd5..55ab585d29a4dbe7bbc15eea42364299e4402e75 100644 --- a/NifImport/MaxNifImport.cpp +++ b/NifImport/MaxNifImport.cpp @@ -82,8 +82,8 @@ MaxNifImport::MaxNifImport() GetIniFileName(iniName); iniFileName = iniName; shortDescription = GetIniValue<TSTR>("System", "ShortDescription", "Netimmerse/Gamebryo", iniFileName.c_str()); - webSite = GetIniValue<TSTR>("System", "Website", "http://www.niftools.org", iniFileName.c_str()); - wikiSite = GetIniValue<TSTR>("System", "Wiki", "http://www.niftools.org/wiki/index.php/3ds_Max", iniFileName.c_str()); + webSite = GetIniValue<TSTR>("System", "Website", "http://niftools.sourceforge.net", iniFileName.c_str()); + wikiSite = GetIniValue<TSTR>("System", "Wiki", "http://niftools.sourceforge.net/wiki/3ds_Max", iniFileName.c_str()); } MaxNifImport::~MaxNifImport() diff --git a/NifImport/MaxNifImport.rc b/NifImport/MaxNifImport.rc index 3f134013ec6b8b0c3d930fe4e6fa33f5654117a7..c203924f341b0927d15d00604f802a55530399e8 100644 --- a/NifImport/MaxNifImport.rc +++ b/NifImport/MaxNifImport.rc @@ -70,7 +70,7 @@ BEGIN DEFPUSHBUTTON "&Import",IDOK,5,236,34,14 PUSHBUTTON "&Cancel",IDCANCEL,45,236,33,14 CONTROL "Ignore Root Node",IDC_CHK_IGNORE_ROOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,109,161,89,10 - LTEXT "www.niftools.org",IDC_LBL_LINK,125,239,53,8,SS_NOTIFY | SS_CENTERIMAGE + LTEXT "niftools.sourceforge.net",IDC_LBL_LINK,100,239,80,8,SS_NOTIFY | SS_CENTERIMAGE LTEXT "Wiki",IDC_LBL_WIKI,185,239,16,8,SS_NOTIFY | SS_CENTERIMAGE END @@ -86,7 +86,7 @@ BEGIN CONTROL "Add Time Tags",IDC_CHK_TIMETAGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,44,72,10 DEFPUSHBUTTON "&Import",IDOK,5,78,34,14 PUSHBUTTON "&Cancel",IDCANCEL,45,78,33,14 - LTEXT "www.niftools.org",IDC_LBL_LINK,7,62,54,8,SS_NOTIFY | SS_CENTERIMAGE + LTEXT "niftools.sourceforge.net",IDC_LBL_LINK,7,62,80,8,SS_NOTIFY | SS_CENTERIMAGE LTEXT "Wiki",IDC_LBL_WIKI,90,62,16,9,SS_NOTIFY | SS_CENTERIMAGE END