Merge branch 'master' of mx.cogentleman.com:cogentleman/guitarHeroButBetter
This commit is contained in:
commit
81142c0ef0
@ -31,10 +31,10 @@ public:
|
|||||||
static const Color BORDER_COLOR;
|
static const Color BORDER_COLOR;
|
||||||
|
|
||||||
static constexpr const char* INSTRUMENT_IMAGE_PATHS[MAX_INSTRUMENT_TYPES] = {
|
static constexpr const char* INSTRUMENT_IMAGE_PATHS[MAX_INSTRUMENT_TYPES] = {
|
||||||
"assets/instrument_0.png",
|
"assets/instruments/guitar.png",
|
||||||
"assets/instrument_1.png",
|
"assets/instruments/piano.png",
|
||||||
"assets/instrument_2.png",
|
"assets/instruments/violin.png",
|
||||||
"assets/instrument_3.png",
|
"assets/instruments/sax.png",
|
||||||
};
|
};
|
||||||
|
|
||||||
std::array<int, MAX_INSTRUMENT_TYPES> instrument_owner = {-1, -1, -1, -1};
|
std::array<int, MAX_INSTRUMENT_TYPES> instrument_owner = {-1, -1, -1, -1};
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user