GIT
/
REPO
/
FRED-BOY
Projects
/
d2df-sdl.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
69e1b76
)
draw talkbubble above the player corpse when necessary
author
fgsfds <pvt.fgsfds@gmail.com>
Thu, 12 Mar 2020 19:12:55 +0000
(22:12 +0300)
committer
fgsfds <pvt.fgsfds@gmail.com>
Thu, 12 Mar 2020 19:12:55 +0000
(22:12 +0300)
src/game/g_player.pas
patch
|
blob
|
history
diff --git
a/src/game/g_player.pas
b/src/game/g_player.pas
index 85b8e1537ad9024686d09be58f5ad61914968249..dd5378b5162ce6e2fbbf3f67bf5eee90cda9efbb 100644
(file)
--- a/
src/game/g_player.pas
+++ b/
src/game/g_player.pas
@@
-2454,8
+2454,11
@@
var
Rb, Gb, Bb,
Rw, Gw, Bw: SmallInt;
Dot: Byte;
+ CObj: TObj;
begin
- FObj.lerp(gLerpFactor, fX, fY);
+ CObj := getCameraObj();
+ CObj.lerp(gLerpFactor, fX, fY);
+ // NB: _F_Obj.Rect is used to keep the bubble higher; this is not a mistake
bubX := fX+FObj.Rect.X + IfThen(FDirection = TDirection.D_LEFT, -4, 18);
bubY := fY+FObj.Rect.Y - 18;
Rb := 64;
DEADSOFTWARE 2012-2025