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

add airblock wall

Browse Source
This commit is contained in:
jacob1 2014-07-03 14:30:12 -04:00
parent f68fadb3f4
commit b59ecf2d65
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/simulation/Simulation.cpp
View File

@ -4798,8 +4798,8 @@ void Simulation::update_particles()//doesn't update the particles themselves, bu
{ {
if (emap[y][x]) if (emap[y][x])
emap[y][x] --; emap[y][x] --;
air->bmap_blockair[y][x] = (bmap[y][x]==WL_WALL || bmap[y][x]==WL_WALLELEC || (bmap[y][x]==WL_EWALL && !emap[y][x])); air->bmap_blockair[y][x] = (bmap[y][x]==WL_WALL || bmap[y][x]==WL_WALLELEC || bmap[y][x]==WL_BLOCKAIR || (bmap[y][x]==WL_EWALL && !emap[y][x]));
air->bmap_blockairh[y][x] = (bmap[y][x]==WL_WALL || bmap[y][x]==WL_WALLELEC || bmap[y][x]==WL_GRAV || (bmap[y][x]==WL_EWALL && !emap[y][x])) ? 0x8:0; air->bmap_blockairh[y][x] = (bmap[y][x]==WL_WALL || bmap[y][x]==WL_WALLELEC || bmap[y][x]==WL_BLOCKAIR || bmap[y][x]==WL_GRAV || (bmap[y][x]==WL_EWALL && !emap[y][x])) ? 0x8:0;
} }
} }
} }

1
src/simulation/SimulationData.cpp
View File

@ -130,6 +130,7 @@ wall_type * LoadWalls(int & wallCount)
{PIXPACK(0x579777), PIXPACK(0x000000), 1, Renderer::WallIcon, "GAS WALL", "Allows gases, blocks all other particles."}, {PIXPACK(0x579777), PIXPACK(0x000000), 1, Renderer::WallIcon, "GAS WALL", "Allows gases, blocks all other particles."},
{PIXPACK(0xFFEE00), PIXPACK(0xAA9900), 4, Renderer::WallIcon, "GRAVITY WALL", "Gravity wall. Newtonian Gravity has no effect inside a box drawn with this."}, {PIXPACK(0xFFEE00), PIXPACK(0xAA9900), 4, Renderer::WallIcon, "GRAVITY WALL", "Gravity wall. Newtonian Gravity has no effect inside a box drawn with this."},
{PIXPACK(0xFFAA00), PIXPACK(0xAA5500), 4, Renderer::WallIcon, "ENERGY WALL", "Allows energy particles, blocks all other particles."}, {PIXPACK(0xFFAA00), PIXPACK(0xAA5500), 4, Renderer::WallIcon, "ENERGY WALL", "Allows energy particles, blocks all other particles."},
{PIXPACK(0xDCDCDC), PIXPACK(0x000000), 1, Renderer::WallIcon, "AIRBLOCK WALL", "Allows all particles, but blocks air."},
}; };
wallCount = UI_WALLCOUNT; wallCount = UI_WALLCOUNT;
wall_type * wtypesT = (wall_type*)malloc(UI_WALLCOUNT*sizeof(wall_type)); wall_type * wtypesT = (wall_type*)malloc(UI_WALLCOUNT*sizeof(wall_type));

3
src/simulation/SimulationData.h
View File

@ -54,9 +54,10 @@
#define WL_ALLOWGAS 13 #define WL_ALLOWGAS 13
#define WL_GRAV 14 #define WL_GRAV 14
#define WL_ALLOWENERGY 15 #define WL_ALLOWENERGY 15
#define WL_BLOCKAIR 16
#define WL_FLOODHELPER 255 #define WL_FLOODHELPER 255
#define UI_WALLCOUNT 16 #define UI_WALLCOUNT 17
#define OLD_SPC_AIR 236 #define OLD_SPC_AIR 236
#define SPC_AIR 256 #define SPC_AIR 256