tiberium/CNC_TS_and_RA2_Mission_Editor
1
0
Fork 0
mirror of https://github.com/electronicarts/CNC_TS_and_RA2_Mission_Editor.git synced 2025-05-06 03:31:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Silence some compile warning .

Browse source
This commit is contained in:
Zero Fanker 2024-05-19 11:45:25 -04:00
parent 4171effebf
commit 6627e9563c
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
MissionEditor/Loading.cpp
View file

@ -1554,7 +1554,7 @@ void CLoading::LoadBuilding(const CString& ID)
// No turret
if (!rules.GetBool(ID, "Turret")) {
DictName.Format("%s%d", ID, 0);
DictName.Format("%s%d", ID.operator LPCSTR(), 0);
SetImageData(pBuffer, DictName, width, height, m_palettes.LoadPalette(PaletteName));
return;
}
@ -1911,7 +1911,7 @@ void CLoading::LoadVehicleOrAircraft(const CString& ID)
if (!bHasTurret) {
for (int i = 0; i < 8; ++i) {
CString DictName;
DictName.Format("%s%d", ImageID, i);
DictName.Format("%s%d", ImageID.operator LPCSTR(), i);
unsigned char* outBuffer;
int outW = 0x100, outH = 0x100;
@ -1973,7 +1973,7 @@ void CLoading::LoadVehicleOrAircraft(const CString& ID)
for (int i = 0; i < 8; ++i) {
CString DictName;
DictName.Format("%s%d", ImageID, i);
DictName.Format("%s%d", ImageID.operator LPCSTR(), i);
unsigned char* outBuffer;
int outW = 0x100, outH = 0x100;
@ -1984,17 +1984,17 @@ void CLoading::LoadVehicleOrAircraft(const CString& ID)
}
CString pKey;
if (pTurretImage[i]) {
pKey.Format("%sX%d", ID, i);
pKey.Format("%sX%d", ID.operator LPCSTR(), i);
int turdeltaX = g_data.GetInteger("VehicleVoxelTurretsRA2", pKey);
pKey.Format("%sY%d", ID, i);
pKey.Format("%sY%d", ID.operator LPCSTR(), i);
int turdeltaY = g_data.GetInteger("VehicleVoxelTurretsRA2", pKey);
VXL_Add(pTurretImage[i], turretrect[i].X + turdeltaX, turretrect[i].Y + turdeltaY, turretrect[i].Width, turretrect[i].Height);
delete[] pTurretImage[i];
if (pBarrelImage[i]) {
pKey.Format("%sX%d", ID, i);
pKey.Format("%sX%d", ID.operator LPCSTR(), i);
int barldeltaX = g_data.GetInteger("VehicleVoxelBarrelsRA2", pKey);
pKey.Format("%sY%d", ID, i);
pKey.Format("%sY%d", ID.operator LPCSTR(), i);
int barldeltaY = g_data.GetInteger("VehicleVoxelBarrelsRA2", pKey);
VXL_Add(pBarrelImage[i], barrelrect[i].X + barldeltaX, barrelrect[i].Y + barldeltaY, barrelrect[i].Width, barrelrect[i].Height);