mirror of
https://github.com/open-goal/jak-project
synced 2026-05-23 15:02:01 -04:00
[game] pc port progress menu (#1281)
* fix typo * more typo * shorten discord rpc text * allow expanding enums after the fact (untested) * make `game_text` work similar to subtitles * update progress decomp * update some types + `do-not-decompile` in bitfield * fixes and fall back to original progress code * update `progress` decomp with new enums * update config files * fix enums and debug menu * always allocate (but not use) a lot of particles * small rework to display mode options * revert resolution/aspect-ratio symbol mess * begin the override stuff * make `progress-draw` more readable * more fixes * codacy good boy points * first step overriding code * finish progress overrides, game options menu fully functional! * minor fixes * Update game.gp * Update sparticle-launcher.gc * clang * change camera controls text * oops * some cleanup * derp * nice job * implement menu scrolling lol * make scrollable menus less cramped, fix arrows * make some carousell things i guess * add msaa carousell to test * oops * Update progress-pc.gc * make `pc-get-screen-size` (untested) * resolution menu * input fixes * return when selecting resolution * scroll fixes * Update progress-pc.gc * add "fit to screen" button * bug * complete resolutions menu * aspect ratio menu * subtitles language * subtitle speaker * final adjustments * ref test * fix tests * fix ref! * reduce redundancy a bit * fix mem leaks? * save settings on progress exit * fix init reorder * remove unused code * rename goal project-like files to the project extension * sha display toggle * aspect ratio settings fixes * dont store text db's in compiler * properly save+load native aspect stuff
This commit is contained in:
@@ -206,9 +206,9 @@ TEST(GoosReader, Symbol) {
|
||||
|
||||
namespace {
|
||||
bool first_list_matches(Object o, std::vector<Object> stuff) {
|
||||
auto lst = o.as_pair()->cdr.as_pair()->car;
|
||||
auto& lst = o.as_pair()->cdr.as_pair()->car;
|
||||
for (const auto& x : stuff) {
|
||||
const auto check = x.as_pair()->cdr.as_pair()->car;
|
||||
const auto& check = x.as_pair()->cdr.as_pair()->car;
|
||||
if (lst.as_pair()->car != check) {
|
||||
return false;
|
||||
}
|
||||
@@ -233,11 +233,11 @@ bool first_array_matches(Object o, std::vector<Object> stuff) {
|
||||
}
|
||||
|
||||
bool first_pair_matches(Object o, Object car, Object cdr) {
|
||||
auto lst = o.as_pair()->cdr.as_pair()->car;
|
||||
auto& lst = o.as_pair()->cdr.as_pair()->car;
|
||||
return (lst.as_pair()->car == car) && (lst.as_pair()->cdr == cdr);
|
||||
}
|
||||
|
||||
bool print_matches(Object o, std::string expected) {
|
||||
bool print_matches(Object o, const std::string& expected) {
|
||||
return o.as_pair()->cdr.as_pair()->car.print() == expected;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user