Merge pull request #20 from IngCenter/DarkCat09-patch-1

Add files via upload
This commit is contained in:
Mikhail Abramov 2019-11-08 20:26:54 +04:00 committed by GitHub
commit cafeac8753
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -59,6 +59,8 @@ void mainFunc();
bool addingBlock(bool clicked, RECT blockBut, HDC pic, bool addingBlock(bool clicked, RECT blockBut, HDC pic,
int blocktype, int* arrElem, MapPart mapParts[]); int blocktype, int* arrElem, MapPart mapParts[]);
void addingStone(int* arrElem, MapPart mapParts[]);
int main() int main()
{ {
txCreateWindow(1300, 600); txCreateWindow(1300, 600);
@ -331,10 +333,6 @@ void mainFunc()
In(txMousePos(), mapParts[i].coords) && txMouseButtons() & 2 && In(txMousePos(), mapParts[i].coords) && txMouseButtons() & 2 &&
!(clickedBlock || clickedQuest || clickedWater || clickedFire)) { !(clickedBlock || clickedQuest || clickedWater || clickedFire)) {
//cout << i;
//cout << arrElem;
//txSleep(1000);
selectedPict = i; selectedPict = i;
mapParts[selectedPict] = mapParts[arrElem - 1]; mapParts[selectedPict] = mapParts[arrElem - 1];
mapParts[arrElem - 1].visible = false; mapParts[arrElem - 1].visible = false;
@ -461,4 +459,38 @@ bool addingBlock(bool clicked, RECT blockBut, HDC pic,
return clicked; return clicked;
} }
void addingStone(int quanOfElemsToRep, int nElemsToRep[], int* arrElem, MapPart mapParts[])
{
HDC pict;
RECT coords;
switch(quanOfElemsToRep)
{
default:
return;
case 2:
pict = light_stone;
case 3:
pict = dark_stone;
case 4:
pict = vdark_stone;
}
coords = mapParts[nElemsToRep[0]].coords;
for (int i = 0; i < quanOfElemsToRep; i++) {
mapParts[nElemsToRep[i]] = mapParts[*arrElem - 1];
mapParts[*arrElem - 1].visible = false;
*arrElem--;
}
mapParts[nElemsToRep[0]] = {
coords, true, pict, BLOCK_TYPE
};
}