Skip to content

Commit 6a82926

Browse files
Synchronize changes from 1.6 branch [ci skip]
133d943 Fix build error
2 parents d983d18 + 133d943 commit 6a82926

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

Client/multiplayer_sa/CMultiplayerSA_Direct3D.cpp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ void _cdecl OnPreCreateDevice(IDirect3D9* pDirect3D, UINT Adapter, D3DDEVTYPE De
6060
else
6161
{
6262
ms_hasDeviceArgs = false;
63-
AddReportLog(8740, SString("OnPreCreateDevice: missing device arguments for alt startup path"));
63+
SString message;
64+
message = "OnPreCreateDevice: missing device arguments for alt startup path";
65+
AddReportLog(8740, message);
6466
}
6567
}
6668

@@ -127,20 +129,26 @@ HRESULT _cdecl OnPostCreateDevice(HRESULT hResult)
127129

128130
if (!ms_hasDeviceArgs)
129131
{
130-
AddReportLog(8741, SString("OnPostCreateDevice: device arguments were not captured; skipping alt startup logic"));
132+
SString message;
133+
message = "OnPostCreateDevice: device arguments were not captured; skipping alt startup logic";
134+
AddReportLog(8741, message);
131135
return hResult;
132136
}
133137

134138
if (!SharedUtil::IsReadablePointer(ms_ppReturnedDeviceInterface, sizeof(*ms_ppReturnedDeviceInterface)))
135139
{
136-
AddReportLog(8742, SString("OnPostCreateDevice: invalid device pointer reference %p", ms_ppReturnedDeviceInterface));
140+
SString message;
141+
message.Format("OnPostCreateDevice: invalid device pointer reference %p", ms_ppReturnedDeviceInterface);
142+
AddReportLog(8742, message);
137143
ms_hasDeviceArgs = false;
138144
return hResult;
139145
}
140146

141147
if (!SharedUtil::IsReadablePointer(ms_pPresentationParameters, sizeof(*ms_pPresentationParameters)))
142148
{
143-
AddReportLog(8743, SString("OnPostCreateDevice: invalid presentation parameters pointer %p", ms_pPresentationParameters));
149+
SString message;
150+
message.Format("OnPostCreateDevice: invalid presentation parameters pointer %p", ms_pPresentationParameters);
151+
AddReportLog(8743, message);
144152
ms_hasDeviceArgs = false;
145153
return hResult;
146154
}

0 commit comments

Comments
 (0)