don't adjust aspect-ratio in non-fullscreen modes, removed a few unneeded headers

[supertux.git] / src / console.cpp

diff --git a/src/console.cpp b/src/console.cpp
index fc5c1cc..d636f67 100644 (file)
--- a/src/console.cpp
+++ b/src/console.cpp
@@ -20,6 +20,7 @@
 
 #include <iostream>
 #include <SDL_timer.h>
+#include <SDL_keyboard.h>
 #include "console.hpp"
 #include "video/drawing_context.hpp"
 #include "video/surface.hpp"
@@ -329,8 +330,10 @@ Console::addLine(std::string s)
 
   // wrap long lines
   std::string overflow;
+  unsigned int line_count = 0;
   do {
     lines.push_front(Font::wrap_to_chars(s, 99, &overflow));
+    line_count++;
     s = overflow;
   } while (s.length() > 0);
 
@@ -342,7 +345,7 @@ Console::addLine(std::string s)
   if (height < 64) {
     if(height < 4)
       height = 4;
-    height += fontheight;
+    height += fontheight * line_count;
   }
 
   // reset console to full opacity