Mercurial > mm7
comparison UI/UIOptions.cpp @ 2076:0d535449c04f
Слияние
author | Ritor1 |
---|---|
date | Wed, 04 Dec 2013 15:40:38 +0600 |
parents | 259df09dfb50 |
children | 9bd7522cdbbb |
comparison
equal
deleted
inserted
replaced
2075:24033aa2e1f8 | 2076:0d535449c04f |
---|---|
40 if (time < 400) | 40 if (time < 400) |
41 intensity = - 70 + 70 * time / 400; | 41 intensity = - 70 + 70 * time / 400; |
42 else | 42 else |
43 intensity = + 70 - 70 * time / 800; | 43 intensity = + 70 - 70 * time / 800; |
44 | 44 |
45 return TargetColor(185 + intensity, 40 + intensity / 4, 40 + intensity / 4); | 45 return Color16(185 + intensity, 40 + intensity / 4, 40 + intensity / 4); |
46 } | 46 } |
47 | 47 |
48 return ui_gamemenu_keys_key_default_color; | 48 return ui_gamemenu_keys_key_default_color; |
49 } | 49 } |
50 | 50 |