From fb1cb2e2f3af4a7bc5717e31b31175d850dd7be9 Mon Sep 17 00:00:00 2001 From: drumsetmonkey Date: Wed, 9 Dec 2015 08:47:45 -0500 Subject: Made sword swing at screen fps --- assets/BennyHillTheme.wav | Bin 21318852 -> 0 bytes assets/air-horn-club-sample_1.wav | Bin 149804 -> 0 bytes main.cpp | 5 ----- src/ui.cpp | 3 +++ src/world.cpp | 3 +++ 5 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 assets/BennyHillTheme.wav delete mode 100644 assets/air-horn-club-sample_1.wav diff --git a/assets/BennyHillTheme.wav b/assets/BennyHillTheme.wav deleted file mode 100644 index a926902..0000000 Binary files a/assets/BennyHillTheme.wav and /dev/null differ diff --git a/assets/air-horn-club-sample_1.wav b/assets/air-horn-club-sample_1.wav deleted file mode 100644 index 50c5bf8..0000000 Binary files a/assets/air-horn-club-sample_1.wav and /dev/null differ diff --git a/main.cpp b/main.cpp index bde880d..b28a8da 100644 --- a/main.cpp +++ b/main.cpp @@ -829,11 +829,6 @@ void logic(){ * click detection is done as well for NPC/player interaction. * */ - if((SDL_GetMouseState(NULL, NULL) & SDL_BUTTON(SDL_BUTTON_LEFT)) && !ui::dialogBoxExists)player->inv->usingi = true; - if(player->inv->usingi){ - player->inv->useItem(); - } - for(auto &n : currentWorld->npc){ if(n->alive){ /* diff --git a/src/ui.cpp b/src/ui.cpp index 9ab8141..14ad64b 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -612,6 +612,9 @@ DONE: if((e.button.button&SDL_BUTTON_RIGHT)&&dialogBoxExists){ dialogAdvance(); } + if((e.button.button&SDL_BUTTON_LEFT)&&!dialogBoxExists){ + player->inv->usingi = true; + } break; /* KEYDOWN diff --git a/src/world.cpp b/src/world.cpp index 2fd3591..9674b64 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -272,6 +272,9 @@ void World::update(Player *p,unsigned int delta){ p->loc.y += p->vel.y * delta; p->loc.x +=(p->vel.x * p->speed) * delta; + if(p->inv->usingi){ + p->inv->useItem(); + } /* * Update coordinates of all entities except for structures. -- cgit v1.2.3