Removed playfield image, use menu-background instead.

Separate "playfield" images are no longer supported in osu!. Signed-off-by: Jeffrey Han <[email protected]>
itdelatrisu · Jan 6, 2017 · c250fce · c250fce
1 parent 0ef1e8b
commit c250fce
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/res/playfield.png b/res/playfield.png
diff --git a/src/itdelatrisu/opsu/GameImage.java b/src/itdelatrisu/opsu/GameImage.java
@@ -78,13 +78,6 @@ protected Image process_sub(Image img, int w, int h) {
 	HITCIRCLE_SELECT ("hitcircleselect", "png"),
 	UNRANKED ("play-unranked", "png"),
 	FOLLOWPOINT ("followpoint", "png"),
-	PLAYFIELD ("playfield", "png|jpg", false, false) {
-		@Override
-		protected Image process_sub(Image img, int w, int h) {
-			img.setAlpha(0.7f);
-			return img.getScaledCopy(w, h);
-		}
-	},
 
 	// Game Pause/Fail
 	PAUSE_CONTINUE ("pause-continue", "png"),

diff --git a/src/itdelatrisu/opsu/states/Game.java b/src/itdelatrisu/opsu/states/Game.java
@@ -368,7 +368,7 @@ else if (deathTime > -1)  // "Easy" mod: health bar increasing
 				dimLevel = 1f;
 		}
 		if (Options.isDefaultPlayfieldForced() || !beatmap.drawBackground(width, height, dimLevel, false)) {
-			Image playfield = GameImage.PLAYFIELD.getImage();
+			Image playfield = GameImage.MENU_BG.getImage();
 			playfield.setAlpha(dimLevel);
 			playfield.draw();
 			playfield.setAlpha(1f);

diff --git a/src/itdelatrisu/opsu/states/GameRanking.java b/src/itdelatrisu/opsu/states/GameRanking.java
@@ -109,8 +109,12 @@ public void render(GameContainer container, StateBasedGame game, Graphics g)
 		Beatmap beatmap = MusicController.getBeatmap();
 
 		// background
-		if (!beatmap.drawBackground(width, height, 0.5f, true))
-			GameImage.PLAYFIELD.getImage().draw(0,0);
+		if (!beatmap.drawBackground(width, height, 0.5f, true)) {
+			Image playfield = GameImage.MENU_BG.getImage();
+			playfield.setAlpha(0.5f);
+			playfield.draw();
+			playfield.setAlpha(1f);
+		}
 
 		// ranking screen elements
 		data.drawRankingElements(g, beatmap, animationProgress.getTime());

diff --git a/src/itdelatrisu/opsu/states/SongMenu.java b/src/itdelatrisu/opsu/states/SongMenu.java
@@ -496,8 +496,12 @@ public void render(GameContainer container, StateBasedGame game, Graphics g)
 		// background
 		if (focusNode != null) {
 			Beatmap focusNodeBeatmap = focusNode.getSelectedBeatmap();
-			if (!focusNodeBeatmap.drawBackground(width, height, bgAlpha.getValue(), true))
-				GameImage.PLAYFIELD.getImage().draw();
+			if (!focusNodeBeatmap.drawBackground(width, height, bgAlpha.getValue(), true)) {
+				Image playfield = GameImage.MENU_BG.getImage();
+				playfield.setAlpha(bgAlpha.getValue());
+				playfield.draw();
+				playfield.setAlpha(1f);
+			}
 		}
 
 		// star stream