Fixed some bugs

diff --git a/Changelog b/Changelog
index e73cd1019dd88750c1a37160f54a2531efd78a28..2f6b9ce1abf2ae83701ba40919b4c88ffdcd420b 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -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 df81babaa61747d985cd0f78d04c6a90aa9e779a..3aaeb0016dc210cbf679c5c08898e370e2a4ddfd 100644 (file)
--- 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 8bde00e51e864cbe29ab80dfd62fc0f3dc83477f..224ee121cc75f2143538859a88bbc4eedb04d637 100644 (file)
--- 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));