From 7f89a11032ec8f5fa44b6590cc464c5bdc75262c Mon Sep 17 00:00:00 2001 From: lufinkey Date: Sun, 20 Jul 2014 14:25:23 -0400 Subject: [PATCH] Small bug fixes minor bug fixes. Fixed crashing when winners screen came up --- Source/SmashBros/Loader.cpp | 4 ++-- Source/SmashBros/Preferences.cpp | 2 +- Source/SmashBros/Stage.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/SmashBros/Loader.cpp b/Source/SmashBros/Loader.cpp index c064c6e..643b750 100644 --- a/Source/SmashBros/Loader.cpp +++ b/Source/SmashBros/Loader.cpp @@ -164,11 +164,11 @@ namespace SmashBros animations.add(win); Animation* winhold = new Animation("win_hold", winhold_fps, winhold_rows, winhold_cols); - win->addFrame(charFolder + "/win_hold.png"); + winhold->addFrame(charFolder + "/win_hold.png"); animations.add(winhold); Animation* lose = new Animation("lose", lose_fps, lose_rows, lose_cols); - win->addFrame(charFolder + "/lose.png"); + lose->addFrame(charFolder + "/lose.png"); animations.add(lose); return animations; diff --git a/Source/SmashBros/Preferences.cpp b/Source/SmashBros/Preferences.cpp index 3b2a284..9e53784 100644 --- a/Source/SmashBros/Preferences.cpp +++ b/Source/SmashBros/Preferences.cpp @@ -17,7 +17,7 @@ namespace SmashBros bool Preferences::debuglog = false; - String Preferences::versionMessage = (String)"Welcome to iSSB v2.2, I apologize sincerely for the lack of updates. I have been incredibly " + String Preferences::versionMessage = (String)"Welcome to iSSB v2.2! I apologize sincerely for the lack of updates. I have been incredibly " +"busy over the past few months. To make up for it, I have added Pikachu as a new character! Please " +"consider donating by going to \"Options\", selecting \"Other\", and then selecting \"Donate\". Thank you!"; diff --git a/Source/SmashBros/Stage.cpp b/Source/SmashBros/Stage.cpp index 76e409e..12c0213 100644 --- a/Source/SmashBros/Stage.cpp +++ b/Source/SmashBros/Stage.cpp @@ -252,7 +252,7 @@ namespace SmashBros break; case BG_FIXED: - background->drawFrame(null, g, 0, View::x, View::y, View::x + (float)View::ScaleWidth(), View::y + (float)View::ScaleHeight()); + background->drawFrame(null, g, 0, View::x, View::y, View::x + (float)View::ScaleWidth() + 1, View::y + (float)View::ScaleHeight() + 1); //background->drawFrame(null, g, 0, View::x, View::y, (float)View::ScaleWidth(), (float)View::ScaleHeight()); break; }