# HG changeset patch # User nemo # Date 1285132180 14400 # Node ID e4b7b30232fd7c800fa2fa11def6dcb5d1cfbf87 # Parent f7d6834a54fe070117c8376f98b281db68cc0a4e Extend time limit to 9999, remove ready timer if time is over 999 and stop drawing time if it is over 999 (draws wrong over 999 anyway) - this has the effect of allowing an "unlimited" time appearance if turns are over a quarter hour or so. This can be used to add an unlimited time scheme or button to ipad diff -r f7d6834a54fe -r e4b7b30232fd QTfrontend/pages.cpp --- a/QTfrontend/pages.cpp Sun Sep 19 22:56:53 2010 +0200 +++ b/QTfrontend/pages.cpp Wed Sep 22 01:09:40 2010 -0400 @@ -1567,7 +1567,7 @@ glBSLayout->addWidget(l,1,1,1,1); SB_TurnTime = new QSpinBox(gbBasicSettings); - SB_TurnTime->setRange(1, 99); + SB_TurnTime->setRange(1, 9999); SB_TurnTime->setValue(45); SB_TurnTime->setSingleStep(15); glBSLayout->addWidget(SB_TurnTime,1,2,1,1); diff -r f7d6834a54fe -r e4b7b30232fd hedgewars/uTeams.pas --- a/hedgewars/uTeams.pas Sun Sep 19 22:56:53 2010 +0200 +++ b/hedgewars/uTeams.pas Wed Sep 22 01:09:40 2010 -0400 @@ -288,7 +288,7 @@ PlaySound(sndIllGetYou, CurrentTeam^.voicepack) else PlaySound(sndYesSir, CurrentTeam^.voicepack); - ReadyTimeLeft:= cReadyDelay; + if PlacingHogs or (cHedgehogTurnTime < 1000000) then ReadyTimeLeft:= cReadyDelay; AddCaption(Format(shortstring(trmsg[sidReady]), CurrentTeam^.TeamName), cWhiteColor, capgrpGameState) end else diff -r f7d6834a54fe -r e4b7b30232fd hedgewars/uWorld.pas --- a/hedgewars/uWorld.pas Sun Sep 19 22:56:53 2010 +0200 +++ b/hedgewars/uWorld.pas Wed Sep 22 01:09:40 2010 -0400 @@ -668,7 +668,7 @@ offsetX:= 48; {$ENDIF} offsetY:= cOffsetY; -if (TurnTimeLeft <> 0) or (ReadyTimeLeft <> 0) then +if ((TurnTimeLeft <> 0) and (TurnTimeLeft < 1000000)) or (ReadyTimeLeft <> 0) then begin if ReadyTimeLeft <> 0 then i:= Succ(Pred(ReadyTimeLeft) div 1000)