diff options
| -rw-r--r-- | main.cpp | 4 | ||||
| -rw-r--r-- | src/world.cpp | 6 |
2 files changed, 6 insertions, 4 deletions
@@ -321,6 +321,7 @@ int main(/*int argc, char *argv[]*/){ */ SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); + SDL_GL_SetSwapInterval(0); glViewport(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); @@ -407,6 +408,7 @@ int main(/*int argc, char *argv[]*/){ **** GAMELOOP **** **************************/ + std::cout << "Num threads: " << std::thread::hardware_concurrency() << std::endl; gameRunning = true; while(gameRunning){ mainLoop(); @@ -462,6 +464,7 @@ void mainLoop(void){ currentTime = millis(); deltaTime = currentTime - prevTime; + if(currentMenu)goto MENU; /* @@ -475,7 +478,6 @@ void mainLoop(void){ currentWorld->bgmPlay(prev); ui::dialogBoxExists = false; } - if(prevPrevTime + MSEC_PER_TICK <= currentTime){ logic(); prevPrevTime = currentTime; diff --git a/src/world.cpp b/src/world.cpp index 971325c..b2e1cfb 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -333,12 +333,12 @@ void World::update(Player *p,unsigned int delta){ } for(unsigned int i=0;i<particles.size();i++){ - if(particles[i]->kill(deltaTime)){ + if(particles[i]->kill(delta)){ delete particles[i]; particles.erase(particles.begin()+i); }else if(particles[i]->canMove){ - particles[i]->loc.y += particles[i]->vely * deltaTime; - particles[i]->loc.x += particles[i]->velx * deltaTime; + particles[i]->loc.y += particles[i]->vely * delta; + particles[i]->loc.x += particles[i]->velx * delta; for(auto &b : build){ if(b->bsubtype==FOUNTAIN){ |