diff options
| -rw-r--r-- | Bugs | 14 | ||||
| -rw-r--r-- | Changelog | 1 | ||||
| -rw-r--r-- | src/entities.cpp | 5 | ||||
| -rw-r--r-- | src/main.cpp | 11 | ||||
| -rw-r--r-- | src/ui.cpp | 1 |
5 files changed, 25 insertions, 7 deletions
@@ -0,0 +1,14 @@ +Major bugs: +=========== + + - + +Minor bugs: +=========== + + - + +Maybe bugs: +=========== + + - Player is generated a random name (9/30/15) @@ -53,3 +53,4 @@ - added quest stuff between NPCs and player - began work on giving names to NPCs - began working on config file + - created a bug file diff --git a/src/entities.cpp b/src/entities.cpp index b40ddd4..85505ce 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -19,13 +19,14 @@ void Entity::spawn(float x, float y){ //spawns the entity you pass to it based o } void Entity::draw(void){ //draws the entities - if(type==NPCT) + if(type==NPCT){ if(gender == MALE) glColor3ub(0,0,100); else if(gender == FEMALE) glColor3ub(255,105,180); - else if(type==STRUCTURET) + }else if(type==STRUCTURET){ glColor3ub(100,0,100); + } glRectf(loc.x,loc.y,loc.x+width,loc.y+height); } diff --git a/src/main.cpp b/src/main.cpp index 8b919a2..ea19668 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -23,7 +23,7 @@ Player *player; std::vector<Entity*>entity; std::vector<NPC>npc; -std::vector<Structures>build; +std::vector<Structures *>build; int mx, my; FILE* names; @@ -32,6 +32,7 @@ void logic(); void render(); int entityInteractTest(NPC *speaker){ + ui::dialogBox("Here, have a quest!"); player->qh.assign("Test"); return 1; } @@ -111,12 +112,12 @@ int main(int argc, char *argv[]){ // Make structures entity.push_back(new Entity()); - build.push_back(Structures()); - entity[0]=&build[0]; + build.push_back(new Structures()); + entity[0]=build[0]; static unsigned int i; - build[0].spawn(STRUCTURET,0,10); - build[0].inside=iw; + build[0]->spawn(STRUCTURET,0,10); + build[0]->inside=iw; for(i=0;i<entity.size()+1;i++){ entity[i]->inWorld=test; } @@ -117,6 +117,7 @@ namespace ui { free(buf); } void dialogBox(const char *text){ + //while(dialogBoxExists); dialogBoxExists=true; dialogBoxText=text; } |