X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_weapons.pas;h=aa78ebd94e7ddae5fa7f224eada8b21f0cf3f79e;hb=a6271e37492b08be8791fdc0b452f42e04c86d16;hp=88670fdb5a59ccf102cfa252b8ff235e816020d3;hpb=487e04991bdf82d82a690011784a9735c0f60060;p=d2df-sdl.git diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas index 88670fd..aa78ebd 100644 --- a/src/game/g_weapons.pas +++ b/src/game/g_weapons.pas @@ -1512,7 +1512,7 @@ begin stt := curTimeMicro(); {$ENDIF} - wallHitFlag := g_Map_traceToNearestWall(x, y, x2, y2, @wallHitX, @wallHitY); + wallHitFlag := (g_Map_traceToNearestWall(x, y, x2, y2, @wallHitX, @wallHitY) <> nil); if wallHitFlag then begin x2 := wallHitX; @@ -1528,7 +1528,7 @@ begin if playerPossibleHit() then exit; // instant hit // collect monsters - g_Mons_alongLine(x, y, x2, y2, sqchecker); + g_Mons_AlongLine(x, y, x2, y2, sqchecker); // here, we collected all monsters and players in `wgunHitHeap` and `wgunHitTime` // also, if `wallWasHit` is `true`, then `wallHitX` and `wallHitY` contains spark coords