Merge commit '61214e743288ffe8a58cf7876bd8f7f435397571' into master-merge

diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp
index 387bb621e5a6315655138c26af7735cfd85bf15f..9d89bbfb0be952eddd95670299d5f06f76a705df 100644 (file)
--- a/radiant/camwindow.cpp
+++ b/radiant/camwindow.cpp
@@ -2060,23 +2060,23 @@ void CamWnd_Construct(){
        GlobalShortcuts_insert( "CameraBack", Accelerator( GDK_KEY_Down ) );
        GlobalShortcuts_insert( "CameraLeft", Accelerator( GDK_KEY_Left ) );
        GlobalShortcuts_insert( "CameraRight", Accelerator( GDK_KEY_Right ) );
-       GlobalShortcuts_insert( "CameraStrafeRight", Accelerator( GDK_KEY_period ) );
-       GlobalShortcuts_insert( "CameraStrafeLeft", Accelerator( GDK_KEY_comma ) );
+       GlobalShortcuts_insert( "CameraStrafeRight", Accelerator( 'D' ) );
+       GlobalShortcuts_insert( "CameraStrafeLeft", Accelerator( 'A' ) );
 
        GlobalShortcuts_insert( "CameraUp", accelerator_null() );
        GlobalShortcuts_insert( "CameraDown", accelerator_null() );
        GlobalShortcuts_insert( "CameraAngleUp", accelerator_null() );
        GlobalShortcuts_insert( "CameraAngleDown", accelerator_null() );
 
-       GlobalShortcuts_insert( "CameraFreeMoveForward", Accelerator( GDK_Up ) );
-       GlobalShortcuts_insert( "CameraFreeMoveBack", Accelerator( GDK_Down ) );
-       GlobalShortcuts_insert( "CameraFreeMoveLeft", Accelerator( GDK_Left ) );
-       GlobalShortcuts_insert( "CameraFreeMoveRight", Accelerator( GDK_Right ) );
+       GlobalShortcuts_insert( "CameraFreeMoveForward", Accelerator( 'W' ) );
+       GlobalShortcuts_insert( "CameraFreeMoveBack", Accelerator( 'S' ) );
+       GlobalShortcuts_insert( "CameraFreeMoveLeft", Accelerator( 'A' ) );
+       GlobalShortcuts_insert( "CameraFreeMoveRight", Accelerator( 'D' ) );
 
-       GlobalShortcuts_insert( "CameraFreeMoveForward2", Accelerator( GDK_Up ) );
-       GlobalShortcuts_insert( "CameraFreeMoveBack2", Accelerator( GDK_Down ) );
-       GlobalShortcuts_insert( "CameraFreeMoveLeft2", Accelerator( GDK_Left ) );
-       GlobalShortcuts_insert( "CameraFreeMoveRight2", Accelerator( GDK_Right ) );
+       GlobalShortcuts_insert( "CameraFreeMoveForward2", Accelerator( GDK_KEY_Up ) );
+       GlobalShortcuts_insert( "CameraFreeMoveBack2", Accelerator( GDK_KEY_Down ) );
+       GlobalShortcuts_insert( "CameraFreeMoveLeft2", Accelerator( GDK_KEY_Left ) );
+       GlobalShortcuts_insert( "CameraFreeMoveRight2", Accelerator( GDK_KEY_Right ) );
 
        GlobalShortcuts_insert( "CameraFreeMoveUp", accelerator_null() );
        GlobalShortcuts_insert( "CameraFreeMoveDown", accelerator_null() );

diff --git a/tools/quake3/q3map2/main.c b/tools/quake3/q3map2/main.c
index d36a6ea2d4dfb95e0b7d2bc90cdddf02ffbdc289..c5ed2c2b33087fe187e6f254b1bbd834531913a1 100644 (file)
--- a/tools/quake3/q3map2/main.c
+++ b/tools/quake3/q3map2/main.c
@@ -220,6 +220,8 @@ int ShiftBSPMain( int argc, char **argv ){
        {
                //find point on plane
                for ( j=0; j<3; j++ ){
+                       // This line being commented out is an unexplained change by Garux
+                       // see dd7f4f1689e8ede7580bdfa8e08d0b78d08f5253
                        //point[j] = bspPlanes[ i ].dist * bspPlanes[ i ].normal[j];
                        if ( fabs( bspPlanes[ i ].normal[j] ) > 0.5 ){
                                point[j] = bspPlanes[ i ].dist / bspPlanes[ i ].normal[j];