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-08 12:41:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Format adjustment .

Browse source
This commit is contained in:
Zero Fanker 2024-05-19 11:19:13 -04:00
parent 800cd951b6
commit f1b969219a
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MissionEditor/INIMeta.cpp
View file

@ -13,7 +13,7 @@ const CIniFile* IniFileGroup::Nth(int idx) const
return m_group.at(idx);
}
const CString& IniFileGroup::GetString(const CString & section, const CString & key) const
const CString& IniFileGroup::GetString(const CString& section, const CString & key) const
{
for (auto it = m_group.rbegin(); it != m_group.rend(); ++it) {
auto const& got = (*it)->GetString(section, key);

19
MissionEditor/IsoView.cpp
View file

@ -547,24 +547,33 @@ inline void CalculateHouseColorPalette(int house_pal[houseColorRelMax + 1], cons
/*
There is no need for newpal
*/
__forceinline void BlitPic(void* dst, int x, int y, int dleft, int dtop, int dpitch, int dright, int dbottom, PICDATA& pd, int* color = NULL, const int* newPal = NULL)//BYTE* src, int swidth, int sheight)
__forceinline void BlitPic(void* dst, int x, int y, int dleft, int dtop, int dpitch, int dright, int dbottom,
PICDATA& pd, int* color = NULL, const int* newPal = NULL)//BYTE* src, int swidth, int sheight)
{
ASSERT(pd.bType != PICDATA_TYPE_BMP);
if (newPal == NULL) newPal = pd.pal;
if (newPal == NULL) {
newPal = pd.pal;
}
BYTE* src = (BYTE*)pd.pic;
int swidth = pd.wMaxWidth;
int sheight = pd.wMaxHeight;
if (src == NULL || dst == NULL) return;
if (src == NULL || dst == NULL) {
return;
}
//x += 1;
//y += 1;
//y -= f_y;
if (x + swidth < dleft || y + sheight < dtop) return;
if (x >= dright || y >= dbottom) return;
if (x + swidth < dleft || y + sheight < dtop) {
return;
}
if (x >= dright || y >= dbottom) {
return;
}
RECT blrect;