mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2026-01-04 19:29:02 +00:00
Code Issues Releases Wiki Activity

conflict resolved?

Browse Source
This commit is contained in:
Zeno Rogue
2017-10-31 01:55:50 +01:00
parent 26b517a20a c611131f5a
commit e7eb15d1ad
8 changed files with 477 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
graph.cpp
View File

@@ -3813,7 +3813,11 @@ void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) {
qfloor(c, Vf, CLOUDFLOOR, darkena(fcol, fd, 0xFF));
else if(c->land == laKraken)
<<<<<<< HEAD
qfloor(c, Vf, FULLFLOOR, darkena(fcol, fd, 0xFF));
=======
qfloor(c, Vf, shFullFloor[ct6], darkena(fcol, fd, 0xFF));
>>>>>>> c611131f5a64f8ead4067ff459927125df567c96
else if(c->land == laLivefjord)
qfloor(c, Vf, CAVEFLOOR, darkena(fcol, fd, 0xFF));