"
diff -r a69124eb7ce7 -r 6adf27e85cae QTfrontend/ui/widget/databrowser.cpp
--- a/QTfrontend/ui/widget/databrowser.cpp Tue May 17 23:29:49 2016 +0300
+++ b/QTfrontend/ui/widget/databrowser.cpp Fri Jul 15 22:39:07 2016 +0300
@@ -52,7 +52,7 @@
qDebug() << "Requesting resource" << name.toString();
requestedResources.insert(name.toString());
- QNetworkRequest newRequest(QUrl("http://www.hedgewars.org" + name.toString()));
+ QNetworkRequest newRequest(QUrl("https://www.hedgewars.org" + name.toString()));
newRequest.setAttribute(typeAttribute, type);
newRequest.setAttribute(urlAttribute, name);
diff -r a69124eb7ce7 -r 6adf27e85cae gameServer/CMakeLists.txt
--- a/gameServer/CMakeLists.txt Tue May 17 23:29:49 2016 +0300
+++ b/gameServer/CMakeLists.txt Fri Jul 15 22:39:07 2016 +0300
@@ -9,7 +9,6 @@
check_haskell_module_exists("Data.Map" size 1 containers)
check_haskell_module_exists("Data.Vector" length 1 vector)
check_haskell_module_exists("Data.ByteString" pack 1 bytestring)
-check_haskell_module_exists("Text.Show.ByteString" putDigit 1 bytestring-show)
check_haskell_module_exists("Network.BSD" getHostName 0 network)
check_haskell_module_exists("Data.Time" getCurrentTime 0 time)
check_haskell_module_exists("Control.Monad.State" fix 1 mtl)
diff -r a69124eb7ce7 -r 6adf27e85cae gameServer/Utils.hs
--- a/gameServer/Utils.hs Tue May 17 23:29:49 2016 +0300
+++ b/gameServer/Utils.hs Fri Jul 15 22:39:07 2016 +0300
@@ -29,7 +29,6 @@
import qualified Data.List as List
import Control.Monad
import qualified Data.ByteString.Lazy as BL
-import qualified Text.Show.ByteString as BS
import qualified Data.ByteString.Char8 as B
import qualified Data.ByteString.UTF8 as UTF8
import Data.Maybe
@@ -132,8 +131,8 @@
Right (a, new_b) -> let (a', b') = unfoldrE f new_b in (a : a', b')
Left new_b -> ([], new_b)
-showB :: (BS.Show a) => a -> B.ByteString
-showB = B.concat . BL.toChunks . BS.show
+showB :: (Show a) => a -> B.ByteString
+showB = B.pack . show
readInt_ :: (Num a) => B.ByteString -> a
readInt_ str =
diff -r a69124eb7ce7 -r 6adf27e85cae gameServer/hedgewars-server.cabal
--- a/gameServer/hedgewars-server.cabal Tue May 17 23:29:49 2016 +0300
+++ b/gameServer/hedgewars-server.cabal Fri Jul 15 22:39:07 2016 +0300
@@ -21,7 +21,6 @@
containers,
vector,
bytestring,
- bytestring-show,
network >= 2.3,
random,
time,
diff -r a69124eb7ce7 -r 6adf27e85cae hedgewars/hwengine.pas
--- a/hedgewars/hwengine.pas Tue May 17 23:29:49 2016 +0300
+++ b/hedgewars/hwengine.pas Fri Jul 15 22:39:07 2016 +0300
@@ -42,22 +42,6 @@
implementation
uses uFLUICallback, uFLTypes;
-// TODO localization support
-procedure ShowCredits();
-var themeCredits, mapCredits: shortstring;
-begin
- if Length(cMapName) > 0 then
- begin
- mapCredits:= read1stLn(cPathz[ptMapCurrent] + '/credits.txt');
- if Length(mapCredits) > 0 then
- AddChatString(char(#11) + '© Map: ' + mapCredits);
- end;
-
- themeCredits:= read1stLn(cPathz[ptCurrTheme] + '/credits.txt');
- if Length(themeCredits) > 0 then
- AddChatString(char(#12) + '© Theme: ' + themeCredits);
-end;
-
///////////////////////////////////////////////////////////////////////////////
function DoTimer(Lag: LongInt): boolean;
var s: shortstring;
@@ -102,7 +86,6 @@
with TeamsArray[t]^ do
MaxTeamHealth:= TeamHealth;
RecountAllTeamsHealth;
- if not cOnlyStats then ShowCredits;
GameState:= gsGame;
end;
gsConfirm, gsGame, gsChat:
diff -r a69124eb7ce7 -r 6adf27e85cae hedgewars/uChat.pas
--- a/hedgewars/uChat.pas Tue May 17 23:29:49 2016 +0300
+++ b/hedgewars/uChat.pas Fri Jul 15 22:39:07 2016 +0300
@@ -70,7 +70,7 @@
const
- colors: array[#0..#12] of TSDL_Color = (
+ colors: array[#0..#9] of TSDL_Color = (
(r:$FF; g:$FF; b:$FF; a:$FF), // #0 unused, feel free to take it for anything
(r:$FF; g:$FF; b:$FF; a:$FF), // #1 chat message [White]
(r:$FF; g:$00; b:$FF; a:$FF), // #2 action message [Purple]
@@ -80,10 +80,7 @@
(r:$00; g:$FF; b:$FF; a:$FF), // #6 input line [Light Blue]
(r:$FF; g:$80; b:$80; a:$FF), // #7 team gone [Light Red]
(r:$FF; g:$D0; b:$80; a:$FF), // #8 team back [Light Orange]
- (r:$DF; g:$DF; b:$DF; a:$FF), // #9 hog speech [Light Gray]
- (r:$FF; g:$00; b:$FF; a:$AF), // #10 music credits [Purple]
- (r:$00; g:$FF; b:$FF; a:$AF), // #11 map credits [Light Blue]
- (r:$FF; g:$D0; b:$80; a:$AF) // #12 theme credits [Light Orange]
+ (r:$DF; g:$DF; b:$DF; a:$FF) // #9 hog speech [Light Gray]
);
ChatCommandz: array [TChatCmd] of record
ChatCmd: string[31];
@@ -208,13 +205,10 @@
end;
const ClDisplayDuration = 12500;
- CreditsDisplayDur = 2500;
procedure SetLine(var cl: TChatLine; str: shortstring; isInput: boolean);
var color : TSDL_Color;
- credits: boolean;
begin
-credits:= false;
if isInput then
begin
cl.s:= str;
@@ -226,7 +220,6 @@
if str[1] <= High(colors) then
begin
color:= colors[str[1]];
- credits:= (str[1] >= #10) and (str[1] <= #12);
delete(str, 1, 1);
end
// fallback if invalid color
@@ -241,10 +234,7 @@
// set texture, note: variables cl.s and str will be different here if isInput
RenderChatLineTex(cl, str);
-if credits then
- cl.Time:= RealTicks + CreditsDisplayDur
-else
- cl.Time:= RealTicks + ClDisplayDuration;
+cl.Time:= RealTicks + ClDisplayDuration;
end;
// For uStore texture recreation
diff -r a69124eb7ce7 -r 6adf27e85cae hedgewars/uConsts.pas
--- a/hedgewars/uConsts.pas Tue May 17 23:29:49 2016 +0300
+++ b/hedgewars/uConsts.pas Fri Jul 15 22:39:07 2016 +0300
@@ -26,6 +26,7 @@
{$INCLUDE "config.inc"}
const
+ HDPIScaleFactor = 1;
HaltNoError = 0;
HaltUsageError = 1;
HaltFatalError = 2;
@@ -180,7 +181,8 @@
cKeyMaxIndex = 1600;
cKbdMaxIndex = 65536;//need more room for the modifier keys
- cFontBorder = 2;
+ cFontBorder = 2 * HDPIScaleFactor;
+ cFontPadding = 2 * HDPIScaleFactor;
cDefaultBuildMaxDist = 256;
diff -r a69124eb7ce7 -r 6adf27e85cae hedgewars/uGearsHandlersRope.pas
--- a/hedgewars/uGearsHandlersRope.pas Tue May 17 23:29:49 2016 +0300
+++ b/hedgewars/uGearsHandlersRope.pas Fri Jul 15 22:39:07 2016 +0300
@@ -498,7 +498,7 @@
end;
if Gear^.Elasticity < _20 then Gear^.CollisionMask:= lfLandMask
- else Gear^.CollisionMask:= lfNotObjMask or lfNotHHObjMask;
+ else Gear^.CollisionMask:= lfNotCurrentMask; //lfNotObjMask or lfNotHHObjMask;
CheckCollision(Gear);
if (Gear^.State and gstCollision) <> 0 then
diff -r a69124eb7ce7 -r 6adf27e85cae hedgewars/uGearsList.pas
--- a/hedgewars/uGearsList.pas Tue May 17 23:29:49 2016 +0300
+++ b/hedgewars/uGearsList.pas Fri Jul 15 22:39:07 2016 +0300
@@ -407,7 +407,7 @@
RopePoints.Count:= 0;
gear^.Tint:= $D8D8D8FF;
gear^.Tag:= 0; // normal rope render
- gear^.CollisionMask:= lfNotObjMask or lfNotHHObjMask;
+ gear^.CollisionMask:= lfNotCurrentMask //lfNotObjMask or lfNotHHObjMask;
end;
gtMine: begin
gear^.ImpactSound:= sndMineImpact;
diff -r a69124eb7ce7 -r 6adf27e85cae hedgewars/uPhysFSLayer.pas
--- a/hedgewars/uPhysFSLayer.pas Tue May 17 23:29:49 2016 +0300
+++ b/hedgewars/uPhysFSLayer.pas Fri Jul 15 22:39:07 2016 +0300
@@ -43,7 +43,7 @@
procedure hedgewarsMountPackage(filename: PChar); cdecl; external PhyslayerLibName;
implementation
-uses uConsts, uUtils, uVariables{$IFDEF PAS2C}, physfs{$ENDIF};
+uses uConsts, uUtils, uVariables{$IFNDEF PAS2C}{$IFDEF HWLIBRARY}, sysutils{$ENDIF}{$ELSE}, physfs{$ENDIF};
function PHYSFSRWOPS_openRead(fname: PChar): PSDL_RWops; cdecl; external PhyslayerLibName;
function PHYSFSRWOPS_openWrite(fname: PChar): PSDL_RWops; cdecl; external PhyslayerLibName;
diff -r a69124eb7ce7 -r 6adf27e85cae hedgewars/uRenderUtils.pas
--- a/hedgewars/uRenderUtils.pas Tue May 17 23:29:49 2016 +0300
+++ b/hedgewars/uRenderUtils.pas Fri Jul 15 22:39:07 2016 +0300
@@ -51,23 +51,23 @@
BorderColor:= SDL_MapRGB(Surface^.format, BorderColor shr 16, BorderColor shr 8, BorderColor and $FF);
FillColor:= SDL_MapRGB(Surface^.format, FillColor shr 16, FillColor shr 8, FillColor and $FF);
- r.y:= rect^.y + 1;
- r.h:= rect^.h - 2;
+ r.y:= rect^.y + cFontBorder div 2;
+ r.h:= rect^.h - cFontBorder;
SDL_FillRect(Surface, @r, BorderColor);
- r.x:= rect^.x + 1;
- r.w:= rect^.w - 2;
+ r.x:= rect^.x + cFontBorder div 2;
+ r.w:= rect^.w - cFontBorder;
r.y:= rect^.y;
r.h:= rect^.h;
SDL_FillRect(Surface, @r, BorderColor);
- r.x:= rect^.x + 2;
- r.y:= rect^.y + 1;
- r.w:= rect^.w - 4;
- r.h:= rect^.h - 2;
+ r.x:= rect^.x + cFontBorder;
+ r.y:= rect^.y + cFontBorder div 2;
+ r.w:= rect^.w - cFontBorder * 2;
+ r.h:= rect^.h - cFontBorder;
SDL_FillRect(Surface, @r, FillColor);
- r.x:= rect^.x + 1;
- r.y:= rect^.y + 2;
- r.w:= rect^.w - 2;
- r.h:= rect^.h - 4;
+ r.x:= rect^.x + cFontBorder div 2;
+ r.y:= rect^.y + cFontBorder;
+ r.w:= rect^.w - cFontBorder;
+ r.h:= rect^.h - cFontBorder * 2;
SDL_FillRect(Surface, @r, FillColor);
end;
(*
@@ -83,10 +83,10 @@
finalRect, textRect: TSDL_Rect;
begin
TTF_SizeUTF8(Fontz[Font].Handle, PChar(s), @w, @h);
- if (maxLength > 0) and (w > maxLength) then w := maxLength;
+ if (maxLength > 0) and (w > maxLength * HDPIScaleFactor) then w := maxLength * HDPIScaleFactor;
finalRect.x:= X;
finalRect.y:= Y;
- finalRect.w:= w + cFontBorder * 2 + 4;
+ finalRect.w:= w + cFontBorder * 2 + cFontPadding * 2;
finalRect.h:= h + cFontBorder * 2;
textRect.x:= X;
textRect.y:= Y;
@@ -97,7 +97,7 @@
clr.g:= (Color shr 8) and $FF;
clr.b:= Color and $FF;
tmpsurf:= TTF_RenderUTF8_Blended(Fontz[Font].Handle, PChar(s), clr);
- finalRect.x:= X + cFontBorder + 2;
+ finalRect.x:= X + cFontBorder + cFontPadding;
finalRect.y:= Y + cFontBorder;
if SDLCheck(tmpsurf <> nil, 'TTF_RenderUTF8_Blended', true) then
exit;
@@ -105,7 +105,7 @@
SDL_FreeSurface(tmpsurf);
finalRect.x:= X;
finalRect.y:= Y;
- finalRect.w:= w + cFontBorder * 2 + 4;
+ finalRect.w:= w + cFontBorder * 2 + cFontPadding * 2;
finalRect.h:= h + cFontBorder * 2;
WriteInRoundRect:= finalRect;
end;
@@ -290,9 +290,9 @@
font:= CheckCJKFont(s, font);
w:= 0; h:= 0; // avoid compiler hints
TTF_SizeUTF8(Fontz[font].Handle, PChar(s), @w, @h);
- if (maxLength > 0) and (w > maxLength) then w := maxLength;
+ if (maxLength > 0) and (w > maxLength * HDPIScaleFactor) then w := maxLength * HDPIScaleFactor;
- finalSurface:= SDL_CreateRGBSurface(SDL_SWSURFACE, w + cFontBorder * 2 + 4, h + cFontBorder * 2,
+ finalSurface:= SDL_CreateRGBSurface(SDL_SWSURFACE, w + cFontBorder*2 + cFontPadding*2, h + cFontBorder * 2,
32, RMask, GMask, BMask, AMask);
if checkFails(finalSurface <> nil, 'RenderString: fail to create surface', true) then
diff -r a69124eb7ce7 -r 6adf27e85cae hedgewars/uSound.pas
--- a/hedgewars/uSound.pas Tue May 17 23:29:49 2016 +0300
+++ b/hedgewars/uSound.pas Fri Jul 15 22:39:07 2016 +0300
@@ -581,20 +581,6 @@
SDLCheck(Mus <> nil, 'Mix_LoadMUS_RW', false);
WriteLnToConsole(msgOK);
- // display music credits
- s:= s + '_credits.txt';
-
- // if per-file credits not found check general music credits file
- if pfsExists(s) then
- s:= read1stLn(s)
- else if SuddenDeath and (SDMusicFN <> '') then
- s:= readValueFromINI(SDMusicFN, '/Music/credits.txt')
- else
- s:= readValueFromINI(MusicFN, '/Music/credits.txt');
-
- if Length(s) > 0 then
- AddChatString(char(#10) + '© Music: ' + s);
-
SDLCheck(Mix_FadeInMusic(Mus, -1, 3000) <> -1, 'Mix_FadeInMusic', false)
end;
diff -r a69124eb7ce7 -r 6adf27e85cae hedgewars/uVariables.pas
--- a/hedgewars/uVariables.pas Tue May 17 23:29:49 2016 +0300
+++ b/hedgewars/uVariables.pas Fri Jul 15 22:39:07 2016 +0300
@@ -296,28 +296,28 @@
const
FontzInit: array[THWFont] of THHFont = (
(Handle: nil;
- Height: 12;
+ Height: 12*HDPIScaleFactor;
style: TTF_STYLE_NORMAL;
Name: 'DejaVuSans-Bold.ttf'),
(Handle: nil;
- Height: 24;
+ Height: 24*HDPIScaleFactor;
style: TTF_STYLE_NORMAL;
Name: 'DejaVuSans-Bold.ttf'),
(Handle: nil;
- Height: 10;
+ Height: 10*HDPIScaleFactor;
style: TTF_STYLE_NORMAL;
Name: 'DejaVuSans-Bold.ttf')
{$IFNDEF MOBILE}, // remove chinese fonts for now
(Handle: nil;
- Height: 12;
+ Height: 12*HDPIScaleFactor;
style: TTF_STYLE_NORMAL;
Name: 'wqy-zenhei.ttc'),
(Handle: nil;
- Height: 24;
+ Height: 24*HDPIScaleFactor;
style: TTF_STYLE_NORMAL;
Name: 'wqy-zenhei.ttc'),
(Handle: nil;
- Height: 10;
+ Height: 10*HDPIScaleFactor;
style: TTF_STYLE_NORMAL;
Name: 'wqy-zenhei.ttc')
{$ENDIF}
diff -r a69124eb7ce7 -r 6adf27e85cae share/hedgewars/Data/Locale/hedgewars_ar.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ar.ts Tue May 17 23:29:49 2016 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_ar.ts Fri Jul 15 22:39:07 2016 +0300
@@ -1,6 +1,6 @@
-