diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2015-09-30 08:50:20 -0400 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2015-09-30 08:50:20 -0400 |
| commit | a9f617e28ed109786cbdf9457878a2837d292a9a (patch) | |
| tree | 492711bb44f97397298006c2e52f4ac8a6f3b19a /src/main.cpp | |
| parent | f39124d141ca3faaa63dd30ba87905837ae47b48 (diff) | |
Started names and genders
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index d5fe3fd..27bb616 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -26,8 +26,6 @@ std::vector<NPC>npc; std::vector<Structures>build; int mx, my; - -FILE* config; FILE* names; void logic(); @@ -90,6 +88,7 @@ int main(int argc, char *argv[]){ // WORLD GENERATION STUFF // //************************************************************************// + names = fopen("assets/names_en-us", "r+"); // Make a world World *test=new World(); test->generate(SCREEN_WIDTH/2); @@ -120,7 +119,6 @@ int main(int argc, char *argv[]){ //************************************************************************// // END WORLD GENERATION STUFF // //************************************************************************// - currentTime=millis(); while(gameRunning){ prevTime = currentTime; @@ -216,7 +214,7 @@ void logic(){ for(int i=0;i<=entity.size();i++){ if(entity[i]->alive&&entity[i]->type == NPCT){ entity[i]->wander((rand()%120 + 30), &entity[i]->vel); - if( pow((entity[i]->loc.x - player->loc.x),2) + pow((entity[i]->loc.y - player->loc.y),2) <= pow(35*HLINE,2)){ + if( pow((entity[i]->loc.x - player->loc.x),2) + pow((entity[i]->loc.y - player->loc.y),2) <= pow(40*HLINE,2)){ if(mx >= entity[i]->loc.x && mx <= entity[i]->loc.x + entity[i]->width && my >= entity[i]->loc.y && my <= entity[i]->loc.y + entity[i]->width && (SDL_GetMouseState(NULL, NULL) & SDL_BUTTON(SDL_BUTTON_RIGHT))) entity[i]->interact(); |