diff options
| author | jacob1 <jfu614@gmail.com> | 2013-05-16 04:55:44 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-05-16 04:55:44 (GMT) |
| commit | ebe145b39ff1bc28912ed9e4ac058aeab0214388 (patch) | |
| tree | 03660d3ff25f1f0ca8ca20ab08e7aa8a38583599 /src/simulation | |
| parent | 81876a93a30ad71018009a60aed9ede0b43533ab (diff) | |
| download | powder-ebe145b39ff1bc28912ed9e4ac058aeab0214388.zip powder-ebe145b39ff1bc28912ed9e4ac058aeab0214388.tar.gz | |
soap lines show in nothing mode, some small changes to arguments for sim api drawing functions
Diffstat (limited to 'src/simulation')
| -rw-r--r-- | src/simulation/ElementGraphics.h | 2 | ||||
| -rw-r--r-- | src/simulation/Simulation.h | 4 | ||||
| -rw-r--r-- | src/simulation/elements/BIZR.cpp | 1 | ||||
| -rw-r--r-- | src/simulation/elements/SOAP.cpp | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/simulation/ElementGraphics.h b/src/simulation/ElementGraphics.h index 0f3723c..d1c8167 100644 --- a/src/simulation/ElementGraphics.h +++ b/src/simulation/ElementGraphics.h @@ -33,7 +33,7 @@ #define RENDER_GLOW OPTIONS | PSPEC_STICKMAN | /*PMODE_FLAT |*/ PMODE_GLOW | PMODE_ADD | PMODE_BLEND #define RENDER_BLUR OPTIONS | PSPEC_STICKMAN | /*PMODE_FLAT |*/ PMODE_BLUR | PMODE_ADD | PMODE_BLEND #define RENDER_BLOB OPTIONS | PSPEC_STICKMAN | /*PMODE_FLAT |*/ PMODE_BLOB | PMODE_ADD | PMODE_BLEND -#define RENDER_BASC OPTIONS | PSPEC_STICKMAN | PMODE_FLAT | PMODE_ADD | PMODE_BLEND +#define RENDER_BASC OPTIONS | PSPEC_STICKMAN | PMODE_FLAT | PMODE_ADD | PMODE_BLEND | EFFECT_LINES #define RENDER_NONE OPTIONS | PSPEC_STICKMAN | PMODE_FLAT #define COLOUR_HEAT 0x00000001 diff --git a/src/simulation/Simulation.h b/src/simulation/Simulation.h index 5ce0d1e..5387f85 100644 --- a/src/simulation/Simulation.h +++ b/src/simulation/Simulation.h @@ -139,7 +139,6 @@ public: int flood_water(int x, int y, int i, int originaly, int check); TPT_NO_INLINE void detach(int i); TPT_NO_INLINE void part_change_type(int i, int x, int y, int t); - TPT_NO_INLINE int create_part_add_props(int p, int x, int y, int tv, int rx, int ry); //int InCurrentBrush(int i, int j, int rx, int ry); //int get_brush_flags(); TPT_NO_INLINE int create_part(int p, int x, int y, int t); @@ -170,8 +169,9 @@ public: int CreateParts(int positionX, int positionY, int c, Brush * cBrush); //Old particle creation, will create a crappy square, do not use int CreateParts(int x, int y, int rx, int ry, int c, int flags); + int CreatePartFlags(int x, int y, int c, int fn, int flags); void CreateLine(int x1, int y1, int x2, int y2, int c, Brush * cBrush); - void CreateLine(int x1, int y1, int x2, int y2, int rx, int ry, int c, int flags); + void CreateLine(int x1, int y1, int x2, int y2, int c); void CreateWallBox(int x1, int y1, int x2, int y2, int c, int flags); int FloodWalls(int x, int y, int c, int cm, int bm, int flags); diff --git a/src/simulation/elements/BIZR.cpp b/src/simulation/elements/BIZR.cpp index 8b61543..0352c26 100644 --- a/src/simulation/elements/BIZR.cpp +++ b/src/simulation/elements/BIZR.cpp @@ -117,6 +117,7 @@ int Element_BIZR::graphics(GRAPHICS_FUNC_ARGS) *firer = *colr/5 * fabs(cpart->vx)+fabs(cpart->vy); *pixel_mode |= FIRE_ADD; } + *pixel_mode |= PMODE_BLUR; return 0; } diff --git a/src/simulation/elements/SOAP.cpp b/src/simulation/elements/SOAP.cpp index 472dbd7..79434e9 100644 --- a/src/simulation/elements/SOAP.cpp +++ b/src/simulation/elements/SOAP.cpp @@ -246,7 +246,7 @@ int Element_SOAP::update(UPDATE_FUNC_ARGS) int Element_SOAP::graphics(GRAPHICS_FUNC_ARGS) { - *pixel_mode |= EFFECT_LINES; + *pixel_mode |= EFFECT_LINES|PMODE_BLUR; return 1; } |