Volume Mixer

diff --cc src/gameplay.cpp
Simple merge

diff --cc src/ui.cpp
index 937367c522dd744920cebcc047fdf1704622e6d1,f11efca8339ca722c5bd18afd7333055e7b97c23..f6668747e4553f61b7d9c8356f3506deaa699c5c
--- 1/src/ui.cpp
--- 2/src/ui.cpp
+++ b/src/ui.cpp
@@@ -976,7 -938,6 +976,7 @@@ namespace ui 
                fwrite(&bgr, 1,3*SCREEN_WIDTH*SCREEN_HEIGHT,bmp);
  
                delete[] pixels;
- 
++              
                fclose(bmp);
        }