Small bug fixes

minor bug fixes. Fixed crashing when winners screen came up
lufinkey · Jul 20, 2014 · 7f89a11 · 7f89a11
1 parent 983aebe
commit 7f89a11
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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;
 			}