mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-07-04 10:42:51 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/zenorogue/hyperrogue

Browse Source
This commit is contained in:
Zeno Rogue 2023-03-28 11:11:55 +02:00
commit e2c5420c96
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graph.cpp
View File

@ -2399,8 +2399,8 @@ EX bool drawMonsterType(eMonster m, cell *where, const shiftmatrix& V1, color_t
case moRedTroll: { case moRedTroll: {
const shiftmatrix VBS = VBODY * otherbodyparts(V, darkena(col, 0, 0xFF), m, footphase); const shiftmatrix VBS = VBODY * otherbodyparts(V, darkena(col, 0, 0xFF), m, footphase);
ShadowV(V, cgi.shYeti); ShadowV(V, cgi.shYeti);
queuepoly(VBS, cgi.shYeti, darkena(col, 0, 0xC0)); queuepoly(VBS, cgi.shYeti, darkena(0xFF8000, 0, 0XFF));
queuepoly(VHEAD1, cgi.shPHead, darkena(0xFF8000, 0, 0XFF)); queuepoly(VHEAD1, cgi.shPHead, darkena(col, 0, 0xC0));
queuepoly(VHEAD, cgi.shPFace, 0xFFFFFF80 | UNTRANS); queuepoly(VHEAD, cgi.shPFace, 0xFFFFFF80 | UNTRANS);
humanoid_eyes(V, 0x000000FF, darkena(col, 0, 0xFF)); humanoid_eyes(V, 0x000000FF, darkena(col, 0, 0xFF));
return true; return true;

6
mapeditor.cpp
View File

@ -1628,7 +1628,11 @@ EX namespace mapeditor {
void allInPattern(cellwalker where) { void allInPattern(cellwalker where) {
manual_celllister cl; manual_celllister cl;
if(!patterns::whichPattern || texture::config.tstate == texture::tsActive) { bool call_editAt = !patterns::whichPattern;
#if CAP_TEXTURE
call_editAt |= (texture::config.tstate == texture::tsActive);
#endif
if (call_editAt) {
editAt(where, cl); editAt(where, cl);
return; return;
} }