diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-03-24 09:23:53 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-03-24 09:23:53 -0400 |
| commit | cff9c47a543d68f9f661ffcd373bf888ae8671ca (patch) | |
| tree | ed7338df3351b22cd7fa24f4a0bed8279db920d4 /src/ui.cpp | |
| parent | 75a3ceb61ad4816ce03e6b615de2ce9331452aaa (diff) | |
| parent | c9bce16570160af24ae7f1f04249aa0e8313fb06 (diff) | |
npc world walking
Diffstat (limited to 'src/ui.cpp')
| -rw-r--r-- | src/ui.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -878,8 +878,7 @@ namespace ui { void quitGame(){ dialogBoxExists = false; - //delete[] currentMenu; - //currentMenu = NULL; + currentMenu = NULL; gameRunning = false; updateConfig(); saveConfig(); @@ -1488,7 +1487,9 @@ EXIT: heyOhLetsGo = 0; break; case SDLK_l: - player->light ^= true; + currentWorld->addLight({player->loc.x + SCREEN_WIDTH/2, player->loc.y},{1.0f,1.0f,1.0f}); + currentWorld->light.back().follow(player); + currentWorld->light.back().makeFlame(); break; case SDLK_f: currentWorld->addLight({player->loc.x + SCREEN_WIDTH/2, player->loc.y},{1.0f,1.0f,1.0f}); @@ -1508,13 +1509,14 @@ EXIT: case SDLK_b: currentWorld->addStructure(FIRE_PIT, player->loc.x, player->loc.y, "", ""); currentWorld->addLight({player->loc.x + SCREEN_WIDTH/2, player->loc.y},{1.0f,1.0f,1.0f}); + currentWorld->light.back().follow(currentWorld->build.back()); + currentWorld->light.back().makeFlame(); break; case SDLK_F12: // Make the BYTE array, factor of 3 because it's RBG. static GLubyte* pixels; pixels = new GLubyte[ 3 * SCREEN_WIDTH * SCREEN_HEIGHT]; glReadPixels(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, GL_RGB, GL_UNSIGNED_BYTE, pixels); - //static std::thread scr; //scr = std::thread(takeScreenshot,pixels); //scr.detach(); |