Merge pull request #114 from mad-s/master

Various bug fixes
This commit is contained in:
Jeffrey Han 2015-08-08 10:45:03 -05:00
commit cd59c332ab
3 changed files with 3 additions and 3 deletions

View File

@ -87,7 +87,7 @@ public abstract class Curve {
Curve.borderColor = borderColor;
ContextCapabilities capabilities = GLContext.getCapabilities();
mmsliderSupported = capabilities.GL_EXT_framebuffer_object && capabilities.OpenGL30;
mmsliderSupported = capabilities.GL_EXT_framebuffer_object && capabilities.OpenGL33;
if (mmsliderSupported)
CurveRenderState.init(width, height, circleSize);
else {

View File

@ -501,7 +501,7 @@ public class MainMenu extends BasicGameState {
else if (repoButton != null && repoButton.contains(x, y)) {
try {
Desktop.getDesktop().browse(Options.REPOSITORY_URI);
} catch (IOException e) {
} catch (IOException | UnsupportedOperationException e) {
ErrorHandler.error("Could not browse to repository URI.", e, false);
}
}

View File

@ -1233,7 +1233,7 @@ public class Input {
}
while (Mouse.next()) {
if (Mouse.getEventButton() >= 0) {
if (Mouse.getEventButton() >= 0 && Mouse.getEventButton() < mousePressed.length) {
if (Mouse.getEventButtonState()) {
consumed = false;
mousePressed[Mouse.getEventButton()] = true;