Skip to content

replace hardcoded hack with getHackPath() #1569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ab9rf merged 1 commit into from
Mar 17, 2026
Merged

replace hardcoded hack with getHackPath() #1569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions gui/biomes.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ local guidm = require('gui.dwarfmode')
local INITIAL_LIST_HEIGHT = 5
local INITIAL_INFO_HEIGHT = 15

local texturesOnOff8x12 = dfhack.textures.loadTileset('hack/data/art/on-off.png', 8, 12, true)
local texturesOnOff8x12 = dfhack.textures.loadTileset(dfhack.getHackPath()..'/data/art/on-off.png', 8, 12, true)
local LIST_ITEM_HIGHLIGHTED = dfhack.textures.getTexposByHandle(texturesOnOff8x12[1]) -- yellow-ish indicator

local texturesOnOff = dfhack.textures.loadTileset('hack/data/art/on-off_top-left.png', 32, 32, true)
local texturesOnOff = dfhack.textures.loadTileset(dfhack.getHackPath()..'/data/art/on-off_top-left.png', 32, 32, true)
local TILE_HIGHLIGHTED = dfhack.textures.getTexposByHandle(texturesOnOff[1]) -- yellow-ish indicator
if TILE_HIGHLIGHTED < 0 then -- use a fallback
TILE_HIGHLIGHTED = 88 -- `X`
end

local texturesSmallLetters = dfhack.textures.loadTileset('hack/data/art/curses-small-letters_top-left.png', 32, 32, true)
local texturesSmallLetters = dfhack.textures.loadTileset(dfhack.getHackPath()..'/data/art/curses-small-letters_top-left.png', 32, 32, true)
local TILE_STARTING_SYMBOL = dfhack.textures.getTexposByHandle(texturesSmallLetters[1])
if TILE_STARTING_SYMBOL < 0 then -- use a fallback
TILE_STARTING_SYMBOL = 97 -- `a`
Expand Down
2 changes: 1 addition & 1 deletion gui/design.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ function Design:init()
local DESIGN_ICON_ROW_COUNT = 2
local DESIGN_CHAR_WIDTH = 8
local DESIGN_CHAR_HEIGHT = 12
local shape_tileset = dfhack.textures.loadTileset('hack/data/art/design.png', DESIGN_CHAR_WIDTH, DESIGN_CHAR_HEIGHT, true)
local shape_tileset = dfhack.textures.loadTileset(dfhack.getHackPath()..'/data/art/design.png', DESIGN_CHAR_WIDTH, DESIGN_CHAR_HEIGHT, true)

local STRIDE = DESIGN_ICONS_WIDTH / DESIGN_CHAR_WIDTH
local CHARS_PER_ROW = DESIGN_ICONS_HEIGHT / (DESIGN_ICON_ROW_COUNT * DESIGN_CHAR_HEIGHT)
Expand Down
2 changes: 1 addition & 1 deletion gui/mass-remove.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

--@ module = true

local toolbar_textures = dfhack.textures.loadTileset('hack/data/art/mass_remove_toolbar.png', 8, 12)
local toolbar_textures = dfhack.textures.loadTileset(dfhack.getHackPath()..'/data/art/mass_remove_toolbar.png', 8, 12)

local gui = require('gui')
local guidm = require('gui.dwarfmode')
Expand Down
2 changes: 1 addition & 1 deletion gui/sitemap.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ local utils = require('utils')
local widgets = require('gui.widgets')
local overlay = require('plugins.overlay')

local toolbar_textures = dfhack.textures.loadTileset('hack/data/art/sitemap_toolbar.png', 8, 12)
local toolbar_textures = dfhack.textures.loadTileset(dfhack.getHackPath()..'/data/art/sitemap_toolbar.png', 8, 12)

function launch_sitemap()
dfhack.run_script('gui/sitemap')
Expand Down
2 changes: 1 addition & 1 deletion gui/tiletypes.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ local UI_COLORS = {
INVALID_OPTION= COLOR_RED,
}

local TILESET = dfhack.textures.loadTileset('hack/data/art/tiletypes.png', 8, 12, true)
local TILESET = dfhack.textures.loadTileset(dfhack.getHackPath()..'/data/art/tiletypes.png', 8, 12, true)
local TILESET_STRIDE = 16

local DEFAULT_OPTIONS = {
Expand Down
2 changes: 1 addition & 1 deletion notes.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ local note_manager = reqscript('internal/notes/note_manager')

textures = {
green_pin = dfhack.textures.loadTileset(
'hack/data/art/note_green_pin_map.png',
dfhack.getHackPath()..'/data/art/note_green_pin_map.png',
32,
32,
true
Expand Down
Loading