Skip to content
Snippets Groups Projects
Commit 492f795e authored by dg's avatar dg
Browse files

fix

git-svn-id: http://svn.net-core.org/repos/t-engine4@2933 51575b47-30f0-44d4-a5cc-537603b46e54
parent fc72f4ad
No related branches found
No related tags found
No related merge requests found
......@@ -24,6 +24,7 @@ Fonts:
- Vera*: http://www.gnome.org/fonts/
- INSULA, USENET: http://www.dafont.com/fr/apostrophic-labs.d128
- SVBasicManual: http://www.dafont.com/fr/johan-winge.d757 // http://home.student.uu.se/j/jowi4905/fonts/
- FSEX300: http://www.fixedsysexcelsior.com/
Others:
- My dear wife who is not bothered by my coding frenzy :)
......
......@@ -32,7 +32,7 @@ function _M:init(t)
self.nb_items = t.nb_items
assert(self.h or self.nb_items, "no list height/nb_items")
self.fct = t.fct
self.select = t.select
self.on_select = t.select
self.display_prop = t.display_prop or "name"
self.scrollbar = t.scrollbar
self.all_clicks = t.all_clicks
......@@ -132,7 +132,7 @@ function _M:onSelect()
local item = self.list[self.sel]
if not item then return end
if rawget(self, "select") then self.select(item, self.sel) end
if rawget(self, "on_select") then self.on_select(item, self.sel) end
end
function _M:onUse(...)
......
......@@ -132,7 +132,7 @@ newEntity{
inc_damage = { [DamageType.ACID] = resolvers.mbonus_material(10, 10, function(e, v) return v * 0.8 end) },
resists = {},
},
resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.LIGHTNING] = (e.wielder.resists[engine.DamageType.LIGHTNING] or 0) + e.wielder.inc_damage[engine.DamageType.LIGHTNING] end),
resolvers.genericlast(function(e) e.wielder.resists[engine.DamageType.ACID] = (e.wielder.resists[engine.DamageType.ACID] or 0) + e.wielder.inc_damage[engine.DamageType.ACID] end),
}
newEntity{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment