In rP17729 we added a workaround to deal with the "waterugly" setting. The options code would look much cleaner if we could remove this.
To do this, we only have to rename the "waterugly". This in fact makes the water manager code more readable too.
Details
Details
Make sure that it compiles, that the setting works as intended in a running game and is saved correctly between game restarts.
Diff Detail
Diff Detail
- Repository
- rP 0 A.D. Public Repository
- Branch
- /ps/trunk
- Lint
Lint OK - Unit
No Unit Test Coverage - Build Status
Buildable 2850 Build 4905: Vulcan Build (Windows) Jenkins Build 4904: Vulcan Build Jenkins Build 4903: arc lint + arc unit
Event Timeline
Comment Actions
Executing section Default... Executing section Source... Executing section JS... binaries/data/mods/public/gui/options/options.js | 112| » » onUpdate·=·function(key,·keyRenderer) | | [NORMAL] ESLintBear (no-shadow): | | 'key' is already declared in the upper scope. binaries/data/mods/public/gui/options/options.js | 112| » » onUpdate·=·function(key,·keyRenderer) | | [NORMAL] ESLintBear (no-shadow): | | 'keyRenderer' is already declared in the upper scope. binaries/data/mods/public/gui/options/options.js | 157| » » onUpdate·=·function(key,·callbackFunction,·minvalue,·maxvalue) | | [NORMAL] ESLintBear (no-shadow): | | 'key' is already declared in the upper scope. binaries/data/mods/public/gui/options/options.js | 157| » » onUpdate·=·function(key,·callbackFunction,·minvalue,·maxvalue) | | [NORMAL] ESLintBear (no-shadow): | | 'callbackFunction' is already declared in the upper scope. binaries/data/mods/public/gui/options/options.js | 157| » » onUpdate·=·function(key,·callbackFunction,·minvalue,·maxvalue) | | [NORMAL] ESLintBear (no-shadow): | | 'minvalue' is already declared in the upper scope. binaries/data/mods/public/gui/options/options.js | 157| » » onUpdate·=·function(key,·callbackFunction,·minvalue,·maxvalue) | | [NORMAL] ESLintBear (no-shadow): | | 'maxvalue' is already declared in the upper scope. binaries/data/mods/public/gui/options/options.js | 218| » » onUpdate·=·function(key,·functionBody,·minval,·maxval) | | [NORMAL] ESLintBear (no-shadow): | | 'key' is already declared in the upper scope. binaries/data/mods/public/gui/options/options.js | 218| » » onUpdate·=·function(key,·functionBody,·minval,·maxval) | | [NORMAL] ESLintBear (no-shadow): | | 'functionBody' is already declared in the upper scope. binaries/data/mods/public/gui/options/options.js | 218| » » onUpdate·=·function(key,·functionBody,·minval,·maxval) | | [NORMAL] ESLintBear (no-shadow): | | 'minval' is already declared in the upper scope. binaries/data/mods/public/gui/options/options.js | 218| » » onUpdate·=·function(key,·functionBody,·minval,·maxval) | | [NORMAL] ESLintBear (no-shadow): | | 'maxval' is already declared in the upper scope. binaries/data/mods/public/gui/options/options.js | 263| » » onUpdate·=·function(key) | | [NORMAL] ESLintBear (no-shadow): | | 'key' is already declared in the upper scope. binaries/data/mods/public/gui/options/options.js | 253| » » » » control.list·=·option.parameters.list.map(e·=>·translate(e.label)); | | [NORMAL] JSHintBear: | | Don't make functions within a loop. Executing section XML GUI... Executing section Python... Executing section Perl...
http://jw:8080/job/phabricator_lint/425/ for more details.
Comment Actions
Build is green
Updating workspaces. Build (release)... Build (debug)... Running release tests... Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK! Running debug tests... Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK! Checking XML files...
http://jw:8080/job/phabricator/1893/ for more details.