diff options
| author | jacob1 <jfu614@gmail.com> | 2012-09-06 13:48:31 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-06 23:35:33 (GMT) |
| commit | 1391de2e3a85ad0cb8c38286e51b0708d3415a43 (patch) | |
| tree | 3d52618f9c4828479a1e40d5b68f946ce4d43868 /src/simulation/Simulation.cpp | |
| parent | 2243c86ef9858b3ea2c0e3e64bf201ec93c9cff7 (diff) | |
| download | powder-1391de2e3a85ad0cb8c38286e51b0708d3415a43.zip powder-1391de2e3a85ad0cb8c38286e51b0708d3415a43.tar.gz | |
Wall names in HUD
Conflicts:
src/game/GameView.cpp
Diffstat (limited to 'src/simulation/Simulation.cpp')
| -rw-r--r-- | src/simulation/Simulation.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index 1437912..1c51b2a 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -414,6 +414,10 @@ SimulationSample Simulation::Get(int x, int y) sample.particle = parts[photons[y][x]>>8]; sample.ParticleID = photons[y][x]>>8; } + if (bmap[y/CELL][x/CELL]) + { + sample.WallType = bmap[y/CELL][x/CELL]; + } sample.AirPressure = pv[y/CELL][x/CELL]; sample.AirTemperature = hv[y/CELL][x/CELL]; sample.AirVelocityX = vx[y/CELL][x/CELL]; |