X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_player.pas;h=dc80fdd1770a68dfa16053c1171136045c457290;hb=5cf51214e027b782e1276c98278413a06ebee294;hp=de559b7f008d25083f853e9f4486efef4c6db812;hpb=52853ee4939a9c85c9e8aded0b60bdbc2d9d8821;p=d2df-sdl.git diff --git a/src/game/g_player.pas b/src/game/g_player.pas index de559b7..dc80fdd 100644 --- a/src/game/g_player.pas +++ b/src/game/g_player.pas @@ -95,6 +95,7 @@ const PLAYER_AP_SOFT = 100; PLAYER_AP_LIMIT = 200; SUICIDE_DAMAGE = 112; + WEAPON_DELAY = 5; PLAYER1_DEF_COLOR: TRGB = (R:64; G:175; B:48); PLAYER2_DEF_COLOR: TRGB = (R:96; G:96; B:96); @@ -2284,11 +2285,11 @@ begin if FAlive then begin indX := FObj.X+FObj.Rect.X; - indY := FObj.Y - 12; + indY := FObj.Y; if g_Texture_Get('TEXTURE_PLAYER_INDICATOR', ID) then begin e_GetTextureSize(ID, @indW, @indH); - e_Draw(ID, indX + indW div 2, indY, 0, True, False); + e_Draw(ID, indX + indW div 2, indY - indH, 0, True, False); end; end; //e_TextureFontPrint(indX, indY, FName, gStdFont); // Shows player name overhead @@ -3616,7 +3617,7 @@ begin begin //e_WriteLog(Format(' SWITCH: cur=%d; new=%d', [FCurrWeap, cwi]), MSG_WARNING); result := Byte(cwi); - FNextWeapDelay := 10; + FNextWeapDelay := WEAPON_DELAY; exit; end; end; @@ -3661,7 +3662,7 @@ begin // i found her! result := Byte(i); resetWeaponQueue(); - FNextWeapDelay := 10; // anyway, 'cause why not + FNextWeapDelay := WEAPON_DELAY; // anyway, 'cause why not exit; end; end;