Fixed FontImGui, now readable.

ChangeLog.md

@@ -2,6 +2,9 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20150104 ]
+    * FontImGui has started to be useful (larger text, proper size calculation).
+
     [ 20150103 ]
     * Fixed bug in WindowSDL where resizing only worked after calling it two times.
     * Fixed bug in Console that caused its window to get bigger after each launch.

src/system/FontImGui.cpp

@@ -11,14 +11,14 @@
 #include "UI.h"
 #include "system/FontImGui.h"
 
-#define SCALE_CALC 1.0f
-#define SCALE_DRAW 20.0f
+#define SCALE_CALC 30.0f
+#define SCALE_DRAW SCALE_CALC
 
 unsigned int FontImGui::widthText(float scale, std::string s) {
     ImGuiIO& io = ImGui::GetIO();
     ImVec2 size = io.Font->CalcTextSizeA(scale * SCALE_CALC, FLT_MAX, io.DisplaySize.y, s.c_str(),
                                          s.c_str() + s.length());
-    return size.y;
+    return size.x;
 }
 
 void FontImGui::drawText(unsigned int x, unsigned int y, float scale,
@@ -39,7 +39,7 @@ unsigned int FontImGui::heightText(float scale, unsigned int maxWidth, std::stri
     ImGuiIO& io = ImGui::GetIO();
     ImVec2 size = io.Font->CalcTextSizeA(scale * SCALE_CALC, FLT_MAX, maxWidth, s.c_str(),
                                          s.c_str() + s.length());
-    return size.x;
+    return size.y;
 }
 
 void FontImGui::drawTextWrapped(unsigned int x, unsigned int y, float scale,

src/utils/binary.cpp

@@ -105,9 +105,7 @@ int64_t BinaryReader::read64() {
 // ----------------------------------------------------------------------------
 
 BinaryFile::BinaryFile(std::string f) {
-    int r = open(f);
-    if (r != 0)
-        throw r;
+    assert(open(f) == 0);
 }
 
 BinaryFile::~BinaryFile() {
@@ -150,9 +148,7 @@ void BinaryFile::read(char* d, int c) {
 // ----------------------------------------------------------------------------
 
 BinaryMemory::BinaryMemory(const char* d, long long m) : data(nullptr), offset(0), max(-1) {
-    int r = open(d, m);
-    if (r != 0)
-        throw r;
+    assert(open(d, m) == 0);
 }
 
 BinaryMemory::~BinaryMemory() {