mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-15 19:55:47 +00:00
Code Issues Releases Wiki Activity

relhell:: ads:: barrier-walls crash into

Browse Source
This commit is contained in:
Zeno Rogue 2024-10-01 22:16:43 +02:00
parent ea92d84b3e
commit afadd898a2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rogueviz/ads/control.cpp
View File

@ -54,7 +54,7 @@ void fire() {
hybrid::in_underlying_geometry([&] { hybrid::in_underlying_geometry([&] {
gen_terrain(c1, ci); gen_terrain(c1, ci);
}); });
if(among(ci.type, wtSolid, wtDestructible)) { if(among(ci.type, wtSolid, wtDestructible, wtBarrier)) {
r->life_end = t; r->life_end = t;
auto Scell_inv = ads_inverse(Scell); auto Scell_inv = ads_inverse(Scell);

2
rogueviz/ads/map.cpp
View File

@ -468,7 +468,7 @@ void handle_crashes() {
auto w = hybrid::get_where(c); auto w = hybrid::get_where(c);
auto& ci = ci_at[w.first]; auto& ci = ci_at[w.first];
ld t = rel.shift + w.second * cgi.plevel; ld t = rel.shift + w.second * cgi.plevel;
if(ci.type == wtDestructible || ci.type == wtSolid || (ci.type == wtGate && (int(floor(t)) & 3) == 0)) { if(ci.type == wtDestructible || ci.type == wtSolid || (ci.type == wtGate && (int(floor(t)) & 3) == 0) || ci.type == wtBarrier) {
if(!crashed && ship_pt > invincibility_pt) println(hlog, "crashed at t = ", t / TAU, " shift = ", rel.shift/TAU, " sec = ", w.second*cgi.plevel/TAU); if(!crashed && ship_pt > invincibility_pt) println(hlog, "crashed at t = ", t / TAU, " shift = ", rel.shift/TAU, " sec = ", w.second*cgi.plevel/TAU);
crashed = true; crashed = true;
} }