Increase minimum threshold for barrel damage to reduce likelihood of blowing one up on jumping out, increase damage to compensate (may need tweaking). Only apply dX for collision w/ kick if barrel is rolling.

#include <QtGui/QApplication>
#include "editor.h"

int main(int argc, char *argv[])
{
    QApplication a(argc, argv);
    editor w;
    w.show();
    return a.exec();
}