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

added Football and Dark Rainbow to predesigned patterns

Browse Source
This commit is contained in:
Zeno Rogue 2017-04-04 11:19:39 +02:00
parent 645a64e8c9
commit 499d4cc025
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cell.cpp
View File

@ -115,12 +115,10 @@ struct celllister {
// -- hrmap --- // -- hrmap ---
#include <typeinfo>
struct hrmap { struct hrmap {
virtual heptagon *getOrigin() { return NULL; } virtual heptagon *getOrigin() { return NULL; }
virtual cell *gamestart() { return getOrigin()->c7; } virtual cell *gamestart() { return getOrigin()->c7; }
virtual ~hrmap() { printf("removing %s\n", typeid(this).name()); }; virtual ~hrmap() { };
virtual vector<cell*>& allcells() { return dcal; } virtual vector<cell*>& allcells() { return dcal; }
virtual void verify() { } virtual void verify() { }
}; };

6
mapeditor.cpp
View File

@ -659,6 +659,8 @@ namespace mapeditor {
dialog::addItem(XLAT("Gameboard"), 'g'); dialog::addItem(XLAT("Gameboard"), 'g');
dialog::addItem(XLAT("random colors"), 'r'); dialog::addItem(XLAT("random colors"), 'r');
dialog::addItem(XLAT("rainbow landscape"), 'l'); dialog::addItem(XLAT("rainbow landscape"), 'l');
dialog::addItem(XLAT("dark rainbow landscape"), 'd');
dialog::addItem(XLAT("football"), 'F');
dialog::addSelItem(XLAT("emerald pattern"), "emerald", 'e'); dialog::addSelItem(XLAT("emerald pattern"), "emerald", 'e');
@ -675,6 +677,7 @@ namespace mapeditor {
dialog::addSelItem(XLAT("field pattern D"), "field", 'D'); dialog::addSelItem(XLAT("field pattern D"), "field", 'D');
dialog::addSelItem(XLAT("field pattern N"), "field", 'N'); dialog::addSelItem(XLAT("field pattern N"), "field", 'N');
dialog::addSelItem(XLAT("field pattern S"), "field", 'S'); dialog::addSelItem(XLAT("field pattern S"), "field", 'S');
dialog::display(); dialog::display();
} }
else if(subscreen == 1 && painttype == 6) else if(subscreen == 1 && painttype == 6)
@ -1811,6 +1814,9 @@ namespace mapeditor {
col[2] /= 8; col[2] /= 8;
return (0x101010 + col[0] + (col[1] << 8) + (col[2] << 16)) >> (err?2:0); return (0x101010 + col[0] + (col[1] << 8) + (col[2] << 16)) >> (err?2:0);
} }
if(whichCanvas == 'F') {
return ishept(c) ? 0x202020 : 0xC0C0C0;
}
return canvasback; return canvasback;
} }
} }