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

Old nothing display mode in the form of Basic colour mode

Browse Source
This commit is contained in:
Simon Robertshaw 2012-02-25 22:29:43 +00:00
parent f41f96f598
commit fe82685257
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/powdergraphics.h
View File

@ -37,6 +37,7 @@
#define COLOUR_HEAT 0x00000001 #define COLOUR_HEAT 0x00000001
#define COLOUR_LIFE 0x00000002 #define COLOUR_LIFE 0x00000002
#define COLOUR_GRAD 0x00000004 #define COLOUR_GRAD 0x00000004
#define COLOUR_BASC 0x00000008
#define COLOUR_DEFAULT 0x00000000 #define COLOUR_DEFAULT 0x00000000

9
src/graphics.c
View File

@ -1806,7 +1806,7 @@ void render_parts(pixel *vid)
fireg = graphicscache[t].fireg; fireg = graphicscache[t].fireg;
fireb = graphicscache[t].fireb; fireb = graphicscache[t].fireb;
} }
else else if(!(colour_mode & COLOUR_BASC)) //Don't get special effects for BASIC colour mode
{ {
if (ptypes[t].graphics_func) if (ptypes[t].graphics_func)
{ {
@ -1894,6 +1894,13 @@ void render_parts(pixel *vid)
colb = sin(frequency*q) * 16 + colb; colb = sin(frequency*q) * 16 + colb;
if(pixel_mode & (FIREMODE | PMODE_GLOW)) pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR; if(pixel_mode & (FIREMODE | PMODE_GLOW)) pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR;
} }
else if (colour_mode & COLOUR_BASC)
{
colr = PIXR(ptypes[t].pcolors);
colg = PIXG(ptypes[t].pcolors);
colb = PIXB(ptypes[t].pcolors);
pixel_mode = PMODE_FLAT;
}
//Apply decoration colour //Apply decoration colour
if(!colour_mode) if(!colour_mode)

8
src/interface.c
View File

@ -6426,10 +6426,10 @@ void render_ui(pixel * vid_buf, int xcoord, int ycoord, int orientation)
int display_optionicons[] = {0xD4, 0x99, 0x98, 0xBE, 0xDE, 0x9A, -1}; int display_optionicons[] = {0xD4, 0x99, 0x98, 0xBE, 0xDE, 0x9A, -1};
char * display_desc[] = {"Air: Cracker", "Air: Pressure", "Air: Velocity", "Air: Heat", "Warp effect", "Persistent", "Effects"}; char * display_desc[] = {"Air: Cracker", "Air: Pressure", "Air: Velocity", "Air: Heat", "Warp effect", "Persistent", "Effects"};
int colour_optioncount = 3; int colour_optioncount = 4;
int colour_options[] = {COLOUR_LIFE, COLOUR_HEAT, COLOUR_GRAD}; int colour_options[] = {COLOUR_BASC, COLOUR_LIFE, COLOUR_HEAT, COLOUR_GRAD};
int colour_optionicons[] = {0xE0, 0xBE, 0xD3}; int colour_optionicons[] = {0xDB, 0xE0, 0xBE, 0xD3};
char * colour_desc[] = {"Life", "Heat", "Heat Gradient"}; char * colour_desc[] = {"Basic", "Life", "Heat", "Heat Gradient"};
yoffset = 16; yoffset = 16;
xoffset = 0; xoffset = 0;