yeti cleanup and death animation rework, hitbox fix ups

[supertux.git] / src / console.hpp

diff --git a/src/console.hpp b/src/console.hpp
index fd728df..ff93571 100644 (file)
--- a/src/console.hpp
+++ b/src/console.hpp
@@ -1,5 +1,5 @@
-//  $Id: worldmap.hpp 3209 2006-04-02 22:19:22Z sommer $
-// 
+//  $Id$
+//
 //  SuperTux - Console
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
 //
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -26,12 +26,14 @@
 #include <string>
 #include <sstream>
 #include <iostream>
+#include <squirrel.h>
 
 class Console;
 class ConsoleStreamBuffer;
 class ConsoleCommandReceiver;
 class DrawingContext;
 class Surface;
+class Font;
 
 class Console 
 {
@@ -86,11 +88,16 @@ private:
   
   std::auto_ptr<Surface> background; /**< console background image */
   std::auto_ptr<Surface> background2; /**< second, moving console background image */
+
+  HSQUIRRELVM vm; /**< squirrel thread for the console (with custom roottable */
+  HSQOBJECT vm_object;
   
   int backgroundOffset; /**< current offset of scrolling background image */
   float height; /**< height of the console in px */
+  float alpha;
   int offset; /**< decrease to scroll text up */
   bool focused; /**< true if console has input focus */
+  std::auto_ptr<Font> font;
 
   float stayOpen;