mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-11 18:00:34 +00:00
Code Issues Releases Wiki Activity

removed conflict markers

Browse Source
This commit is contained in:
Zeno Rogue 2017-10-31 13:56:33 +01:00
parent e7eb15d1ad
commit dad544958f
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graph.cpp
View File

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