Merge branch 'master' into DarkCat09-patch-2

This commit is contained in:
Mikhail Abramov 2019-12-08 15:09:58 +04:00 committed by GitHub
commit c3d7eabd74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,65 +1,64 @@
#include <TXLib.h> #include <TXLib.h>
#include "lib\\Consts.h" #include "lib\\Consts.h"
#include "lib\\ElemFunctions.h" #include "lib\\ElemFunctions.h"
#include "lib\\ModesFunctions.h" #include "lib\\ModesFunctions.h"
#include <iostream> #include <iostream>
using namespace std; using namespace std;
int main()
int main() {
{ txCreateWindow(1300, 600);
txCreateWindow(1300, 600);
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");
fire = txLoadImage("pictures\\fire.bmp");
middleX = txGetExtentX() / 2;
middleX = txGetExtentX() / 2; middleY = txGetExtentY() / 2;
middleY = txGetExtentY() / 2; extentX = txGetExtentX();
extentX = txGetExtentX(); extentY = txGetExtentY();
extentY = txGetExtentY();
background(TX_WHITE);
background(TX_WHITE); txSleep(50);
txSleep(50);
txBegin();
txBegin();
txSleep(1000);
txSleep(1000);
txSetColor(MY_LIGHTBLUE, 2);
txSetColor(MY_LIGHTBLUE, 2); txSetFillColor(TX_WHITE);
txSetFillColor(TX_WHITE); txRectangle(0, 0, extentX, extentY);
txRectangle(0, 0, extentX, extentY);
txSetColor(MY_LIGHTBLUE, 2);
txSetColor(MY_LIGHTBLUE, 2); txSetFillColor(MY_LIGHTBLUE);
txSetFillColor(MY_LIGHTBLUE); txRectangle(0, 0, extentX, 50);
txRectangle(0, 0, extentX, 50);
txSetColor(TX_BLACK, 3);
txSetColor(TX_BLACK, 3); txSetFillColor(TX_WHITE);
txSetFillColor(TX_WHITE); txDrawText(0, 0, extentX, 50, "Êîíñòðóêòîð óðîâíåé èãðû FallSimulation");
txDrawText(0, 0, extentX, 50, "Êîíñòðóêòîð óðîâíåé èãðû FallSimulation");
drawMenu();
drawMenu();
if (lvlCreatingIsStarted) {
if (lvlCreatingIsStarted) { mainFunc();
mainFunc(); }
} else if (gameIsStarted) {
else if (gameIsStarted) { playGame(gettedMapParts);
playGame(gettedMapParts); }
}
txEnd();
txEnd();
txDeleteDC(block);
txDeleteDC(block); txDeleteDC(quest);
txDeleteDC(quest); txDeleteDC(water);
txDeleteDC(water); txDeleteDC(fire);
txDeleteDC(fire);
txDeleteDC(light_stone);
txDeleteDC(light_stone); txDeleteDC(dark_stone);
txDeleteDC(dark_stone); txDeleteDC(vdark_stone);
txDeleteDC(vdark_stone);
txDisableAutoPause();
txDisableAutoPause(); }
}