diff -r 35ec1edd66a2 -r c7ec309cd685 hedgewars/uStore.pas --- a/hedgewars/uStore.pas Sat Nov 19 21:17:48 2016 +0100 +++ b/hedgewars/uStore.pas Mon May 09 22:49:31 2016 +0200 @@ -938,6 +938,9 @@ procedure RenderWeaponTooltip(atype: TAmmoType); var r: TSDL_Rect; i: LongInt; + ammoname: ansistring; + ammocap: ansistring; + ammodesc: ansistring; extra: ansistring; extracolor: LongInt; begin @@ -978,8 +981,23 @@ extracolor:= 0; end; +if length(trluaammo[Ammoz[atype].NameId]) > 0 then + ammoname := trluaammo[Ammoz[atype].NameId] +else + ammoname := trammo[Ammoz[atype].NameId]; + +if length(trluaammoc[Ammoz[atype].NameId]) > 0 then + ammocap := trluaammoc[Ammoz[atype].NameId] +else + ammocap := trammoc[Ammoz[atype].NameId]; + +if length(trluaammod[Ammoz[atype].NameId]) > 0 then + ammodesc := trluaammod[Ammoz[atype].NameId] +else + ammodesc := trammod[Ammoz[atype].NameId]; + // render window and return the texture -WeaponTooltipTex:= RenderHelpWindow(trammo[Ammoz[atype].NameId], trammoc[Ammoz[atype].NameId], trammod[Ammoz[atype].NameId], extra, extracolor, SpritesData[sprAMAmmos].Surface, @r) +WeaponTooltipTex:= RenderHelpWindow(ammoname, ammocap, ammodesc, extra, extracolor, SpritesData[sprAMAmmos].Surface, @r) end; procedure ShowWeaponTooltip(x, y: LongInt);