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

Fix compilation for Non-OpenGL builds

Browse Source
This commit is contained in:
Simon Robertshaw 2011-10-23 17:37:24 +01:00
parent 2d25d944ad
commit 66fd41673b
2 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/elements/graphics_default.c Normal file
View File

@ -0,0 +1,22 @@
#include <element.h>
int graphics_DEFAULT(GRAPHICS_FUNC_ARGS)
{
int t = cpart->type;
//Property based defaults
if(ptypes[t].properties & PROP_RADIOACTIVE) *pixel_mode |= PMODE_GLOW;
if(ptypes[t].properties & TYPE_LIQUID)
{
*pixel_mode |= PMODE_BLUR;
}
if(ptypes[t].properties & TYPE_GAS)
{
*pixel_mode &= ~PMODE;
*pixel_mode |= FIRE_BLEND;
*firer = *colr/2;
*fireg = *colg/2;
*fireb = *colb/2;
*firea = 125;
}
return 1;
}

32
src/graphics.c
View File

@ -27,7 +27,9 @@ unsigned cmode = CM_FIRE;
SDL_Surface *sdl_scrn; SDL_Surface *sdl_scrn;
int sdl_scale = 1; int sdl_scale = 1;
#ifdef OGLR
GLuint airProg, zoomTex, vidBuf, airBuf, fireAlpha, glowAlpha, blurAlpha, fireProg, partsFboTex, partsFbo, lensProg, partsTFX, partsTFY, airPV, airVY, airVX; GLuint airProg, zoomTex, vidBuf, airBuf, fireAlpha, glowAlpha, blurAlpha, fireProg, partsFboTex, partsFbo, lensProg, partsTFX, partsTFY, airPV, airVY, airVX;
#endif
int sandcolour_r = 0; int sandcolour_r = 0;
int sandcolour_g = 0; int sandcolour_g = 0;
@ -714,6 +716,7 @@ _inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a)
inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a) inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a)
#endif #endif
{ {
#ifdef PIXALPHA
pixel t; pixel t;
if (x<0 || y<0 || x>=XRES+BARSIZE || y>=YRES+MENUSIZE) if (x<0 || y<0 || x>=XRES+BARSIZE || y>=YRES+MENUSIZE)
return; return;
@ -726,6 +729,19 @@ inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a)
a = a > PIXA(t) ? a : PIXA(t); a = a > PIXA(t) ? a : PIXA(t);
} }
vid[y*(XRES+BARSIZE)+x] = PIXRGBA(r,g,b,a); vid[y*(XRES+BARSIZE)+x] = PIXRGBA(r,g,b,a);
#else
pixel t;
if (x<0 || y<0 || x>=XRES+BARSIZE || y>=YRES+MENUSIZE)
return;
if (a!=255)
{
t = vid[y*(XRES+BARSIZE)+x];
r = (a*r + (255-a)*PIXR(t)) >> 8;
g = (a*g + (255-a)*PIXG(t)) >> 8;
b = (a*b + (255-a)*PIXB(t)) >> 8;
}
vid[y*(XRES+BARSIZE)+x] = PIXRGB(r,g,b);
#endif
} }
#if defined(WIN32) && !defined(__GNUC__) #if defined(WIN32) && !defined(__GNUC__)
@ -1079,6 +1095,7 @@ _inline void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a)
inline void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a) inline void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a)
#endif #endif
{ {
#ifdef PIXALPHA
pixel t; pixel t;
if (x<0 || y<0 || x>=XRES+BARSIZE || y>=YRES+MENUSIZE) if (x<0 || y<0 || x>=XRES+BARSIZE || y>=YRES+MENUSIZE)
return; return;
@ -1091,6 +1108,19 @@ inline void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a)
a = a > PIXA(t) ? a : PIXA(t); a = a > PIXA(t) ? a : PIXA(t);
} }
vid[y*(XRES+BARSIZE)+x] = PIXRGBA(r,g,b,a); vid[y*(XRES+BARSIZE)+x] = PIXRGBA(r,g,b,a);
#else
pixel t;
if (x<0 || y<0 || x>=XRES+BARSIZE || y>=YRES+MENUSIZE)
return;
if (a!=255)
{
t = vid[y*(XRES+BARSIZE)+x];
r = (a*r + (255-a)*PIXR(t)) >> 8;
g = (a*g + (255-a)*PIXG(t)) >> 8;
b = (a*b + (255-a)*PIXB(t)) >> 8;
}
vid[y*(XRES+BARSIZE)+x] = PIXRGB(r,g,b);
#endif
} }
void draw_icon(pixel *vid_buf, int x, int y, char ch, int flag) void draw_icon(pixel *vid_buf, int x, int y, char ch, int flag)
@ -1662,6 +1692,7 @@ void render_parts(pixel *vid)
if (t==PT_STKM) if (t==PT_STKM)
{ {
char buff[20]; //Buffer for HP char buff[20]; //Buffer for HP
int s;
pixel pc; pixel pc;
if (mousex>(nx-3) && mousex<(nx+3) && mousey<(ny+3) && mousey>(ny-3)) //If mous is in the head if (mousex>(nx-3) && mousex<(nx+3) && mousey<(ny+3) && mousey>(ny-3)) //If mous is in the head
@ -1687,6 +1718,7 @@ void render_parts(pixel *vid)
else if (t==PT_STKM2) else if (t==PT_STKM2)
{ {
char buff[20]; //Buffer for HP char buff[20]; //Buffer for HP
int s;
pixel pc; pixel pc;
if (mousex>(nx-3) && mousex<(nx+3) && mousey<(ny+3) && mousey>(ny-3)) //If mous is in the head if (mousex>(nx-3) && mousex<(nx+3) && mousey<(ny+3) && mousey>(ny-3)) //If mous is in the head