diff --git a/src/engine/shared/library/sharedFoundation/src/win32/ConfigSharedFoundation.cpp b/src/engine/shared/library/sharedFoundation/src/win32/ConfigSharedFoundation.cpp
index 71c802e28..e571ffb6a 100644
--- a/src/engine/shared/library/sharedFoundation/src/win32/ConfigSharedFoundation.cpp
+++ b/src/engine/shared/library/sharedFoundation/src/win32/ConfigSharedFoundation.cpp
@@ -90,12 +90,8 @@ void ConfigSharedFoundation::install (const Defaults &defaults)
KEY_BOOL(demoMode, defaults.demoMode);
- ms_frameRateLimit = 144.f;
- ms_minFrameRate = 30.f;
-
- KEY_FLOAT(frameRateLimit, 144.f);
-
- KEY_FLOAT(minFrameRate, 30.f);
+ KEY_FLOAT(frameRateLimit, defaults.frameRateLimit);
+ KEY_FLOAT(minFrameRate, defaults.minFrameRate);
KEY_BOOL(useRemoteDebug, false);
KEY_INT(defaultRemoteDebugPort, 4445);
diff --git a/src/engine/shared/library/sharedFoundation/src/win32/ConfigSharedFoundation.h b/src/engine/shared/library/sharedFoundation/src/win32/ConfigSharedFoundation.h
index 6efa38409..c89a5a761 100644
--- a/src/engine/shared/library/sharedFoundation/src/win32/ConfigSharedFoundation.h
+++ b/src/engine/shared/library/sharedFoundation/src/win32/ConfigSharedFoundation.h
@@ -21,6 +21,7 @@ public:
int screenWidth;
bool windowed;
real frameRateLimit;
+ real minFrameRate;
bool demoMode;
bool verboseWarnings;
};
diff --git a/src/engine/shared/library/sharedFoundation/src/win32/SetupSharedFoundation.cpp b/src/engine/shared/library/sharedFoundation/src/win32/SetupSharedFoundation.cpp
index 98889b525..12056433f 100644
--- a/src/engine/shared/library/sharedFoundation/src/win32/SetupSharedFoundation.cpp
+++ b/src/engine/shared/library/sharedFoundation/src/win32/SetupSharedFoundation.cpp
@@ -223,6 +223,7 @@ void SetupSharedFoundation::install(const Data &data)
{
ConfigSharedFoundation::Defaults defaults;
defaults.frameRateLimit = data.frameRateLimit;
+ defaults.minFrameRate = data.minFrameRate;
defaults.demoMode = data.demoMode;
defaults.verboseWarnings = data.verboseWarnings;
ConfigSharedFoundation::install(defaults);
@@ -338,6 +339,7 @@ void SetupSharedFoundation::Data::setupGameDefaults()
productRegistryKey = NULL;
frameRateLimit = CONST_REAL(0);
+ minFrameRate = CONST_REAL(0);
lostFocusCallback = NULL;
@@ -370,6 +372,7 @@ void SetupSharedFoundation::Data::setupConsoleDefaults()
productRegistryKey = NULL;
frameRateLimit = CONST_REAL(0);
+ minFrameRate = CONST_REAL(0);
lostFocusCallback = NULL;
@@ -402,6 +405,7 @@ void SetupSharedFoundation::Data::setupMfcDefaults()
productRegistryKey = NULL;
frameRateLimit = CONST_REAL(0);
+ minFrameRate = CONST_REAL(0);
demoMode = false;
verboseWarnings = false;
diff --git a/src/engine/shared/library/sharedFoundation/src/win32/SetupSharedFoundation.h b/src/engine/shared/library/sharedFoundation/src/win32/SetupSharedFoundation.h
index b0675d8ff..d0d4c13e9 100644
--- a/src/engine/shared/library/sharedFoundation/src/win32/SetupSharedFoundation.h
+++ b/src/engine/shared/library/sharedFoundation/src/win32/SetupSharedFoundation.h
@@ -48,7 +48,7 @@ public:
const char *productRegistryKey;
real frameRateLimit;
-
+ real minFrameRate;
bool demoMode;
diff --git a/src/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp b/src/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp
index 210d17bcb..e39346f84 100644
--- a/src/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp
+++ b/src/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp
@@ -217,7 +217,7 @@ namespace MemoryManagerNamespace
bool ms_installed;
bool ms_limitSet;
bool ms_hardLimit;
- int ms_limitMegabytes = 2047;
+ int ms_limitMegabytes = 2048;
SystemAllocation * ms_firstSystemAllocation;
int ms_numberOfSystemAllocations;
int ms_systemMemoryAllocatedMegabytes;
diff --git a/src/external/3rd/library/oracle_win32/ora80/bin/orancrypt8.dll.bak b/src/external/3rd/library/oracle_win32/ora80/bin/orancrypt8.dll.bak
deleted file mode 100644
index 706ef3be6..000000000
Binary files a/src/external/3rd/library/oracle_win32/ora80/bin/orancrypt8.dll.bak and /dev/null differ
diff --git a/src/game/client/application/SwgClient/build/win32/SwgClient.vcxproj b/src/game/client/application/SwgClient/build/win32/SwgClient.vcxproj
index 27e7d16df..734d94d2a 100644
--- a/src/game/client/application/SwgClient/build/win32/SwgClient.vcxproj
+++ b/src/game/client/application/SwgClient/build/win32/SwgClient.vcxproj
@@ -113,6 +113,9 @@
_DEBUG;%(PreprocessorDefinitions)
0x0409
+
+ true
+
@@ -154,6 +157,9 @@
_ITERATOR_DEBUG_LEVEL=0;_DEBUG;%(PreprocessorDefinitions)
0x0409
+
+ true
+
@@ -196,6 +202,9 @@
_ITERATOR_DEBUG_LEVEL=0;NDEBUG;%(PreprocessorDefinitions)
0x0409
+
+ true
+
diff --git a/src/game/client/application/SwgClient/src/win32/ClientMain.cpp b/src/game/client/application/SwgClient/src/win32/ClientMain.cpp
index 4ebf26863..5b3e81a8b 100644
--- a/src/game/client/application/SwgClient/src/win32/ClientMain.cpp
+++ b/src/game/client/application/SwgClient/src/win32/ClientMain.cpp
@@ -158,20 +158,24 @@ int ClientMain(
data.commandLine = lpCmdLine;
data.configFile = "client.cfg";
data.clockUsesSleep = true;
- data.frameRateLimit = 144.f;
+ data.minFrameRate = 1.f;
+ data.frameRateLimit = 144.f;
#if PRODUCTION
data.demoMode = true;
#endif
if (ApplicationVersion::isPublishBuild() || ApplicationVersion::isBootlegBuild())
- data.writeMiniDumps = true;
- SetupSharedFoundation::install (data);
+ {
+ data.writeMiniDumps = true;
+ }
+
+ SetupSharedFoundation::install(data);
REPORT_LOG(true, ("ClientMain: Command Line = \"%s\"\n", lpCmdLine));
REPORT_LOG (true, ("ClientMain: Memory size = %i MB\n", MemoryManager::getLimit()));
// check for any config file entries
if (ConfigFile::isEmpty())
- FATAL(true, ("Config file not specified"));
+ FATAL(true, ("Config file not specified"));
InstallTimer::checkConfigFile();
diff --git a/src/game/client/application/SwgClient/src/win32/SwgClient.rc b/src/game/client/application/SwgClient/src/win32/SwgClient.rc
index 9742abf1b..f0fb375cb 100644
--- a/src/game/client/application/SwgClient/src/win32/SwgClient.rc
+++ b/src/game/client/application/SwgClient/src/win32/SwgClient.rc
@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
@@ -7,20 +7,17 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "WinResrc.h"
-#define IDC_STATIC -1
+#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English (United States) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
-#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
@@ -29,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_ICON1 ICON DISCARDABLE "icon1.ico"
-IDI_ICON2 ICON DISCARDABLE "icon2.ico"
+IDI_ICON1 ICON "icon1.ico"
+IDI_ICON2 ICON "icon2.ico"
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -38,18 +35,18 @@ IDI_ICON2 ICON DISCARDABLE "icon2.ico"
// TEXTINCLUDE
//
-1 TEXTINCLUDE DISCARDABLE
+1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE DISCARDABLE
+2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE DISCARDABLE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
@@ -58,15 +55,14 @@ END
#endif // APSTUDIO_INVOKED
-#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION 2,0,0,0
+ PRODUCTVERSION 2,0,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -81,18 +77,16 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "\0"
- VALUE "CompanyName", "Sony Online Entertainment\0"
- VALUE "FileDescription", "SwgClient_r\0"
- VALUE "FileVersion", "1, 0, 0, 1\0"
- VALUE "InternalName", "SwgClient_r\0"
- VALUE "LegalCopyright", "© 2003-2004 Lucasfilm Entertainment Company Ltd. or Lucasfilm Ltd.\0"
- VALUE "LegalTrademarks", "Star Wars Galaxies is a trademark of Lucasfilm Entertainment Company Ltd.\0"
- VALUE "OriginalFilename", "SwgClient_r.exe\0"
- VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Star Wars Galaxies\0"
- VALUE "ProductVersion", "1, 0, 0, 1\0"
- VALUE "SpecialBuild", "\0"
+ VALUE "Comments", "Compiled for Stella Bellum Testing"
+ VALUE "CompanyName", "Sony Online Entertainment"
+ VALUE "FileDescription", "SwgClient_r"
+ VALUE "FileVersion", "2.0b"
+ VALUE "InternalName", "SwgClient_r"
+ VALUE "LegalCopyright", "© Lucasfilm Entertainment Company Ltd. or Lucasfilm Ltd."
+ VALUE "LegalTrademarks", "Star Wars Galaxies is a trademark of Lucasfilm Entertainment Company Ltd."
+ VALUE "OriginalFilename", "SwgClient_r.exe"
+ VALUE "ProductName", "Star Wars Galaxies"
+ VALUE "ProductVersion", "2.0b"
END
END
BLOCK "VarFileInfo"
@@ -101,9 +95,7 @@ BEGIN
END
END
-#endif // !_MAC
-
-#endif // English (U.S.) resources
+#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/src/game/client/application/SwgClientSetup/build/win32/SwgClientSetup.vcxproj b/src/game/client/application/SwgClientSetup/build/win32/SwgClientSetup.vcxproj
index a1337bfb8..d0af638e5 100644
--- a/src/game/client/application/SwgClientSetup/build/win32/SwgClientSetup.vcxproj
+++ b/src/game/client/application/SwgClientSetup/build/win32/SwgClientSetup.vcxproj
@@ -63,7 +63,7 @@
Disabled
- ..\..\..\..\..\..\external\3rd\library\directx9\include;..\..\..\..\..\..\external\3rd\library\miles\include;..\..\..\..\..\..\external\3rd\library\trackIR\include;%(AdditionalIncludeDirectories)
+ ..\..\..\..\..\..\external\3rd\library\atlmfc\include;..\..\..\..\..\..\external\3rd\library\directx9\include;..\..\..\..\..\..\external\3rd\library\miles\include;..\..\..\..\..\..\external\3rd\library\trackIR\include;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_MBCS;UNICODE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -97,11 +97,15 @@
MachineX86
/SAFESEH:NO %(AdditionalOptions)
Enabled
+ false
true
.\..\..\..\..\..\..\compile\win32\SwgClientSetup\Debug/SwgClientSetup.bsc
+
+ true
+
@@ -115,7 +119,7 @@
MinSpace
OnlyExplicitInline
- ..\..\..\..\..\..\external\3rd\library\directx9\include;..\..\..\..\..\..\external\3rd\library\miles\include;..\..\..\..\..\..\external\3rd\library\trackIR\include;%(AdditionalIncludeDirectories)
+ ..\..\..\..\..\..\external\3rd\library\atlmfc\include;..\..\..\..\..\..\external\3rd\library\directx9\include;..\..\..\..\..\..\external\3rd\library\miles\include;..\..\..\..\..\..\external\3rd\library\trackIR\include;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_MBCS;UNICODE;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions)
true
MultiThreaded
@@ -136,20 +140,24 @@
0x0409
- d3d9.lib;ddraw.lib;dinput8.lib;dxguid.lib;mss32.lib;ws2_32.lib;..\..\..\..\..\..\external\3rd\library\ms_unicode\unicows.lib;kernel32.lib;advapi32.lib;user32.lib;gdi32.lib;shell32.lib;comdlg32.lib;version.lib;mpr.lib;rasapi32.lib;winmm.lib;winspool.lib;vfw32.lib;oleacc.lib;oledlg.lib;%(AdditionalDependencies)
+ d3d9.lib;ddraw.lib;dinput8.lib;dxguid.lib;Mss32.lib;ws2_32.lib;unicows.lib;kernel32.lib;advapi32.lib;user32.lib;gdi32.lib;shell32.lib;comdlg32.lib;version.lib;mpr.lib;rasapi32.lib;winmm.lib;winspool.lib;vfw32.lib;oleacc.lib;oledlg.lib;%(AdditionalDependencies)
..\..\..\..\..\..\compile\win32\SwgClientSetup\Release/SwgClientSetup_r.exe
true
- ..\..\..\..\..\..\external\3rd\library\directx9\lib;..\..\..\..\..\..\external\3rd\library\miles\lib\win;%(AdditionalLibraryDirectories)
+ ..\..\..\..\..\..\..\src\external\3rd\library\atlmfc\lib;..\..\..\..\..\..\..\src\external\3rd\library\blat194\build\win32;..\..\..\..\..\..\..\src\external\3rd\library\directx9\lib;..\..\..\..\..\..\..\src\external\3rd\library\miles-7.2e\lib\win;..\..\..\..\..\..\..\src\external\3rd\library\miles-7.2e\redist;%(AdditionalLibraryDirectories)
kernel32.lib;advapi32.lib;user32.lib;gdi32.lib;shell32.lib;comdlg32.lib;version.lib;mpr.lib;rasapi32.lib;winmm.lib;winspool.lib;vfw32.lib;secur32.lib;oleacc.lib;oledlg.lib;sensapi.lib;%(IgnoreSpecificDefaultLibraries)
.\..\..\..\..\..\..\compile\win32\SwgClientSetup\Release/SwgClientSetup_r.pdb
Windows
wWinMainCRTStartup
MachineX86
+ false
true
.\..\..\..\..\..\..\compile\win32\SwgClientSetup\Release/SwgClientSetup.bsc
+
+ true
+
diff --git a/src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.rc b/src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.rc
index 77916be50..9123f91fd 100644
--- a/src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.rc
+++ b/src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.rc
@@ -7,32 +7,30 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "../../../../../../external/3rd/library/atlmfc/include/afxres.h"
+#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Japanese resources
+// Japanese (Japan) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
-#ifdef _WIN32
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
#pragma code_page(932)
-#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_INFO_NUM_PROCESSORS "CPU??"
IDS_INFO_CPU_ID "CPU?"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_INFO_CPU_SPEED "CPU????"
IDS_INFO_CPU_VENDOR "CPU????"
@@ -41,7 +39,7 @@ BEGIN
IDS_INFO_VIDEO_IDENTIFIER "???????"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_INFO_VIDEO_DRIVER_VERSION "?????????????"
IDS_INFO_VIDEO_MEMORY_SIZE "????????"
@@ -61,7 +59,7 @@ BEGIN
IDS_GRAPHICS_DISABLE_FAST_MOUSE_CURSOR "??????????????"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_GRAPHICS_USE_SAFE_RENDERER "???????????(??)"
IDS_SOUND_DISABLE_AUDIO "???"
@@ -81,7 +79,7 @@ BEGIN
"?????1GB??????????RAM?75%????????(Direct3D?OS????????????)"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_DEBUG_CRASH_LOGS "????????"
IDS_DEBUG_INCLUDE_STATION_ID_IN_LOGS "??????ID?????????????"
@@ -100,7 +98,7 @@ BEGIN
IDS_INFO_DIRECTXVERSION "DirectX"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_INFO_TRACKIRVERSION "trackIR"
IDS_SENDCRASH_TITLE "???????????????????????"
@@ -119,7 +117,7 @@ BEGIN
IDS_NO "???"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_GB "GB"
IDS_SEND_HARDWARE_INFO "???????????????????????????????????????????????????????????????(????????????????ID????????????)?????????????????PC???????????????????????????????????????????????PC??????????????????????????????????????????????????????????????????"
@@ -138,14 +136,14 @@ BEGIN
IDS_INVALIDCOMMANDLINE "????????????????????????????????????????????????????????????????????????????"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
CG_IDS_PROGRESS_CAPTION "?????????????"
IDS_LANGUAGE "??"
IDS_ADVANCED_CAPTION "???????"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_DEBUG_CAPTION "???????"
IDS_GAME_CAPTION "????"
@@ -154,7 +152,7 @@ BEGIN
IDS_SOUND_CAPTION "?????"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RESET_IN_GAME "?????"
IDS_VSPS_OPTIMAL "??"
@@ -165,7 +163,7 @@ BEGIN
IDS_ANOTHER_INSTANCE "?????????????????????????????????????"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_NOT_MINIMUM "??PC????????? ??????????????????????????????????:\n\n"
IDS_ENABLE_JOYSTICKS "??????????"
@@ -178,13 +176,13 @@ BEGIN
IDS_NICE_MINIMUM "??PC????????? ??????????????????????????????????:\n\n"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_FINAL_CONFIG "- 250MB???????????\n- DirectX 9.0c\n\n????????????????????????????????????????"
IDS_512MB_PHYSICAL "- 512MB???????\n"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_512MB_PHYSICAL_DETECTED "- 512MB???????(?? %i MB)\n"
IDS_900MHZ_PROCESSOR "- 900 MHz???CPU\n"
@@ -193,7 +191,7 @@ BEGIN
IDS_32MB_VIDEO_MEMORY "- 32MB?????????\n"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_32MB_VIDEO_MEMORY_DETECTED "- 32 MB????????? (?? %i MB)\n"
IDS_NO_CHANGE_DETECTED "\n\n????????PC????????????????????"
@@ -205,24 +203,22 @@ BEGIN
IDS_THANK_YOU "??????????????????????????????????????????????????????????????????????????????????????????????????????????????\n\n??????????\n\n???????? ????????????"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_UNKNOWN "??"
IDS_NO_SOUND_CARD "???"
END
-#endif // Japanese resources
+#endif // Japanese (Japan) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English (United States) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
-#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -287,7 +283,7 @@ BEGIN
RTEXT "v. 1.46",IDC_STATIC,195,219,23,8
END
-IDD_PROPPAGE_INFORMATION DIALOG 0, 0, 212, 186
+IDD_PROPPAGE_INFORMATION DIALOG 0, 0, 212, 186
STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Information"
FONT 8, "MS Sans Serif"
@@ -323,7 +319,7 @@ BEGIN
LTEXT "x",IDC_STATIC_DIRECTXVERSION,88,140,95,8
END
-IDD_PROPPAGE_GRAPHICS DIALOG 0, 0, 162, 186
+IDD_PROPPAGE_GRAPHICS DIALOG 0, 0, 162, 186
STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Graphics"
FONT 8, "MS Sans Serif"
@@ -351,7 +347,7 @@ BEGIN
RTEXT "Vertex/Pixel\nShader Version",IDC_GRAPH_LBL_PIXEL_SHADER_VERSION,7,22,56,16
END
-IDD_PROPPAGE_SOUND DIALOG 0, 0, 192, 90
+IDD_PROPPAGE_SOUND DIALOG 0, 0, 192, 90
STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Sound"
FONT 8, "MS Sans Serif"
@@ -363,7 +359,7 @@ BEGIN
LTEXT "x",IDC_SOUNDVERSION,68,27,117,8
END
-IDD_PROPPAGE_ADVANCED DIALOG 0, 0, 199, 178
+IDD_PROPPAGE_ADVANCED DIALOG 0, 0, 199, 178
STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Advanced"
FONT 8, "MS Sans Serif"
@@ -385,7 +381,7 @@ BEGIN
LTEXT "This value should be 75% of your total system RAM up to 1 GB (reserving memory for Direct3D and the OS).",IDC_LBL_ADVANCED_GAME_MEMORY_INFO,85,125,107,34
END
-IDD_PROPPAGE_DEBUG DIALOG 0, 0, 212, 183
+IDD_PROPPAGE_DEBUG DIALOG 0, 0, 212, 183
STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Debug"
FONT 8, "MS Sans Serif"
@@ -401,7 +397,7 @@ BEGIN
LTEXT "Static",IDC_STATIC_CONTACT,115,46,90,8
END
-CG_IDD_PROGRESS DIALOG 0, 0, 186, 79
+CG_IDD_PROGRESS DIALOG 0, 0, 186, 79
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Transmitting diagnostic files..."
FONT 8, "MS Sans Serif"
@@ -412,7 +408,7 @@ BEGIN
LTEXT "",CG_IDC_PROGDLG_STATUS,13,7,158,8
END
-IDD_DIALOG_MINIDUMP DIALOG 0, 0, 280, 156
+IDD_DIALOG_MINIDUMP DIALOG 0, 0, 280, 156
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
CAPTION "Automatically Send Crash Logs?"
FONT 8, "MS Sans Serif"
@@ -426,7 +422,7 @@ BEGIN
PUSHBUTTON "Cancel",ID_CANCEL,169,135,50,14
END
-IDD_PROPPAGE_GAME DIALOG 0, 0, 195, 164
+IDD_PROPPAGE_GAME DIALOG 0, 0, 195, 164
STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Game"
FONT 8, "MS Sans Serif"
@@ -443,7 +439,7 @@ BEGIN
COMBOBOX IDC_DROP_LANGUAGE,68,96,120,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
END
-IDD_DIALOG_STATIONID DIALOG 0, 0, 280, 156
+IDD_DIALOG_STATIONID DIALOG 0, 0, 280, 156
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
CAPTION "Include Your Station Id in Crash Logs?"
FONT 8, "MS Sans Serif"
@@ -458,7 +454,7 @@ BEGIN
PUSHBUTTON "Cancel",ID_CANCEL,169,135,50,14
END
-IDD_DIALOG_CONTACT DIALOG 0, 0, 280, 156
+IDD_DIALOG_CONTACT DIALOG 0, 0, 280, 156
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
CAPTION "Can SOE Contact You?"
FONT 8, "MS Sans Serif"
@@ -472,7 +468,7 @@ BEGIN
LTEXT "How would you like to proceed?",IDC_LBL_SOE_CONTACT_QUERY,7,89,102,8
END
-IDD_DIALOG_HARDWAREINFORMATION DIALOG 0, 0, 280, 156
+IDD_DIALOG_HARDWAREINFORMATION DIALOG 0, 0, 280, 156
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
CAPTION "Automatically Send Hardware Information?"
FONT 8, "MS Sans Serif"
@@ -487,7 +483,7 @@ BEGIN
PUSHBUTTON "Cancel",ID_CANCEL,169,135,50,14
END
-IDD_DIALOG_FINISH DIALOG 0, 0, 280, 156
+IDD_DIALOG_FINISH DIALOG 0, 0, 280, 156
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
CAPTION "Configuration Complete!"
FONT 8, "MS Sans Serif"
@@ -496,7 +492,7 @@ BEGIN
PUSHBUTTON "Finish",IDC_BUTTON_PROCEED,223,135,50,14
END
-IDD_DIALOG_RATING DIALOG 0, 0, 315, 311
+IDD_DIALOG_RATING DIALOG 0, 0, 315, 311
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION
CAPTION "Send us your feedback!"
FONT 8, "MS Sans Serif"
@@ -509,7 +505,7 @@ BEGIN
PUSHBUTTON "Finished",IDC_BUTTON_COMPLETE,137,287,62,17
END
-IDD_DIALOG_POLL DIALOG 0, 0, 295, 200
+IDD_DIALOG_POLL DIALOG 0, 0, 295, 200
STYLE DS_SETFONT | WS_CHILD
FONT 8, "MS Sans Serif"
BEGIN
@@ -525,7 +521,7 @@ BEGIN
PUSHBUTTON "Template",IDC_BUTTON_TEMPLATE7,253,79,34,14,WS_DISABLED
END
-IDD_MESSAGEBOX2 DIALOG 0, 0, 413, 142
+IDD_MESSAGEBOX2 DIALOG 0, 0, 413, 142
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Message"
FONT 8, "MS Sans Serif"
@@ -544,8 +540,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION 2,0,0,0
+ PRODUCTVERSION 2,0,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -562,12 +558,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Sony Online Entertainment"
VALUE "FileDescription", "SwgClientSetup MFC Application"
- VALUE "FileVersion", "1, 0, 0, 1"
+ VALUE "FileVersion", "2.0b"
VALUE "InternalName", "SwgClientSetup"
- VALUE "LegalCopyright", "Copyright (C) 2002-2004 Sony Online Entertainment"
- VALUE "OriginalFilename", "SwgClientSetup.EXE"
+ VALUE "LegalCopyright", "Copyright (C) Sony Online Entertainment"
+ VALUE "OriginalFilename", "SwgClientSetup_r.exe"
VALUE "ProductName", "SwgClientSetup Application"
- VALUE "ProductVersion", "1, 0, 0, 1"
+ VALUE "ProductVersion", "2.0b"
END
END
BLOCK "VarFileInfo"
@@ -583,7 +579,7 @@ END
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
+GUIDELINES DESIGNINFO
BEGIN
IDD_SWGCLIENTSETUP_DIALOG, DIALOG
BEGIN
@@ -723,13 +719,13 @@ END
// String Table
//
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_INFO_NUM_PROCESSORS "Number of Processors"
IDS_INFO_CPU_ID "Cpu Identifier"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_INFO_CPU_SPEED "Cpu Speed"
IDS_INFO_CPU_VENDOR "Cpu Vendor"
@@ -738,7 +734,7 @@ BEGIN
IDS_INFO_VIDEO_IDENTIFIER "Video Identifier"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_INFO_VIDEO_DRIVER_VERSION "Video Driver Version"
IDS_INFO_VIDEO_MEMORY_SIZE "Video Memory Size"
@@ -758,7 +754,7 @@ BEGIN
IDS_GRAPHICS_DISABLE_FAST_MOUSE_CURSOR "Disable Fast Mouse Cursor"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_GRAPHICS_USE_SAFE_RENDERER "Use Safe Renderer (slower)"
IDS_SOUND_DISABLE_AUDIO "Disable Audio"
@@ -778,7 +774,7 @@ BEGIN
"This value should be 75% of your total system RAM up to 2 GB (reserving memory for Direct3D and the OS)."
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_DEBUG_CRASH_LOGS "Crash Logs"
IDS_DEBUG_INCLUDE_STATION_ID_IN_LOGS "Include Station Id in crash logs"
@@ -800,7 +796,7 @@ BEGIN
IDS_INFO_DIRECTXVERSION "DirectX Version"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_INFO_TRACKIRVERSION "trackIR Version"
IDS_SENDCRASH_TITLE "Automatically Send Crash Logs?"
@@ -819,7 +815,7 @@ BEGIN
IDS_NO "NO"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_GB "GB"
IDS_SEND_HARDWARE_INFO "In order to help Sony Online Entertainment make better decisions about optimizations and hardware support we would like to be able to survey your hardware configuration from time to time (which will also contain your Station Id in order to count each hardware configuration exactly once). If you elect to automatically send us your hardware configuration by choosing that option below, then you expressly permit, consent to and grant Sony Online Entertainment the right to upload such information from your computer system along with your Station Id from time to time for the sole purpose of analyzing, improving and maintaining the game, and this information will be automatically resent to us whenever your hardware changes."
@@ -840,14 +836,14 @@ BEGIN
IDS_INVALIDCOMMANDLINE "We have detected an error which may result in the inability for the game to function properly. We recommend you try a virus and spyware scan. Do you wish to continue anyway?"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
CG_IDS_PROGRESS_CAPTION "Transmitting diagnostic files..."
IDS_LANGUAGE "Language:"
IDS_ADVANCED_CAPTION "Advanced"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_DEBUG_CAPTION "Debug"
IDS_GAME_CAPTION "Game"
@@ -856,7 +852,7 @@ BEGIN
IDS_SOUND_CAPTION "Sound"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_RESET_IN_GAME "Reset in-game options"
IDS_VSPS_OPTIMAL "Optimal"
@@ -867,7 +863,7 @@ BEGIN
IDS_ANOTHER_INSTANCE "Another instance of this application is already running. Application will now close."
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_NOT_MINIMUM "Your computer may not meet the minimum requirements necessary in order to run Star Wars Galaxies, which requires at least:\n\n"
IDS_ENABLE_JOYSTICKS "Enable Joystick"
@@ -880,13 +876,13 @@ BEGIN
IDS_NICE_MINIMUM "Your computer meets the minimum requirements necessary in order to run Star Wars Galaxies, but in order to get the best experience, we strongly recommend that you upgrade your system to at least:\n\n"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_FINAL_CONFIG "- 250 MB of free disk space\n- DirectX 9\n\nThe application will continue to run, but we cannot guarantee stability or performance."
IDS_512MB_PHYSICAL "- 512 MB of physical memory\n"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_512MB_PHYSICAL_DETECTED
"- 512 MB of physical memory (detected %i MB)\n"
@@ -897,7 +893,7 @@ BEGIN
IDS_32MB_VIDEO_MEMORY "- 32 MB of video memory\n"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_32MB_VIDEO_MEMORY_DETECTED
"- 32 MB of video memory (detected %i MB)\n"
@@ -910,13 +906,13 @@ BEGIN
IDS_THANK_YOU "If you agree to allow Sony Online Entertainment to upload, review and use this information or agree to allow us to contact you but change your mind in the future, you can disable this feature by choosing the \\""Options\\"" button from the LaunchPad, click on the \\""Debug\\"" tab, then change your setting by clicking on \\""Configure\\"". \n\nThank you for your continued support!\n\nStar Wars Galaxies Development Team\n"
END
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_UNKNOWN "Unknown"
IDS_NO_SOUND_CARD "No valid sound card detected"
END
-#endif // English (U.S.) resources
+#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////
@@ -937,7 +933,7 @@ LANGUAGE 9, 1
#pragma code_page(1252)
#endif //_WIN32
#include "res\SwgClientSetup.rc2" // non-Microsoft Visual C++ edited resources
-#include "../../../../../../external/3rd/library/atlmfc/include/afxres.rc" // Standard components
+#include "afxres.rc" // Standard components
#endif
/////////////////////////////////////////////////////////////////////////////