SquareGameLiberationFront/jujube
1
0
Fork 0
mirror of synced 2025-02-02 20:37:25 +01:00
Code Releases Activity

It's POOR not EARLY/LATE idiot

Browse Source
This commit is contained in:
Stepland 2020-04-30 21:00:57 +02:00
parent d97bfdc0ec
commit 917e44dac0
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Resources/Marker.cpp
View File

@ -34,7 +34,7 @@ namespace Resources {
{"fps", mm.fps}, {"fps", mm.fps},
{"approach", mm.approach}, {"approach", mm.approach},
{"miss", mm.miss}, {"miss", mm.miss},
{"early", mm.early}, {"poor", mm.poor},
{"good", mm.good}, {"good", mm.good},
{"great", mm.great}, {"great", mm.great},
{"perfect", mm.perfect} {"perfect", mm.perfect}
@ -47,7 +47,7 @@ namespace Resources {
j.at("fps").get_to(mm.fps); j.at("fps").get_to(mm.fps);
j.at("approach").get_to(mm.approach); j.at("approach").get_to(mm.approach);
j.at("miss").get_to(mm.miss); j.at("miss").get_to(mm.miss);
j.at("early").get_to(mm.early); j.at("poor").get_to(mm.poor);
j.at("good").get_to(mm.good); j.at("good").get_to(mm.good);
j.at("great").get_to(mm.great); j.at("great").get_to(mm.great);
j.at("perfect").get_to(mm.perfect); j.at("perfect").get_to(mm.perfect);
@ -58,7 +58,7 @@ namespace Resources {
m_metadata(), m_metadata(),
m_approach(), m_approach(),
m_miss(), m_miss(),
m_early(), m_poor(),
m_good(), m_good(),
m_great(), m_great(),
m_perfect() m_perfect()
@ -75,7 +75,7 @@ namespace Resources {
j.get_to(m_metadata); j.get_to(m_metadata);
load_and_check(m_approach, m_metadata.approach); load_and_check(m_approach, m_metadata.approach);
load_and_check(m_miss, m_metadata.miss); load_and_check(m_miss, m_metadata.miss);
load_and_check(m_early, m_metadata.early); load_and_check(m_poor, m_metadata.poor);
load_and_check(m_good, m_metadata.good); load_and_check(m_good, m_metadata.good);
load_and_check(m_great, m_metadata.great); load_and_check(m_great, m_metadata.great);
load_and_check(m_perfect, m_metadata.perfect); load_and_check(m_perfect, m_metadata.perfect);
@ -143,8 +143,8 @@ namespace Resources {
case MarkerAnimation::MISS: case MarkerAnimation::MISS:
return m_miss; return m_miss;
break; break;
case MarkerAnimation::EARLY: case MarkerAnimation::POOR:
return m_early; return m_poor;
break; break;
case MarkerAnimation::GOOD: case MarkerAnimation::GOOD:
return m_good; return m_good;
@ -168,8 +168,8 @@ namespace Resources {
case MarkerAnimation::MISS: case MarkerAnimation::MISS:
return m_metadata.miss; return m_metadata.miss;
break; break;
case MarkerAnimation::EARLY: case MarkerAnimation::POOR:
return m_metadata.early; return m_metadata.poor;
break; break;
case MarkerAnimation::GOOD: case MarkerAnimation::GOOD:
return m_metadata.good; return m_metadata.good;

6
src/Resources/Marker.hpp
View File

@ -11,7 +11,7 @@ namespace Resources {
enum class MarkerAnimation { enum class MarkerAnimation {
APPROACH, APPROACH,
MISS, MISS,
EARLY, // or LATE POOR,
GOOD, GOOD,
GREAT, GREAT,
PERFECT PERFECT
@ -34,7 +34,7 @@ namespace Resources {
std::size_t fps; // classic jubeat markers are 30 fps std::size_t fps; // classic jubeat markers are 30 fps
MarkerAnimationMetadata approach; MarkerAnimationMetadata approach;
MarkerAnimationMetadata miss; MarkerAnimationMetadata miss;
MarkerAnimationMetadata early; MarkerAnimationMetadata poor;
MarkerAnimationMetadata good; MarkerAnimationMetadata good;
MarkerAnimationMetadata great; MarkerAnimationMetadata great;
MarkerAnimationMetadata perfect; MarkerAnimationMetadata perfect;
@ -55,7 +55,7 @@ namespace Resources {
MarkerMetadata m_metadata; MarkerMetadata m_metadata;
sf::Texture m_approach; sf::Texture m_approach;
sf::Texture m_miss; sf::Texture m_miss;
sf::Texture m_early; sf::Texture m_poor;
sf::Texture m_good; sf::Texture m_good;
sf::Texture m_great; sf::Texture m_great;
sf::Texture m_perfect; sf::Texture m_perfect;