matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent UI text from overlapping intro message

Browse Source
This commit is contained in:
Simon Robertshaw 2011-10-24 18:43:45 +01:00
parent 89fd306ba1
commit c3b9c698d2
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
includes/defines.h
View File

@ -15,6 +15,9 @@
#define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter. #define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter.
#define MTOS_EXPAND(str) #str
#define MTOS(str) MTOS_EXPAND(str)
#define SERVER "powdertoy.co.uk" #define SERVER "powdertoy.co.uk"
#define SCRIPTSERVER "powdertoy.co.uk" #define SCRIPTSERVER "powdertoy.co.uk"

13
src/graphics.c
View File

@ -1057,6 +1057,10 @@ int drawtext(pixel *vid, int x, int y, const char *s, int r, int g, int b, int a
r = 255; r = 255;
g = b = 0; g = b = 0;
break; break;
case 'l':
r = 255;
g = b = 75;
break;
case 'b': case 'b':
r = g = 0; r = g = 0;
b = 255; b = 255;
@ -1135,10 +1139,19 @@ int drawtextwrap(pixel *vid, int x, int y, int w, const char *s, int r, int g, i
r = 255; r = 255;
g = b = 0; g = b = 0;
break; break;
case 'l':
r = 255;
g = b = 75;
break;
case 'b': case 'b':
r = g = 0; r = g = 0;
b = 255; b = 255;
break; break;
case 't':
b = 255;
g = 170;
r = 32;
break;
} }
s++; s++;
} }

13
src/main.c
View File

@ -131,7 +131,7 @@ void play_sound(char *file)
} }
static const char *it_msg = static const char *it_msg =
"\brThe Powder Toy - http://powdertoy.co.uk, irc.freenode.net #powder\n" "\blThe Powder Toy - Version " MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) " - http://powdertoy.co.uk, irc.freenode.net #powder\n"
"\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\n" "\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\x7F\n"
"\n" "\n"
"\bgControl+C/V/X are Copy, Paste and cut respectively.\n" "\bgControl+C/V/X are Copy, Paste and cut respectively.\n"
@ -1585,7 +1585,7 @@ int main(int argc, char *argv[])
#endif #endif
int wavelength_gfx = 0; int wavelength_gfx = 0;
int x, y, line_x, line_y, b = 0, sl=1, sr=0, su=0, c, lb = 0, lx = 0, ly = 0, lm = 0;//, tx, ty; int x, y, line_x, line_y, b = 0, sl=1, sr=0, su=0, c, lb = 0, lx = 0, ly = 0, lm = 0;//, tx, ty;
int da = 0, dae = 0, db = 0, it = 2047, mx, my, bsx = 2, bsy = 2, quickoptions_tooltip_fade_invert; int da = 0, dae = 0, db = 0, it = 2047, mx, my, bsx = 2, bsy = 2, quickoptions_tooltip_fade_invert, it_invert = 0;
float nfvx, nfvy; float nfvx, nfvy;
int load_mode=0, load_w=0, load_h=0, load_x=0, load_y=0, load_size=0; int load_mode=0, load_w=0, load_h=0, load_x=0, load_y=0, load_size=0;
void *load_data=NULL; void *load_data=NULL;
@ -3480,6 +3480,11 @@ int main(int argc, char *argv[])
strappend(uitext, " [FRAME CAPTURE]"); strappend(uitext, " [FRAME CAPTURE]");
#endif #endif
quickoptions_tooltip_fade_invert = 255 - (quickoptions_tooltip_fade*20); quickoptions_tooltip_fade_invert = 255 - (quickoptions_tooltip_fade*20);
it_invert = 50 - it;
if(it_invert < 0)
it_invert = 0;
if(it_invert > 50)
it_invert = 50;
if (sdl_zoom_trig||zoom_en) if (sdl_zoom_trig||zoom_en)
{ {
if (zoom_x<XRES/2) if (zoom_x<XRES/2)
@ -3520,8 +3525,8 @@ int main(int argc, char *argv[])
draw_wavelengths(vid_buf,XRES-20-textwidth(heattext),11,2,wavelength_gfx); draw_wavelengths(vid_buf,XRES-20-textwidth(heattext),11,2,wavelength_gfx);
} }
wavelength_gfx = 0; wavelength_gfx = 0;
fillrect(vid_buf, 12, 12, textwidth(uitext)+8, 15, 0, 0, 0, 140); fillrect(vid_buf, 12, 12, textwidth(uitext)+8, 15, 0, 0, 0, it_invert * 3);
drawtext(vid_buf, 16, 16, uitext, 32, 216, 255, 200); drawtext(vid_buf, 16, 16, uitext, 32, 216, 255, it_invert * 4);
} }