diff options
| -rw-r--r-- | Changelog | 7 | ||||
| -rw-r--r-- | include/ui.hpp | 3 | ||||
| -rw-r--r-- | src/inventory.cpp | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -918,3 +918,10 @@ - adopted indent style: linuxxxx kernel - began converting pointers to better things - parentheses + +4/15/2016: +========== + + - fixed segfaults in inventory + - Andy learned how to use GDB + - fixed diff --git a/include/ui.hpp b/include/ui.hpp index df81bab..3aaeb00 100644 --- a/include/ui.hpp +++ b/include/ui.hpp @@ -14,9 +14,10 @@ #include <ui_menu.hpp> #include <ft2build.h> +#include FT_FREETYPE_H + #include <SDL2/SDL_opengl.h> #include <thread> -#include FT_FREETYPE_H #define SDL_KEY e.key.keysym.sym diff --git a/src/inventory.cpp b/src/inventory.cpp index 8bde00e..224ee12 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -508,7 +508,7 @@ void Inventory::draw(void) { std::cout << "drawing" << std::endl; glEnable(GL_TEXTURE_2D); glBindTexture(GL_TEXTURE_2D, itemtex[items[a].id]); - glColor4f(1.0f, 1.0f, 1.0f, 1.0fa); + glColor4f(1.0f, 1.0f, 1.0f, 1.0f); glBegin(GL_QUADS); if (itemMap[items[a].id]->height > itemMap[items[a].id]->width) { glTexCoord2i(0,1);glVertex2i(r.end.x-((itemWide/2)*((float)itemMap[items[a].id]->width/(float)itemMap[items[a].id]->height)), r.end.y-(itemWide/2)); |