diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/entities.cpp | 8 | ||||
| -rw-r--r-- | src/gameplay.cpp | 1 | ||||
| -rw-r--r-- | src/ui.cpp | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/entities.cpp b/src/entities.cpp index 7cd413c..c307a31 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -1,6 +1,8 @@ #include <entities.h> #include <ui.h> +#include <unistd.h> + extern FILE* names; extern unsigned int loops; @@ -462,7 +464,11 @@ void Mob::wander(int timeRun){ case MS_TRIGGER: if(player->loc.x + player->width / 2 > loc.x && player->loc.x + player->width / 2 < loc.x + width ){ - hey(this); + //if(!vfork()){ + hey(this); + /*_exit(0); + }*/ + } break; case MS_DOOR: diff --git a/src/gameplay.cpp b/src/gameplay.cpp index 2361029..ba2c8d9 100644 --- a/src/gameplay.cpp +++ b/src/gameplay.cpp @@ -42,6 +42,7 @@ float gen_worldSpawnHill3(float x){ */ void worldSpawnHill1_hillBlock(Mob *callee){ + std::cout<<"oi"; player->vel.x = 0; player->loc.x = callee->loc.x + callee->width; ui::dialogBox(player->name,NULL,false,"This hill seems to steep to climb up..."); @@ -512,7 +512,7 @@ namespace ui { glVertex2f(x+1+SCREEN_WIDTH-HLINE*16,y+1); glVertex2f(x+1+SCREEN_WIDTH-HLINE*16,y-1-SCREEN_HEIGHT/4); glVertex2f(x-1 ,y-1-SCREEN_HEIGHT/4); - glVertex2f(x-1 ,y+2); + glVertex2f(x ,y+1); glEnd(); glColor3ub(0,0,0); |