From ea486dd770e15b9f1bc288f33aa33e10bd9720ec Mon Sep 17 00:00:00 2001 From: nkorslund Date: Wed, 13 May 2009 17:44:09 +0000 Subject: [PATCH] Last commit before terrain git-svn-id: https://openmw.svn.sourceforge.net/svnroot/openmw/trunk@111 ea6a568a-9f4f-0410-981a-c910a81bb256 --- core/config.d | 2 +- gui/cpp_console.cpp | 2 +- openmw.ini.win32 | 48 --------------------------------------------- 3 files changed, 2 insertions(+), 50 deletions(-) delete mode 100755 openmw.ini.win32 diff --git a/core/config.d b/core/config.d index 458badf04..5a9060d8c 100644 --- a/core/config.d +++ b/core/config.d @@ -217,7 +217,7 @@ struct ConfigManager bind(Keys.PhysMode, KC.T); bind(Keys.Nighteye, KC.N); bind(Keys.ToggleGui, KC.Mouse1); - bind(Keys.Console, KC.F1); + bind(Keys.Console, KC.F1, KC.GRAVE); bind(Keys.Debug, KC.G); bind(Keys.Pause, KC.PAUSE, KC.P); diff --git a/gui/cpp_console.cpp b/gui/cpp_console.cpp index 79f6bfd95..4e8d1a733 100644 --- a/gui/cpp_console.cpp +++ b/gui/cpp_console.cpp @@ -135,7 +135,7 @@ public: else if(res == CR_ERROR) history->addText("#FF2222" + out); else if(res == CR_MORE) - history->addText("#1111FF... more input needed"); + history->addText("#1111FF... more input needed\n"); exit: command->setCaption(""); diff --git a/openmw.ini.win32 b/openmw.ini.win32 deleted file mode 100755 index a4bbb463f..000000000 --- a/openmw.ini.win32 +++ /dev/null @@ -1,48 +0,0 @@ -; Don't write your own comments in this file, they -; will disappear when the file is rewritten. -[General] -Data Directory=c:\Program Files\Bethesda Softworks\Morrowind\Data Files\ -Screenshots=0 -Default Cell=Assu -Show Ogre Config=no -First Run=yes - -[Controls] -Mouse Sensitivity X=0.2 -Mouse Sensitivity Y=0.2 -Flip Mouse Y Axis=no - -[Bindings] -; Key bindings. The strings must match exactly. -Move Left=a,left -Move Right=d,right -Turn Left= -Turn Right= -Move Forward=w,up -Move Backward=s,down -Move Up=left_shift -Move Down=left_ctrl -Increase Main Volume=numpad_plus -Decrease Main Volume=numpad_minus -Increase Music Volume=2 -Decrease Music Volume=1 -Increase SFX Volume=4 -Decrease SFX Volume=3 -Mute Sound=m -Toggle Fullscreen Mode=f -Toggle Battle Music=space -Toggle Physics Mode=t -Toggle Nighteye=n -OGRE Test Action=g -Pause=pause,p -Screen Shot=print_screen -Quick Exit=q,escape - -[Sound] -Main Volume=0.7 -Music Volume=0.5 -SFX Volume=0.5 -Enable Music=yes - -[Game Files] -GameFile[0]=Morrowind.esm