mirror of
https://github.com/sfall-team/sfall.git
synced 2026-07-27 16:52:34 -07:00
Renamed MPClient folder to DebugEditor
Renamed FalloutClient.exe to FalloutDebug.exe
Fixed a crash bug in commit 82db339 when using the debug editor.
This commit is contained in:
@@ -15,7 +15,8 @@ namespace FalloutClient {
|
||||
if (args.Length == 1 && args[0] == "-debugedit") {
|
||||
Application.Run(new DebugEditor(new EditorConnection()));
|
||||
} else {
|
||||
MessageBox.Show("The debug editor can only be run from the game.",
|
||||
MessageBox.Show("The debug editor can only be run from the game.\n" +
|
||||
"Use the key assigned to the DebugEditorKey option in ddraw.ini to run the debugger.",
|
||||
"sfall Debug Editor", MessageBoxButtons.OK, MessageBoxIcon.Stop);
|
||||
}
|
||||
}
|
||||
@@ -9,14 +9,13 @@
|
||||
<OutputType>WinExe</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>FalloutClient</RootNamespace>
|
||||
<AssemblyName>FalloutClient</AssemblyName>
|
||||
<AssemblyName>FalloutDebug</AssemblyName>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<OldToolsVersion>3.5</OldToolsVersion>
|
||||
<UpgradeBackupLocation>
|
||||
</UpgradeBackupLocation>
|
||||
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<PublishUrl>publish\</PublishUrl>
|
||||
<Install>true</Install>
|
||||
<InstallFrom>Disk</InstallFrom>
|
||||
@@ -29,6 +28,7 @@
|
||||
<MapFileExtensions>true</MapFileExtensions>
|
||||
<ApplicationRevision>0</ApplicationRevision>
|
||||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<BootstrapperEnabled>false</BootstrapperEnabled>
|
||||
</PropertyGroup>
|
||||
@@ -42,14 +42,14 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<DebugType>none</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugSymbols>false</DebugSymbols>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
+1
-1
@@ -207,7 +207,7 @@ FastMoveFromContainer=0
|
||||
|
||||
;A key to press to open a debug game editor
|
||||
;Set to 0 to disable, or a DX scancode otherwise
|
||||
;Requires sfall debugging mode and FalloutClient.exe from the modders pack
|
||||
;Requires sfall debugging mode and FalloutDebug.exe from the modders pack
|
||||
DebugEditorKey=0
|
||||
|
||||
;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
|
||||
|
||||
@@ -123,7 +123,7 @@ static void RunEditorInternal(SOCKET &s) {
|
||||
InternalSend(s, &numArrays, 4);
|
||||
InternalSend(s, &numCritters, 4);
|
||||
|
||||
sGlobalVar* sglobals=new sGlobalVar[numSGlobals];
|
||||
sGlobalVar* sglobals = new sGlobalVar[numSGlobals];
|
||||
GetGlobals(sglobals);
|
||||
|
||||
sArray* arrays = new sArray[numArrays];
|
||||
@@ -147,12 +147,12 @@ static void RunEditorInternal(SOCKET &s) {
|
||||
case CODE_SET_GLOBAL:
|
||||
InternalRecv(s, &id, 4);
|
||||
InternalRecv(s, &val, 4);
|
||||
*ptr_game_global_vars[id] = val;
|
||||
(*ptr_game_global_vars)[id] = val;
|
||||
break;
|
||||
case CODE_SET_MAPVAR:
|
||||
InternalRecv(s, &id, 4);
|
||||
InternalRecv(s, &val, 4);
|
||||
*ptr_map_global_vars[id] = val;
|
||||
(*ptr_map_global_vars)[id] = val;
|
||||
break;
|
||||
case CODE_GET_CRITTER:
|
||||
InternalRecv(s, &id, 4);
|
||||
@@ -270,7 +270,7 @@ void RunDebugEditor() {
|
||||
|
||||
si.cb = sizeof(si);
|
||||
|
||||
if (!CreateProcessA("FalloutClient.exe", "FalloutClient.exe -debugedit", 0, 0, false, 0, 0, 0, &si, &pi)) {
|
||||
if (!CreateProcessA("FalloutDebug.exe", "FalloutDebug.exe -debugedit", 0, 0, false, 0, 0, 0, &si, &pi)) {
|
||||
closesocket(sock);
|
||||
WSACleanup();
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user