mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-01-12 10:20:32 +00:00
fixed some crashes on out_of_bounds
This commit is contained in:
parent
557166c561
commit
f9b0dcf8a0
@ -278,6 +278,7 @@ void virtualRebase_cell(cell*& base, T& at, const U& check) {
|
|||||||
while(true) {
|
while(true) {
|
||||||
cell *newbase = NULL;
|
cell *newbase = NULL;
|
||||||
forCellIdCM(c2, i, base) {
|
forCellIdCM(c2, i, base) {
|
||||||
|
if(c2 == &out_of_bounds) continue;
|
||||||
transmatrix V2 = currentmap->iadj(base, i);
|
transmatrix V2 = currentmap->iadj(base, i);
|
||||||
T cand_at = V2 * at;
|
T cand_at = V2 * at;
|
||||||
horo_distance newz(check(cand_at));
|
horo_distance newz(check(cand_at));
|
||||||
|
@ -634,6 +634,7 @@ bool pcmove::actual_move() {
|
|||||||
|
|
||||||
mi = movei(cwt.at, d);
|
mi = movei(cwt.at, d);
|
||||||
cell *& c2 = mi.t;
|
cell *& c2 = mi.t;
|
||||||
|
if(c2 == &out_of_bounds) return false;
|
||||||
good_tortoise = c2->monst == moTortoise && tortoise::seek() && !tortoise::diff(tortoise::getb(c2)) && !c2->item;
|
good_tortoise = c2->monst == moTortoise && tortoise::seek() && !tortoise::diff(tortoise::getb(c2)) && !c2->item;
|
||||||
|
|
||||||
if(items[itOrbGravity]) {
|
if(items[itOrbGravity]) {
|
||||||
|
Loading…
Reference in New Issue
Block a user