# HG changeset patch # User Xeli # Date 1337640043 -7200 # Node ID aacb90365d3d0e029d0569837ab9a0d97aff8ec2 # Parent 9007531f813f01af4d132cecd23c4f646b4f7b28 fixed wheelup/down Wheel up and down used to be swapped in both binds.cpp and uKeys.pas (2 wrongs make a right eh) After I fixed uKeys zooming was inverted, so I changed binds.cpp too, but now existing teams will still have its zoom inverted.. diff -r 9007531f813f -r aacb90365d3d QTfrontend/binds.cpp --- a/QTfrontend/binds.cpp Mon May 21 22:54:34 2012 +0200 +++ b/QTfrontend/binds.cpp Tue May 22 00:40:43 2012 +0200 @@ -52,8 +52,8 @@ {"+cur_r", "[6]", QT_TRANSLATE_NOOP("binds", "right"), NULL, NULL}, {"+cur_d", "[2]", QT_TRANSLATE_NOOP("binds", "down"), NULL, NULL}, // {"+cur_m", "", QT_TRANSLATE_NOOP("binds", "movement key modifier"), NULL, QT_TRANSLATE_NOOP("binds (descriptions)", "Specify a modifier key to move camera and cursor using your default hog movement keys:")}, - {"zoomin", "wheeldown", QT_TRANSLATE_NOOP("binds", "zoom in"), NULL, QT_TRANSLATE_NOOP("binds (descriptions)", "Modify the camera's zoom level:")}, - {"zoomout", "wheelup", QT_TRANSLATE_NOOP("binds", "zoom out"), NULL, NULL}, + {"zoomin", "wheelup", QT_TRANSLATE_NOOP("binds", "zoom in"), NULL, QT_TRANSLATE_NOOP("binds (descriptions)", "Modify the camera's zoom level:")}, + {"zoomout", "wheeldown", QT_TRANSLATE_NOOP("binds", "zoom out"), NULL, NULL}, {"zoomreset", "mousem", QT_TRANSLATE_NOOP("binds", "reset zoom"), NULL, NULL}, {"chat", "t", QT_TRANSLATE_NOOP("binds", "chat"), QT_TRANSLATE_NOOP("binds (categories)", "Other"), QT_TRANSLATE_NOOP("binds (descriptions)", "Talk to your team or all participants:")}, {"history", "`", QT_TRANSLATE_NOOP("binds", "chat history"), NULL, NULL}, diff -r 9007531f813f -r aacb90365d3d hedgewars/uInputHandler.pas --- a/hedgewars/uInputHandler.pas Mon May 21 22:54:34 2012 +0200 +++ b/hedgewars/uInputHandler.pas Tue May 22 00:40:43 2012 +0200 @@ -192,7 +192,7 @@ for i:= 6 to cKeyMaxIndex do begin s:= shortstring(sdl_getkeyname(i)); - //WriteToConsole(IntToStr(i) + ': ' + s + ' ' + IntToStr(cKeyMaxIndex)); + //WriteLnToConsole(IntToStr(i) + ': ' + s + ' ' + IntToStr(cKeyMaxIndex)); if s = 'unknown key' then KeyNames[i]:= '' else begin @@ -250,8 +250,8 @@ DefaultBinds[KeyNameToCode(_S'y')]:= 'confirm'; DefaultBinds[KeyNameToCode('mousem')]:= 'zoomreset'; -DefaultBinds[KeyNameToCode('wheelup')]:= 'zoomout'; -DefaultBinds[KeyNameToCode('wheeldown')]:= 'zoomin'; +DefaultBinds[KeyNameToCode('wheelup')]:= 'zoomin'; +DefaultBinds[KeyNameToCode('wheeldown')]:= 'zoomout'; DefaultBinds[KeyNameToCode('f12')]:= 'fullscr';