Post merge fixes

platform/nspire/Texure.cpp

@@ -4,7 +4,6 @@
 #include "render/Pixel.h"
 #include "utility/misc.h"
 #include "lodepng.h"
-#include "Input.h"
 #include "Graphics.h"
 using WalrusRPG::Graphics::Black;
 using WalrusRPG::Graphics::Pixel;

src/engine/StateMachine.cpp

@@ -2,7 +2,7 @@
 #include "Timing.h"
 #include "platform.h"
 #include "Graphics.h"
-// #include "render/Text.h"
+#include "render/Text.h"
 #include "version.h"
 #include "input/Input.h"
 
@@ -101,11 +101,11 @@ void STATEMACHINE::run()
             stack.back()->render(100 * frame_time / TIMER_FREQ);
             last_frame = frame_stamp;
 
-            // Text::print_format(0, 0,0 "WalrusRPG test build %s", git_version);
+            Text::print_format(0, 0,"WalrusRPG test build %s", git_version);
             if (frame_time != 0 && update_time != 0)
             {
-                // Text::print_format(0, 240 - 8, "%ufps, %uups", TIMER_FREQ / frame_time,
-                //                    TIMER_FREQ / update_time);
+                Text::print_format(0, 240 - 8, "%ufps, %uups", TIMER_FREQ / frame_time,
+                                   TIMER_FREQ / update_time);
             }
             draw_buttons();
             Graphics::frame_end();

src/utility/misc.cpp

@@ -1,2 +0,0 @@
-#include "misc.h"
-#include <cstdint>