mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-10-17 22:20:41 +00:00
Code Issues Releases Wiki Activity

mapeditor now compiles without warning

Browse Source
This commit is contained in:
Zeno Rogue 2024-07-09 17:56:12 +02:00
parent 66ed7104f1
commit b4fbe573ab
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mapeditor.cpp
View File

@ -2240,7 +2240,6 @@ EX namespace mapeditor {
bool freedraw = drawing_tool || intexture; bool freedraw = drawing_tool || intexture;
#if CAP_TEXTURE
if(freedraw && !show_menu) for(int i=0; i<10; i++) { if(freedraw && !show_menu) for(int i=0; i<10; i++) {
int fs = editor_fsize(); int fs = editor_fsize();
if(8 + fs * (6+i) < vid.yres - 8 - fs * 7) if(8 + fs * (6+i) < vid.yres - 8 - fs * 7)
@ -2249,7 +2248,6 @@ EX namespace mapeditor {
if(displayfr(vid.xres-8 - fs * 3, 8+fs*(6+i), 0, vid.fsize, its(i+1), dtwidth == brush_sizes[i] ? 0xFF8000 : 0xC0C0C0, 16)) if(displayfr(vid.xres-8 - fs * 3, 8+fs*(6+i), 0, vid.fsize, its(i+1), dtwidth == brush_sizes[i] ? 0xFF8000 : 0xC0C0C0, 16))
getcstat = 2000+i; getcstat = 2000+i;
} }
#endif
editor_menu(drawing_tool ? 3 : 2); editor_menu(drawing_tool ? 3 : 2);
keyhandler = handle_key_draw; keyhandler = handle_key_draw;
@ -2387,7 +2385,11 @@ EX namespace mapeditor {
} }
else if(freedraw) { else if(freedraw) {
dialog::addBoolItem_action("symmetry", texture::texturesym, '0'); #if CAP_TEXTURE
if(intexture) dialog::addBoolItem_action("symmetry", texture::texturesym, '0');
else dialog::addBreak(100);
#endif
if(drawing_tool) { if(drawing_tool) {
if(!dtfill) if(!dtfill)
dialog::addBoolItem(XLAT("fill"), dtfill, 'f'); dialog::addBoolItem(XLAT("fill"), dtfill, 'f');
@ -2413,9 +2415,11 @@ EX namespace mapeditor {
dialog::add_action([] { mousekey = 'T'; }); dialog::add_action([] { mousekey = 'T'; });
if(drawing_tool) dialog::addItem_mouse(XLAT("erase"), 'e'); if(drawing_tool) dialog::addItem_mouse(XLAT("erase"), 'e');
dialog::add_action([] { mousekey = 'e'; }); dialog::add_action([] { mousekey = 'e'; });
#if CAP_TEXTURE
int s = isize(texture::config.data.pixels_to_draw); int s = isize(texture::config.data.pixels_to_draw);
if(s) dialog::addInfo(its(s)); else dialog::addBreak(100); if(s) dialog::addInfo(its(s)); else dialog::addBreak(100);
dialog::addBreak(700); #endif
dialog::addBreak(CAP_TEXTURE ? 700 : 1000);
} }
if(GDIM == 2) if(GDIM == 2)
@ -2968,6 +2972,7 @@ EX namespace mapeditor {
if(lstartcell) lstart = ggmatrix(lstartcell) * lstart_rel; if(lstartcell) lstart = ggmatrix(lstartcell) * lstart_rel;
int tcolor = (dtcolor >> 8) | ((dtcolor & 0xFF) << 24); int tcolor = (dtcolor >> 8) | ((dtcolor & 0xFF) << 24);
hr::ignore(tcolor);
if(uni == '-') { if(uni == '-') {
if(mousekey == 'g') { if(mousekey == 'g') {