Merge pull request #14 from IngCenter/Chirakov-patch-1
Add files via upload
This commit is contained in:
commit
5c7306d5a8
1 changed files with 43 additions and 2 deletions
|
@ -38,6 +38,7 @@ struct MapPart {
|
||||||
HDC block;
|
HDC block;
|
||||||
HDC quest;
|
HDC quest;
|
||||||
HDC water;
|
HDC water;
|
||||||
|
HDC fire;
|
||||||
|
|
||||||
HDC orange_but;
|
HDC orange_but;
|
||||||
HDC green_but;
|
HDC green_but;
|
||||||
|
@ -57,6 +58,7 @@ int main()
|
||||||
block = txLoadImage("pictures\\block.bmp");
|
block = txLoadImage("pictures\\block.bmp");
|
||||||
quest = txLoadImage("pictures\\question.bmp");
|
quest = txLoadImage("pictures\\question.bmp");
|
||||||
water = txLoadImage("pictures\\water.bmp");
|
water = txLoadImage("pictures\\water.bmp");
|
||||||
|
fire = txLoadImage("pictures\\fire.bmp");
|
||||||
//orange_but = txLoadImage("pictures\\orange-but.bmp");
|
//orange_but = txLoadImage("pictures\\orange-but.bmp");
|
||||||
//green_but = txLoadImage("pictures\\green-but.bmp");
|
//green_but = txLoadImage("pictures\\green-but.bmp");
|
||||||
//blue_but = txLoadImage("pictures\\blue-but.bmp");
|
//blue_but = txLoadImage("pictures\\blue-but.bmp");
|
||||||
|
@ -93,7 +95,7 @@ int main()
|
||||||
txDeleteDC(block);
|
txDeleteDC(block);
|
||||||
txDeleteDC(quest);
|
txDeleteDC(quest);
|
||||||
txDeleteDC(water);
|
txDeleteDC(water);
|
||||||
//txDeleteDC(fire);
|
txDeleteDC(fire);
|
||||||
|
|
||||||
txDisableAutoPause();
|
txDisableAutoPause();
|
||||||
}
|
}
|
||||||
|
@ -233,11 +235,17 @@ void mainFunc()
|
||||||
RECT waterBut = {
|
RECT waterBut = {
|
||||||
extentX - BLOCK_SIZE, 2 * BLOCK_SIZE, extentX, 3 * BLOCK_SIZE
|
extentX - BLOCK_SIZE, 2 * BLOCK_SIZE, extentX, 3 * BLOCK_SIZE
|
||||||
};
|
};
|
||||||
|
RECT fireBut = {
|
||||||
|
extentX - BLOCK_SIZE, 3* BLOCK_SIZE, extentX, 4 * BLOCK_SIZE
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
RECT doneBut = {
|
RECT doneBut = {
|
||||||
extentX - 60, extentY - 60, extentX, extentY
|
extentX - 60, extentY - 60, extentX, extentY
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
MapPart mapParts[MAP_LENGHT + 1];
|
MapPart mapParts[MAP_LENGHT + 1];
|
||||||
|
|
||||||
Button completeButton = {doneBut, "Done"};
|
Button completeButton = {doneBut, "Done"};
|
||||||
|
@ -249,7 +257,7 @@ void mainFunc()
|
||||||
bool clickedBlock = false;
|
bool clickedBlock = false;
|
||||||
bool clickedQuest = false;
|
bool clickedQuest = false;
|
||||||
bool clickedWater = false;
|
bool clickedWater = false;
|
||||||
bool clickedFire = false;
|
bool clickedfire = false;
|
||||||
|
|
||||||
while (!GetAsyncKeyState('Q')) {
|
while (!GetAsyncKeyState('Q')) {
|
||||||
background(TX_WHITE);
|
background(TX_WHITE);
|
||||||
|
@ -262,6 +270,8 @@ void mainFunc()
|
||||||
|
|
||||||
Win32::TransparentBlt(txDC(), waterBut.left, waterBut.top, 120, 120, water,
|
Win32::TransparentBlt(txDC(), waterBut.left, waterBut.top, 120, 120, water,
|
||||||
0, 0, 60, 60, -1);
|
0, 0, 60, 60, -1);
|
||||||
|
Win32::TransparentBlt(txDC(), fireBut.left, fireBut.top, 120, 120, fire,
|
||||||
|
0, 0, 60, 60, -1);
|
||||||
|
|
||||||
drawButton(completeButton, false);
|
drawButton(completeButton, false);
|
||||||
|
|
||||||
|
@ -364,6 +374,33 @@ void mainFunc()
|
||||||
clickedWater = false;
|
clickedWater = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//block "fire"
|
||||||
|
if (In(txMousePos(), fireBut) && txMouseButtons() & 1) {
|
||||||
|
clickedfire = true;
|
||||||
|
}
|
||||||
|
if (txMouseButtons() & 1 && clickedfire) {
|
||||||
|
txBitBlt(txDC(), txMouseX() - 30, txMouseY() - 30, 60, 60, fire);
|
||||||
|
}
|
||||||
|
if (!(txMouseButtons() & 1) && clickedfire) {
|
||||||
|
|
||||||
|
if (arrElem < MAP_LENGHT) {
|
||||||
|
mapParts[arrElem] = {
|
||||||
|
{
|
||||||
|
txMouseX() - 30, txMouseY() - 30, txMouseX() + 30, txMouseY() + 30
|
||||||
|
}, true, fire, FIRE_TYPE
|
||||||
|
};
|
||||||
|
arrElem++;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
char maplen_str[50];
|
||||||
|
sprintf(maplen_str, "You cannot add more than %d blocks", MAP_LENGHT);
|
||||||
|
txMessageBox(maplen_str, "Error");
|
||||||
|
arrElem--;
|
||||||
|
}
|
||||||
|
|
||||||
|
clickedfire = false;
|
||||||
|
}
|
||||||
|
|
||||||
//button to complete LevelCreating
|
//button to complete LevelCreating
|
||||||
if (In(txMousePos(), doneBut) && txMouseButtons() & 1) {
|
if (In(txMousePos(), doneBut) && txMouseButtons() & 1) {
|
||||||
while (txMouseButtons() & 1) {
|
while (txMouseButtons() & 1) {
|
||||||
|
@ -385,6 +422,9 @@ void mainFunc()
|
||||||
case WATER_TYPE:
|
case WATER_TYPE:
|
||||||
lvlfile << "Water,";
|
lvlfile << "Water,";
|
||||||
break;
|
break;
|
||||||
|
case FIRE_TYPE:
|
||||||
|
lvlfile << "Fire,";
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
lvlfile << mapParts[elem].coords.left;
|
lvlfile << mapParts[elem].coords.left;
|
||||||
|
@ -405,3 +445,4 @@ void mainFunc()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue