Mercurial > fife-parpg

diff engine/core/gui/console/console.cpp @ 684:4f36c890b1dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Merged the 0.3.3dev branche changes to the trunk.
author helios2000@33b003aa-7bff-0310-803a-e67f0ece8222
date Mon, 06 Dec 2010 19:25:27 +0000
parents 16c2b3ee59ce
children
line wrap: on
line diff
--- a/engine/core/gui/console/console.cpp	Mon Dec 06 18:37:18 2010 +0000
+++ b/engine/core/gui/console/console.cpp	Mon Dec 06 19:25:27 2010 +0000
@@ -47,7 +47,7 @@
 	const unsigned  Console::m_maxOutputRows = 50;
 	static Logger _log(LM_CONSOLE);
 
-	Console::Console() 
+	Console::Console()
 		: gcn::Container(),
 		m_consoleexec(0),
 		m_input(new CommandLine()),
@@ -90,7 +90,7 @@
 	void Console::reLayout() {
 		Image* screen = RenderBackend::instance()->getScreenImage();
 		assert(screen);
-		
+
 		int w, h, b, input_h, bbar_h, button_w;
 		w = screen->getWidth() * 4/5;
 		h = screen->getHeight() * 4/5;
@@ -98,7 +98,7 @@
 		input_h = getFont()->getHeight();
 		bbar_h = input_h;
 		button_w = 80;
-		
+
 		gcn::Color black(0x00,0,0,0xff);
 		gcn::Color white(0xff,0xff,0xff,0xff);
 		gcn::Color dark(50,60,50,0xff);
@@ -147,7 +147,7 @@
 
 	Console::~Console() {
 		doHide();
-		
+
 		remove(m_input);
 		remove(m_outputscrollarea);
 		remove(m_status);
@@ -165,7 +165,7 @@
 		caption += boost::lexical_cast<std::string>(fps);
 		m_status->setCaption( caption );
 	}
-	
+
 	void Console::updateAnimation() {
 	    if (m_hiding){
 		setPosition(getX(), getY() - m_animationDelta);
@@ -246,8 +246,8 @@
 			}
 		}
 		catch (const FIFE::Exception & e) {
-			FL_WARN(_log, LMsg("Console caught exception: ") << e.getMessage());
-			println(e.getMessage());
+			FL_WARN(_log, LMsg("Console caught exception: ") << e.what());
+			println(e.what());
 		}
 	}