diff options
| author |  jonas <himself@jonasgunz.de>
| 2018-12-10 17:04:23 +0100 |
|---|---|---|
| committer | jonas <himself@jonasgunz.de>
| 2018-12-10 17:04:23 +0100 |
| commit | a87a70298aefdcade34739ae2aa3b07436aae328 (patch) | |
| tree | bb366013f51785acabadf842bfd6b5e120908407 | |
| parent | c7ee3d48002585362505b68aabd1093a2877e1cc (diff) | |
| download | termgl-a87a70298aefdcade34739ae2aa3b07436aae328.tar.gz | |
Wrap up for new branchgame
| -rw-r--r-- | AmpelJonas/cCar.cpp | 2 | ||||
| -rw-r--r-- | AmpelJonas/cCrossroad.cpp | 11 | ||||
| -rw-r--r-- | AmpelJonas/cCrossroad.h | 3 | ||||
| -rw-r--r-- | AmpelJonas/stdafx.h | 3 |
4 files changed, 10 insertions, 9 deletions
diff --git a/AmpelJonas/cCar.cpp b/AmpelJonas/cCar.cpp index 212cd7c..50122ac 100644 --- a/AmpelJonas/cCar.cpp +++ b/AmpelJonas/cCar.cpp @@ -81,4 +81,4 @@ void cCar::drive() } break; } -}
\ No newline at end of file +} diff --git a/AmpelJonas/cCrossroad.cpp b/AmpelJonas/cCrossroad.cpp index 10718f6..82c8ed1 100644 --- a/AmpelJonas/cCrossroad.cpp +++ b/AmpelJonas/cCrossroad.cpp @@ -46,8 +46,8 @@ void cCrossroad::run() //init backround->setPosition(0, 0); - backround->drawRectangle('°', '°', sPos{ 0, _SIZE_Y_ / 2 - 4 }, sPos{ _SIZE_X_ - 1, _SIZE_Y_ / 2 + 4 }, _COL_DEFAULT, _COL_DEFAULT); - backround->drawRectangle('°', '°', sPos{ _SIZE_X_ / 2 - 6, 0 }, sPos{ _SIZE_X_ / 2 + 6, _SIZE_Y_ }, _COL_DEFAULT, _COL_DEFAULT); + backround->drawRectangle('�', '�', sPos{ 0, _SIZE_Y_ / 2 - 4 }, sPos{ _SIZE_X_ - 1, _SIZE_Y_ / 2 + 4 }, _COL_DEFAULT, _COL_DEFAULT); + backround->drawRectangle('�', '�', sPos{ _SIZE_X_ / 2 - 6, 0 }, sPos{ _SIZE_X_ / 2 + 6, _SIZE_Y_ }, _COL_DEFAULT, _COL_DEFAULT); //add objects to handler handler.createObject(backround); @@ -153,8 +153,8 @@ void cCrossroad::run() break; } } - - + + carWest.drive(); carEast.drive(); carNorth.drive(); @@ -173,5 +173,6 @@ void cCrossroad::run() iWait--; iFrames++; backround->drawText(to_string(iFrames) , sPos{ 0,0 }, _COL_DEFAULT); //Framecounter + usleep(100*1000); } -}
\ No newline at end of file +} diff --git a/AmpelJonas/cCrossroad.h b/AmpelJonas/cCrossroad.h index 37bec28..18f7352 100644 --- a/AmpelJonas/cCrossroad.h +++ b/AmpelJonas/cCrossroad.h @@ -4,7 +4,6 @@ #define _SIZE_X_ 150 #define _SIZE_Y_ 50 - class cCrossroad { public: @@ -15,4 +14,4 @@ public: private: cRender *render; //cObjectHandler *handler; -};
\ No newline at end of file +}; diff --git a/AmpelJonas/stdafx.h b/AmpelJonas/stdafx.h index 986bfde..1e65f85 100644 --- a/AmpelJonas/stdafx.h +++ b/AmpelJonas/stdafx.h @@ -11,11 +11,12 @@ #ifdef _WIN32 #include <tchar.h> +#elif __linux__ +#include <unistd.h> #endif #include <vector> - #include "cRender.h" #include "cObject.h" #include "cObjectHandler.h" |