diff --git a/field.cpp b/field.cpp index f08f8478778b335e330d0d3fba49aced67ffb146..5cba29b43df2c5308bf0e784d379110d60b6c4a7 100644 --- a/field.cpp +++ b/field.cpp @@ -3,44 +3,89 @@ using namespace genv; -Field::Field(Application* parent, int x, int y, int meret, int ertek): - Widget(parent, x, y, meret, meret), _ertek(ertek) +Field::Field(Application* parent, int x, int y, int meret, int index, int ertek): + Widget(parent, x, y, meret, meret), _index(index), _ertek(ertek) { _fix=_ertek; + _aura=false; } void Field::rajzol() const { - if (_kijelolt) //keret - gout << color(light_purple); + /// keret + if (_kijelolt) + { + if (_fix) + gout << color(light_grey); + else + gout << color(light_purple); + } else - gout << color(dark_purple); - + { + if (_fix) + gout << color(dark_grey); + else + gout << color(dark_purple); + } gout << move_to(_x,_y) << box(_szel,_mag); - if (_kijelolt) //hatter + /// hatter + if (_kijelolt) { if (_fix) - gout << color(white); + gout << color(dark_grey); else gout << color(dark_purple); } + else if (_aura) + { + if (_fix) + gout << color(mid_grey); + else + gout << color(mid_purple); + } else - gout << color(bg_purple); - + { + if (_fix) + gout << color(light_grey); + else + gout << color(light_purple); + } gout << move_to(_x+1,_y+1) << box(_szel-2,_mag-2); - if (_kijelolt) //szoveg + /// vonalak + if (_kijelolt) + { + if (_fix) + gout << color(light_grey); + else + gout << color(light_purple); + } + else + { + if (_fix) + gout << color(dark_grey); + else + gout << color(dark_purple); + } + + if ((_index%9) % 3 ==0) // bal + gout << move_to(_x+1,_y) << line(0,_mag); + if ((_index%9) % 3 ==2) //jobb + gout << move_to(_x+_szel-2,_y) << line(0,_mag); + + /// szoveg + if (_kijelolt) { if (_fix) - gout << color(black); + gout << color(light_grey); else gout << color(light_purple); } else { if (_fix) - gout << color(black); + gout << color(dark_grey); else gout << color(dark_purple); } diff --git a/field.hpp b/field.hpp index cabf4ecbf21bb5ce30e728bc0813d42b4f6b1f9f..e6a632c602390620912ab0f3af5c43d48cadf3c9 100644 --- a/field.hpp +++ b/field.hpp @@ -7,7 +7,7 @@ class Field : public Widget { public: - Field(Application* parent, int x, int y, int meret, int ertek); + Field(Application* parent, int x, int y, int meret, int index, int ertek); virtual void rajzol() const override; virtual void kezel(genv::event) override; @@ -16,6 +16,8 @@ class Field : public Widget protected: int _ertek; bool _fix; + bool _aura; + int _index; }; diff --git a/main.cpp b/main.cpp index 21833cc72eef5218df731b025bdf4fb1593d9e19..160cc68a0ecbcae3c4eb082f5970f2117459cf54 100644 --- a/main.cpp +++ b/main.cpp @@ -20,7 +20,7 @@ class MyApp : public Application { for (int i=0; i<9; i++) { - Field *f = new Field(this,i*78,j*78,78,game_kezdo[9*j+i]); + Field *f = new Field(this,i*78,j*78,78,9*j+i,game_kezdo[9*j+i]); palya.push_back(f); } } diff --git a/save.txt b/save.txt deleted file mode 100644 index 76742c850b6ab9890f942195c55b91f91ca7366b..0000000000000000000000000000000000000000 --- a/save.txt +++ /dev/null @@ -1 +0,0 @@ -9 8 5 6 0 1 0 0 0 0 0 6 5 4 0 0 2 1 0 0 0 0 3 0 0 0 0 8 0 7 9 0 4 1 0 0 5 3 0 0 0 7 9 8 6 1 9 0 8 0 0 0 0 0 0 0 3 0 7 0 6 0 0 0 2 0 0 8 5 3 0 0 7 0 8 3 0 6 0 0 0 diff --git a/widget.hpp b/widget.hpp index 2fd3ea51535e4b9e6c0d64e539cf9e325cb37d99..0bc87597b8b4c979f58784fbedca783b707a0906 100644 --- a/widget.hpp +++ b/widget.hpp @@ -4,11 +4,18 @@ #include "graphics.hpp" #include "application.hpp" -#define dark_purple 130,37,184 +/*#define dark_purple 130,37,184 #define light_purple 210,145,255 #define bg_purple 246,232,255 #define white 255,255,255 -#define black 0,0,0 +#define black 0,0,0*/ + +#define dark_purple 56,0,102 +#define mid_purple 133,133,255 +#define light_purple 204,204,255 +#define dark_grey 51,51,51 +#define mid_grey 191,191,191 +#define light_grey 230,230,230 class Widget {