notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

White in tintable stamps no longer tinted. Homedir stamps now loaded first.

Browse source
This commit is contained in:
William Kendrick 2003-11-14 11:50:31 +00:00
parent 1198617dbb
commit 028f68ae31
2 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/CHANGES.txt
View file

@ -7,7 +7,7 @@ bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/ http://www.newbreedsoftware.com/tuxpaint/
2003.Sep.28 (0.9.13) [cvs] 2003.Nov.14 (0.9.13) [cvs]
* Translated into Tamil [buggy] * Translated into Tamil [buggy]
Mugunth <mugunth@thamizha.com> Mugunth <mugunth@thamizha.com>
@ -68,6 +68,10 @@ http://www.newbreedsoftware.com/tuxpaint/
* Updated default configuration file to include examples of some newer * Updated default configuration file to include examples of some newer
options. options.
* White/grey in tintable stamps don't get tinted now.
* Stamps in homedir are now loaded before system-wide stamps.
2003.Aug.18 (0.9.12) 2003.Aug.18 (0.9.12)
* Replaced "efont-serif" fonts with those from the 'ttf-freefont' package, * Replaced "efont-serif" fonts with those from the 'ttf-freefont' package,

33
src/tuxpaint.c
View file

@ -7,15 +7,15 @@
bill@newbreedsoftware.com bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/ http://www.newbreedsoftware.com/tuxpaint/
June 14, 2002 - October 13, 2003 June 14, 2002 - November 14, 2003
*/ */
#define VER_VERSION "0.9.13" #define VER_VERSION "0.9.13"
#define VER_DATE "2003.10.13" #define VER_DATE "2003.11.14"
#define DEBUG /* #define DEBUG */
/* #define LOW_QUALITY_THUMBNAILS */ /* #define LOW_QUALITY_THUMBNAILS */
/* #define LOW_QUALITY_COLOR_SELECTOR */ /* #define LOW_QUALITY_COLOR_SELECTOR */
/* #define LOW_QUALITY_STAMP_OUTLINE */ /* #define LOW_QUALITY_STAMP_OUTLINE */
@ -2905,9 +2905,11 @@ void stamp_draw(int x, int y)
&r, &g, &b, &a); &r, &g, &b, &a);
rgbtohsv(r, g, b, &stamp_hue, &stamp_sat, &stamp_val); rgbtohsv(r, g, b, &stamp_hue, &stamp_sat, &stamp_val);
hsvtorgb(col_hue, col_sat, stamp_val, &r, &g, &b);
if (stamp_sat > 0.25)
hsvtorgb(col_hue, col_sat, stamp_val, &r, &g, &b);
// else
// hsvtorgb(col_hue, col_sat, stamp_val, &r, &g, &b);
putpixel(tmp_surf, xx, yy, putpixel(tmp_surf, xx, yy,
SDL_MapRGBA(tmp_surf->format, r, g, b, a)); SDL_MapRGBA(tmp_surf->format, r, g, b, a));
@ -4891,17 +4893,6 @@ void setup(int argc, char * argv[])
if (dont_load_stamps == 0) if (dont_load_stamps == 0)
{ {
#ifndef NOSOUND
loadarbitrary(img_stamps, img_stamps_premirror,
txt_stamps, inf_stamps, snd_stamps, &num_stamps,
0, MAX_STAMPS, DATA_PREFIX "stamps", 0, -1, -1);
#else
loadarbitrary(img_stamps, img_stamps_premirror,
txt_stamps, inf_stamps, &num_stamps,
0, MAX_STAMPS, DATA_PREFIX "stamps", 0, -1, -1);
#endif
homedirdir = get_fname("stamps"); homedirdir = get_fname("stamps");
#ifndef NOSOUND #ifndef NOSOUND
loadarbitrary(img_stamps, img_stamps_premirror, loadarbitrary(img_stamps, img_stamps_premirror,
@ -4915,6 +4906,16 @@ void setup(int argc, char * argv[])
#endif #endif
#ifndef NOSOUND
loadarbitrary(img_stamps, img_stamps_premirror,
txt_stamps, inf_stamps, snd_stamps, &num_stamps,
0, MAX_STAMPS, DATA_PREFIX "stamps", 0, -1, -1);
#else
loadarbitrary(img_stamps, img_stamps_premirror,
txt_stamps, inf_stamps, &num_stamps,
0, MAX_STAMPS, DATA_PREFIX "stamps", 0, -1, -1);
#endif
if (num_stamps == 0) if (num_stamps == 0)
{ {