diff --git a/app.cpp b/app.cpp index 6113352da696f8b71a779c3a2797da1b51ec382c..ed5732e447bab43e95767970071b90c60c3fa237 100644 --- a/app.cpp +++ b/app.cpp @@ -54,20 +54,8 @@ void App::event_loop() { } else if(ev.type == ev_key) { - if(ev.keycode == key_enter) - action("enter"); - - if(ev.keycode == key_pgdn) - action("checkbox_-10"); - - else if(ev.keycode == key_pgup) - action("checkbox_10"); - - else if(ev.keycode == key_up) - action("checkbox_1"); - - else if(ev.keycode == key_down) - action("checkbox_-1"); + /*if(ev.keycode == key_enter) + action("enter");*/ } if (focus!=-1) { widgets[focus]->handle(ev); diff --git a/main.cpp b/main.cpp index 6501adb3883fbefbe1b269fee544d02e066a19a9..c29b70ed4dce12e3f9d9b2e1cc6c278902f5af58 100644 --- a/main.cpp +++ b/main.cpp @@ -3,12 +3,12 @@ #include "app.hpp" #include "pont.hpp" #include "korong.hpp" +//#include "jatekmester.hpp" #include <vector> #include <string> #include <fstream> #include <iostream> -#include <cmath> using namespace std; using namespace genv; @@ -49,15 +49,21 @@ public: jatekos.push_back(new Korong(this, xj, y, 25, 1)); ellenfel.push_back(new Korong(this, xe, y, 25, 0)); } + + //gameManager = new JatekMester(pontok, jatekos, ellenfel); } void action(string id) - {} + { + + + } protected: vector<vector<Pont*>> pontok; vector<Korong*> jatekos; vector<Korong*> ellenfel; + //JatekMester* gameManager; }; int main() diff --git a/pont.cpp b/pont.cpp index 90a73e18e0f546f7f7a224f45874cdaaa25e5617..fd9f4d44584c4612e22e6de5e3f089a081922c96 100644 --- a/pont.cpp +++ b/pont.cpp @@ -44,3 +44,8 @@ void Pont::handle(event ev) } } } + +vector<int> Pont::koordinata() const +{ + return {_x, _y}; +} diff --git a/pont.hpp b/pont.hpp index 0eca1a9f8f35af446e03facbe476caf4236cde86..d8b84b17c345188e5ccc7d5ed4f9da6c87b7645f 100644 --- a/pont.hpp +++ b/pont.hpp @@ -15,6 +15,7 @@ public: virtual void draw() override; virtual void handle(genv::event ev) override; virtual bool is_selected(int mouse_x, int mouse_y) override; + std::vector<int> koordinata() const; }; #endif // PONT_HPP diff --git a/widgets.cpp b/widgets.cpp index 66e44181821ff6c647b788a78e73659855bf8f26..248cf674a1ea7265c932d066e56bc0fbf9818467 100644 --- a/widgets.cpp +++ b/widgets.cpp @@ -1,6 +1,7 @@ #include "widgets.hpp" #include "graphics.hpp" #include "app.hpp" + using namespace genv; Widget::Widget(App *parent, int x, int y, int sx, int sy) :