mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-12-05 18:30:22 -08:00
Compare commits
3 commits
f48900d6de
...
d8106cb886
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d8106cb886 | ||
|
|
ef2736b3be | ||
|
|
6b2825954b |
3 changed files with 3 additions and 6 deletions
|
|
@ -403,7 +403,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
|
|||
infoDialog.show();
|
||||
Core.app.post(() -> ui.showErrorMessage("@editor.save.noname"));
|
||||
}else{
|
||||
Map map = maps.all().find(m -> m.name().equals(name));
|
||||
Map map = maps.all().find(m -> m.name().equalsIgnoreCase(name));
|
||||
if(map != null && !map.custom && !map.workshop){
|
||||
handleSaveBuiltin(map);
|
||||
}else{
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ public class EditorMapsDialog extends MapListDialog{
|
|||
return;
|
||||
}
|
||||
|
||||
Map conflict = maps.all().find(m -> m.name().equals(name));
|
||||
Map conflict = maps.all().find(m -> m.name().equalsIgnoreCase(name));
|
||||
|
||||
if(conflict != null && !conflict.custom){
|
||||
ui.showInfo(Core.bundle.format("editor.import.exists", name));
|
||||
|
|
|
|||
|
|
@ -68,8 +68,6 @@ public class CanvasBlock extends Block{
|
|||
clipSize = Math.max(clipSize, size * 8 - padding);
|
||||
|
||||
previewPixmap = new Pixmap(canvasSize, canvasSize);
|
||||
|
||||
if(!Mathf.isPowerOfTwo(palette.length)) throw new RuntimeException("Non power-of-two palettes for canvas blocks are not supported.");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -122,7 +120,6 @@ public class CanvasBlock extends Block{
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
}else{
|
||||
super.drawPlanRegion(plan, list);
|
||||
}
|
||||
|
|
@ -134,7 +131,7 @@ public class CanvasBlock extends Block{
|
|||
for(int i = 0; i < pixels; i++){
|
||||
int bitOffset = i * bpp;
|
||||
int pal = getByte(data, bitOffset);
|
||||
target.set(i % canvasSize, i / canvasSize, palette[pal]);
|
||||
target.set(i % canvasSize, i / canvasSize, palette[Math.min(pal, palette.length)]);
|
||||
}
|
||||
return target;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue