DarkCat09/FallSimulator
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

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

Browse source 
Add files via upload
This commit is contained in:
Mikhail Abramov 2019-11-30 22:50:37 +04:00 committed by GitHub
commit 64f6ae7fb7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
FallSimulation.cpp
View file

@ -177,7 +177,7 @@ void drawMenu()
txSleep(50); txSleep(50);
bool flwindow = false; bool flwindow = false;
while (!GetAsyncKeyState('Q')) { while (!GetAsyncKeyState('Q') || !GetAsyncKeyState(VK_ESCAPE)) {
if (!gameIsStarted) { if (!gameIsStarted) {
if (In(txMousePos(), buttonStart.coords) && txMouseButtons() & 1) { if (In(txMousePos(), buttonStart.coords) && txMouseButtons() & 1) {
while (txMouseButtons() & 1) { while (txMouseButtons() & 1) {
@ -196,8 +196,8 @@ void drawMenu()
break; break;
} }
if (In(txMousePos(), buttonHelp.coords)) if (In(txMousePos(), buttonHelp.coords)) {
{
txSetColor(TX_BLACK); txSetColor(TX_BLACK);
txDrawText(buttonHelp.coords.left - 130, txDrawText(buttonHelp.coords.left - 130,
buttonHelp.coords.bottom + 10, buttonHelp.coords.bottom + 10,
@ -205,8 +205,7 @@ void drawMenu()
buttonHelp.coords.bottom + 100, buttonHelp.coords.bottom + 100,
"This hyperlink will be\nopen in browser"); "This hyperlink will be\nopen in browser");
} }
else else {
{
txSetColor(TX_WHITE); txSetColor(TX_WHITE);
txSetFillColor(TX_WHITE); txSetFillColor(TX_WHITE);
txRectangle(buttonHelp.coords.left - 130, txRectangle(buttonHelp.coords.left - 130,
@ -220,7 +219,7 @@ void drawMenu()
txSleep(10); txSleep(10);
} }
system("start help\\help.html"); system("start help\\index.html");
} }
/* /*
if (In(txMousePos(), buttonPlay.coords) && txMouseButtons() & 1) { if (In(txMousePos(), buttonPlay.coords) && txMouseButtons() & 1) {
@ -334,6 +333,8 @@ void mainFunc()
MapPart mapParts[MAP_LENGHT + 1]; MapPart mapParts[MAP_LENGHT + 1];
txSetColor(TX_BLACK, 3);
txSetFillColor(TX_WHITE);
Button completeButton = {doneBut, "\n\nSave\n\nFile"}; Button completeButton = {doneBut, "\n\nSave\n\nFile"};
for (int elem = 0; elem < MAP_LENGHT; elem++) { for (int elem = 0; elem < MAP_LENGHT; elem++) {
@ -384,6 +385,23 @@ void mainFunc()
clickedWater = addingBlock(clickedWater, waterBut, water, WATER_TYPE, &arrElem, mapParts); clickedWater = addingBlock(clickedWater, waterBut, water, WATER_TYPE, &arrElem, mapParts);
clickedFire = addingBlock(clickedFire, fireBut, fire, FIRE_TYPE, &arrElem, mapParts); clickedFire = addingBlock(clickedFire, fireBut, fire, FIRE_TYPE, &arrElem, mapParts);
//checking
if (clickedBlock)
{
clickedQuest = false;
clickedWater = false;
clickedFire = false;
}
else if (clickedQuest)
{
clickedWater = false;
clickedFire = false;
}
else if (clickedWater)
{
clickedFire = false;
}
//selecting block //selecting block
for (int i = 0; i < arrElem; i++) { for (int i = 0; i < arrElem; i++) {
if (selectedPict < 0 && if (selectedPict < 0 &&