equal
deleted
inserted
replaced
819 r2:= r; |
819 r2:= r; |
820 if tmpline <> '' then |
820 if tmpline <> '' then |
821 begin |
821 begin |
822 r:= WriteInRect(tmpsurf, FontBorder + 2, r.y + r.h, $ff707070, font, tmpline); |
822 r:= WriteInRect(tmpsurf, FontBorder + 2, r.y + r.h, $ff707070, font, tmpline); |
823 |
823 |
824 // render highlighted caption (if there's a ':') |
824 // render highlighted caption (if there is a ':') |
825 tmpline2:= ''; |
825 tmpline2:= ''; |
826 SplitByChar(tmpline, tmpline2, ':'); |
826 SplitByChar(tmpline, tmpline2, ':'); |
827 if tmpline2 <> '' then |
827 if tmpline2 <> '' then |
828 WriteInRect(tmpsurf, FontBorder + 2, r2.y + r2.h, $ffc7c7c7, font, tmpline + ':'); |
828 WriteInRect(tmpsurf, FontBorder + 2, r2.y + r2.h, $ffc7c7c7, font, tmpline + ':'); |
829 end |
829 end |
873 if (CurrentTeam <> nil) and (Ammoz[atype].SkipTurns >= CurrentTeam^.Clan^.TurnNumber) then // weapon or utility is not yet available |
873 if (CurrentTeam <> nil) and (Ammoz[atype].SkipTurns >= CurrentTeam^.Clan^.TurnNumber) then // weapon or utility is not yet available |
874 begin |
874 begin |
875 extra:= trmsg[sidNotYetAvailable]; |
875 extra:= trmsg[sidNotYetAvailable]; |
876 extracolor:= LongInt($ffc77070); |
876 extracolor:= LongInt($ffc77070); |
877 end |
877 end |
878 else if (Ammoz[atype].Ammo.Propz and ammoprop_NoRoundEnd) <> 0 then // weapon or utility won't end your turn |
878 else if (Ammoz[atype].Ammo.Propz and ammoprop_NoRoundEnd) <> 0 then // weapon or utility will not end your turn |
879 begin |
879 begin |
880 extra:= trmsg[sidNoEndTurn]; |
880 extra:= trmsg[sidNoEndTurn]; |
881 extracolor:= LongInt($ff70c770); |
881 extracolor:= LongInt($ff70c770); |
882 end |
882 end |
883 else |
883 else |
962 {$IFDEF IPHONEOS} |
962 {$IFDEF IPHONEOS} |
963 // make the sdl window appear on the second monitor when present |
963 // make the sdl window appear on the second monitor when present |
964 x:= x or (SDL_GetNumVideoDisplays() - 1); |
964 x:= x or (SDL_GetNumVideoDisplays() - 1); |
965 y:= y or (SDL_GetNumVideoDisplays() - 1); |
965 y:= y or (SDL_GetNumVideoDisplays() - 1); |
966 |
966 |
967 flags:= flags or SDL_WINDOW_BORDERLESS or SDL_WINDOW_RESIZABLE; |
967 flags:= flags or SDL_WINDOW_BORDERLESS; // do not use SDL_WINDOW_RESIZABLE on ios (yet) |
968 {$ENDIF} |
968 {$ENDIF} |
969 |
969 |
970 SDLwindow:= SDL_CreateWindow('Hedgewars', x, y, cScreenWidth, cScreenHeight, flags); |
970 SDLwindow:= SDL_CreateWindow('Hedgewars', x, y, cScreenWidth, cScreenHeight, flags); |
971 SDLTry(SDLwindow <> nil, true); |
971 SDLTry(SDLwindow <> nil, true); |
972 {$ELSE} |
972 {$ELSE} |