mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-05-07 17:54:07 +00:00
Code Issues Releases Wiki Activity

crash fixed again

Browse Source
This commit is contained in:
Zeno Rogue 2018-08-28 13:47:51 +02:00
parent 25c09154dc
commit f009e80689
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hyper.h
View File

@ -864,7 +864,6 @@ transmatrix calc_relative_matrix(cell *c, cell *c1, const hyperpoint& point_hint
transmatrix calc_relative_matrix(cell *c, cell *c1, int direction_hint); transmatrix calc_relative_matrix(cell *c, cell *c1, int direction_hint);
static const int NOHINT = -1; static const int NOHINT = -1;
// graph // graph
void showMissionScreen(); void showMissionScreen();

6
mapeditor.cpp
View File

@ -1706,7 +1706,7 @@ namespace mapeditor {
return false; return false;
#else #else
if(c == drawcell && editingShape(group, id) && prio == PPR_DEFAULT) if(c && c == drawcell && editingShape(group, id) && prio == PPR_DEFAULT)
drawtrans = V; drawtrans = V;
usershape *us = usershapes[group][id]; usershape *us = usershapes[group][id];
@ -1724,7 +1724,7 @@ namespace mapeditor {
if(cmode & sm::DRAW) { if(cmode & sm::DRAW) {
#if CAP_TEXTURE #if CAP_TEXTURE
if(texture::config.tstate == texture::tsActive && lmouseover && !mouseout() && (lstartcell || !holdmouse)) { if(texture::config.tstate == texture::tsActive && lmouseover && !mouseout() && (lstartcell || !holdmouse) && c) {
cell *ls = lstartcell ? lstartcell : lmouseover; cell *ls = lstartcell ? lstartcell : lmouseover;
auto sio = patterns::getpatterninfo0(ls); auto sio = patterns::getpatterninfo0(ls);
auto sih = patterns::getpatterninfo0(c); auto sih = patterns::getpatterninfo0(c);
@ -1768,8 +1768,6 @@ namespace mapeditor {
0xFFFF00); 0xFFFF00);
} */ } */
if(c == ew.c) mapeditor::drawtrans = V;
if(!us) return false; if(!us) return false;
usershapelayer &ds(us->d[mapeditor::dslayer]); usershapelayer &ds(us->d[mapeditor::dslayer]);