Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix hard rock coordinate modifier in replays. (fixes #118)

Browse Source 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han 2015-08-10 17:14:02 -05:00
parent e68bcf8abc
commit a4898d01a7
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/itdelatrisu/opsu/GameData.java
View File

@ -1037,9 +1037,9 @@ public class GameData {
* or {@code Grade.NULL} if no objects have been processed. * or {@code Grade.NULL} if no objects have been processed.
*/ */
private Grade getGrade() { private Grade getGrade() {
boolean silver = scoreData==null? boolean silver = (scoreData == null) ?
(GameMod.HIDDEN.isActive() || GameMod.FLASHLIGHT.isActive()): (GameMod.HIDDEN.isActive() || GameMod.FLASHLIGHT.isActive()) :
(scoreData.mods&(GameMod.HIDDEN.getBit()|GameMod.FLASHLIGHT.getBit()))!=0; (scoreData.mods & (GameMod.HIDDEN.getBit() | GameMod.FLASHLIGHT.getBit())) != 0;
return getGrade( return getGrade(
hitResultCount[HIT_300], hitResultCount[HIT_100], hitResultCount[HIT_300], hitResultCount[HIT_100],
hitResultCount[HIT_50], hitResultCount[HIT_MISS], hitResultCount[HIT_50], hitResultCount[HIT_MISS],

11
src/itdelatrisu/opsu/states/Game.java
View File

@ -1103,6 +1103,13 @@ public class Game extends BasicGameState {
// restart the game // restart the game
if (restart != Restart.FALSE) { if (restart != Restart.FALSE) {
// load mods
if (isReplay) {
previousMods = GameMod.getModState();
GameMod.loadModState(replay.mods);
}
// check restart state
if (restart == Restart.NEW) { if (restart == Restart.NEW) {
// new game // new game
loadImages(); loadImages();
@ -1187,10 +1194,6 @@ public class Game extends BasicGameState {
// load replay frames // load replay frames
if (isReplay) { if (isReplay) {
// load mods
previousMods = GameMod.getModState();
GameMod.loadModState(replay.mods);
// load initial data // load initial data
replayX = container.getWidth() / 2; replayX = container.getWidth() / 2;
replayY = container.getHeight() / 2; replayY = container.getHeight() / 2;