[Commits] [wesnoth/wesnoth] d0bb55: Restore tod_color struct
GitHub
noreply at github.com
Wed Nov 30 16:37:02 UTC 2016
Branch: refs/heads/master
Home: https://github.com/wesnoth/wesnoth
Commit: d0bb55159d605bc4016ca8faa20a81407e23e1f0
https://github.com/wesnoth/wesnoth/commit/d0bb55159d605bc4016ca8faa20a81407e23e1f0
Author: Celtic Minstrel <celtic.minstrel.ca at gmail.com>
Date: 2016-11-30 (Wed, 30 Nov 2016)
Changed paths:
M src/display.cpp
M src/display.hpp
M src/editor/controller/editor_controller.cpp
M src/time_of_day.cpp
M src/time_of_day.hpp
Log Message:
-----------
Restore tod_color struct
Since it represents a colour delta rather than an absolute colour, the
color_t struct is not a sufficient substitute.
This partially reverts commit 0adeea43e0eec7356552ae91e9074f19edd3a3c7.
The formatting changes from that commit were not reverted, nor was
including colour in time-of-day equality. The unused tod_color::operator*=
was not restored, either.
Commit: f62240bcbdd4083ba52f38d8903dfd765ea47002
https://github.com/wesnoth/wesnoth/commit/f62240bcbdd4083ba52f38d8903dfd765ea47002
Author: Celtic Minstrel <celtic.minstrel.ca at gmail.com>
Date: 2016-11-30 (Wed, 30 Nov 2016)
Changed paths:
M src/sdl/color.hpp
Log Message:
-----------
Fix MSVC build
Commit: b61f8411b69f856817d012839d6f3a0b1dc4819a
https://github.com/wesnoth/wesnoth/commit/b61f8411b69f856817d012839d6f3a0b1dc4819a
Author: Celtic Minstrel <celtic.minstrel.ca at gmail.com>
Date: 2016-11-30 (Wed, 30 Nov 2016)
Changed paths:
M src/gui/core/canvas.cpp
M src/sdl/color.hpp
Log Message:
-----------
color_t: Rename empty() to something more appropriate
Also plus_clipped -> blend_add
Commit: c77faf2223b535badbe56fdd30bc404e283e7c29
https://github.com/wesnoth/wesnoth/commit/c77faf2223b535badbe56fdd30bc404e283e7c29
Author: Celtic Minstrel <celtic.minstrel.ca at gmail.com>
Date: 2016-11-30 (Wed, 30 Nov 2016)
Changed paths:
M src/time_of_day.hpp
Log Message:
-----------
tod_color: Reformat and enforce max range
Compare: https://github.com/wesnoth/wesnoth/compare/cb9ec9b22529...c77faf2223b5
More information about the Commits
mailing list