hedgewars: comparison hedgewars/uWorld.pas

equal deleted inserted replaced

-:01f88c3b7b66
+:1b2b84315d27
 procedure DrawWorld(Lag: LongInt);
 procedure DrawWorldStereo(Lag: LongInt; RM: TRenderMode);
 procedure ShowMission(caption, subcaption, text: ansistring; icon, time : LongInt);
 procedure HideMission;
+procedure SetAmmoTexts(ammoType: TAmmoType; name: ansistring; caption: ansistring; description: ansistring);
 procedure ShakeCamera(amount: LongInt);
 procedure InitCameraBorders;
 procedure InitTouchInterface;
 procedure SetUtilityWidgetState(ammoType: TAmmoType);
 procedure animateWidget(widget: POnScreenWidget; fade, showWidget: boolean);
 , uRender
 , uCaptions
 , uCursor
 , uCommands
 , uTeams
+, uDebug
 {$IFDEF USE_VIDEO_RECORDING}
 , uVideoRec
 {$ENDIF}
 ;
 // if special game flags/settings are changed, add them to the game mode notice window and then show it
 g:= ''; // no text/things to note yet
 // add custom goals from lua script if there are any
-if LuaGoals <> '' then
+if LuaGoals <> ansistring('') then
 g:= LuaGoals + '|';
-// check different game flags (goals/game modes first for now)
+// check different game flags
+g:= AddGoal(g, gfPlaceHog, gidPlaceHog); // placement?
 g:= AddGoal(g, gfKing, gidKing); // king?
+if ((GameFlags and gfKing) <> 0) and ((GameFlags and gfPlaceHog) = 0) then
+g:= AddGoal(g, gfAny, gidPlaceKing);
 g:= AddGoal(g, gfTagTeam, gidTagTeam); // tag team mode?
+g:= AddGoal(g, gfSharedAmmo, gidSharedAmmo); // shared ammo?
-// other important flags
+g:= AddGoal(g, gfPerHogAmmo, gidPerHogAmmo);
-g:= AddGoal(g, gfForts, gidForts); // forts?
+g:= AddGoal(g, gfMoreWind, gidMoreWind);
 g:= AddGoal(g, gfLowGravity, gidLowGravity); // low gravity?
-g:= AddGoal(g, gfInvulnerable, gidInvulnerable); // invulnerability?
+g:= AddGoal(g, gfSolidLand, gidSolidLand); // solid land?
-g:= AddGoal(g, gfVampiric, gidVampiric); // vampirism?
-g:= AddGoal(g, gfKarma, gidKarma); // karma?
-g:= AddGoal(g, gfPlaceHog, gidPlaceHog); // placement?
 g:= AddGoal(g, gfArtillery, gidArtillery); // artillery?
-g:= AddGoal(g, gfSolidLand, gidSolidLand); // solid land?
-g:= AddGoal(g, gfSharedAmmo, gidSharedAmmo); // shared ammo?
-g:= AddGoal(g, gfResetHealth, gidResetHealth);
-g:= AddGoal(g, gfAISurvival, gidAISurvival);
 g:= AddGoal(g, gfInfAttack, gidInfAttack);
 g:= AddGoal(g, gfResetWeps, gidResetWeps);
-g:= AddGoal(g, gfPerHogAmmo, gidPerHogAmmo);
+g:= AddGoal(g, gfResetHealth, gidResetHealth);
+g:= AddGoal(g, gfKarma, gidKarma); // karma?
+g:= AddGoal(g, gfVampiric, gidVampiric); // vampirism?
+g:= AddGoal(g, gfInvulnerable, gidInvulnerable); // invulnerability?
+g:= AddGoal(g, gfAISurvival, gidAISurvival);
 // modified damage modificator?
 if cDamagePercent <> 100 then
 g:= AddGoal(g, gfAny, gidDamageModifier, cDamagePercent);
 begin
 if cOnlyStats then exit(nil);
 SlotsNum:= 0;
 for i:= 0 to cMaxSlotIndex do
-if((i = 0) and (Ammo^[i,1].Count > 0)) or ((i <> 0) and (Ammo^[i,0].Count > 0)) then
+if (i <> cHiddenSlotIndex) and (Ammo^[i, 0].Count > 0) then
 inc(SlotsNum);
 {$IFDEF USE_LANDSCAPE_AMMOMENU}
 SlotsNumX:= SlotsNum;
 SlotsNumY:= cMaxSlotAmmoIndex + 2;
 {$IFDEF USE_AM_NUMCOLUMN}
 SDL_FillRect(amSurface, @AMRect, SDL_MapRGB(amSurface^.format, 0,0,0));
 x:= AMRect.x;
 y:= AMRect.y;
 for i:= 0 to cMaxSlotIndex do
-if ((i = 0) and (Ammo^[i, 1].Count > 0)) or ((i <> 0) and (Ammo^[i, 0].Count > 0)) then
+if (i <> cHiddenSlotIndex) and (Ammo^[i, 0].Count > 0) then
 begin
 {$IFDEF USE_LANDSCAPE_AMMOMENU}
 y:= AMRect.y;
 {$ELSE}
 x:= AMRect.x;
 Pos:= -1;
 Slot:= -1;
 {$IFDEF USE_LANDSCAPE_AMMOMENU}
 c:= -1;
 for i:= 0 to cMaxSlotIndex do
-if ((i = 0) and (Ammo^[i, 1].Count > 0)) or ((i <> 0) and (Ammo^[i, 0].Count > 0)) then
+if (i <> cHiddenSlotIndex) and (Ammo^[i, 0].Count > 0) then
 begin
 inc(c);
 {$IFDEF USE_AM_NUMCOLUMN}
 g:= 1;
 {$ELSE}
 end;
 end;
 {$ELSE}
 c:= -1;
 for i:= 0 to cMaxSlotIndex do
-if ((i = 0) and (Ammo^[i, 1].Count > 0)) or ((i <> 0) and (Ammo^[i, 0].Count > 0)) then
+if (i <> cHiddenSlotIndex) and (Ammo^[i, 0].Count > 0) then
 begin
 inc(c);
 {$IFDEF USE_AM_NUMCOLUMN}
 g:= 1;
 {$ELSE}
 end;
 inc(g);
 end;
 end;
 {$ENDIF}
-if (Pos >= 0) and (Pos <= cMaxSlotAmmoIndex) and (Slot >= 0) and (Slot <= cMaxSlotIndex)then
+if (Pos >= 0) and (Pos <= cMaxSlotAmmoIndex) and (Slot >= 0) and (Slot <= cMaxSlotIndex) and (Slot <> cHiddenSlotIndex) then
 begin
 if (AMShiftX = 0) and (AMShiftY = 0) then
 if (Ammo^[Slot, Pos].Count > 0) and (Ammo^[Slot, Pos].AmmoType <> amNothing) then
 begin
 if (amSel <> Ammo^[Slot, Pos].AmmoType) or (WeaponTooltipTex = nil) then
 end;
 end;
 procedure RenderTeamsHealth;
-var t, i, h, smallScreenOffset, TeamHealthBarWidth : LongInt;
+var t, i,  h, smallScreenOffset, TeamHealthBarWidth : LongInt;
 r: TSDL_Rect;
 highlight: boolean;
 htex: PTexture;
 begin
 if TeamsCount * 20 > Longword(cScreenHeight) div 7 then  // take up less screen on small displays
 WorldDx:= preShiftWorldDx;
 end;
 procedure DrawWorldStereo(Lag: LongInt; RM: TRenderMode);
 var i, t: LongInt;
+spr: TSprite;
 r: TSDL_Rect;
 tdx, tdy: Double;
 s: shortstring;
 offsetX, offsetY, screenBottom: LongInt;
 replicateToLeft, replicateToRight, tmp: boolean;
+{$IFDEF USE_VIDEO_RECORDING}
 a: Byte;
+{$ENDIF}
 begin
 if WorldEdge <> weWrap then
 begin
 replicateToLeft := false;
 replicateToRight:= false;
 HorizontOffset:= HorizontOffset + ((ScreenBottom-SkyOffset) div 20);
 // background
 ChangeDepth(RM, cStereo_Sky);
 if SuddenDeathDmg then
-Tint(SDTint, SDTint, SDTint, $FF);
+Tint(SDTint.r, SDTint.g, SDTint.b, SDTint.a);
 DrawRepeated(sprSky, sprSkyL, sprSkyR, (WorldDx + LAND_WIDTH div 2) * 3 div 8, SkyOffset);
 ChangeDepth(RM, -cStereo_Horizon);
 DrawRepeated(sprHorizont, sprHorizontL, sprHorizontR, (WorldDx + LAND_WIDTH div 2) * 3 div 5, HorizontOffset);
 if SuddenDeathDmg then
 untint;
 DrawWaves( -1, 25 + WorldDx div 3, - offsetY div 10, 59, 0);
 end
 else
 DrawWaves(-1, 50, cWaveHeight div 2, cWaveHeight div 2, 0);
+DrawGearsTimers;
 // everything after this ChangeDepth will be drawn outside the screen
 // note: negative parallax gears should last very little for a smooth stereo effect
 ChangeDepth(RM, cStereo_Outside);
 if replicateToLeft then
 offsetX:= cScreenHeight - 13;
 {$ELSE}
 offsetX:= 48;
 {$ENDIF}
 offsetY:= cOffsetY;
-if ((TurnTimeLeft <> 0) and (TurnTimeLeft < 1000000)) or (ReadyTimeLeft <> 0) then
+if ((TurnTimeLeft <> 0) and (TurnTimeLeft < 999000)) or (ReadyTimeLeft <> 0) then
 begin
 if ReadyTimeLeft <> 0 then
 i:= Succ(Pred(ReadyTimeLeft) div 1000)
 else
 i:= Succ(Pred(TurnTimeLeft) div 1000);
 t:= 80;
 DrawSprite(sprFrame, -(cScreenWidth shr 1) + t + offsetY, cScreenHeight - offsetX, 1);
 while i > 0 do
 begin
 dec(t, 32);
-DrawSprite(sprBigDigit, -(cScreenWidth shr 1) + t + offsetY, cScreenHeight - offsetX, i mod 10);
+if isPaused or (not IsClockRunning()) then
+spr := sprBigDigitGray
+else if (ReadyTimeLeft <> 0) then
+spr := sprBigDigitGreen
+else if IsGetAwayTime then
+spr := sprBigDigitRed
+else
+spr := sprBigDigit;
+DrawSprite(spr, -(cScreenWidth shr 1) + t + offsetY, cScreenHeight - offsetX, i mod 10);
 i:= i div 10
 end;
 DrawSprite(sprFrame, -(cScreenWidth shr 1) + t - 4 + offsetY, cScreenHeight - offsetX, 0);
 end;
 r.w:= - WindBarWidth;
 r.h:= 13;
 DrawSpriteFromRect(sprWindL, r, (cScreenWidth shr 1) - offsetY + 74 + WindBarWidth, cScreenHeight - offsetX + 2, 13, 0);
 end
 end;
+{$IFNDEF USE_TOUCH_INTERFACE}
+// Indicators for global effects (extra damage, low gravity)
+// TODO: Add support for touch interface (need to find out correct offset)
+if UIDisplay <> uiNone then
+begin
+offsetX:= 45;
+offsetY:= 51;
+if cDamageModifier = _1_5 then
+begin
+DrawTextureF(ropeIconTex, 1, (cScreenWidth shr 1) - offsetX, cScreenHeight - offsetY, 0, 1, 32, 32);
+DrawTextureF(SpritesData[sprAMAmmos].Texture, 0.90, (cScreenWidth shr 1) - offsetX, cScreenHeight - offsetY, ord(amExtraDamage) - 1, 1, 32, 32);
+offsetX := offsetX + 33
+end;
+if (cLowGravity) or ((GameFlags and gfLowGravity) <> 0) then
+begin
+DrawTextureF(ropeIconTex, 1, (cScreenWidth shr 1) - offsetX, cScreenHeight - offsetY, 0, 1, 32, 32);
+DrawTextureF(SpritesData[sprAMAmmos].Texture, 0.90, (cScreenWidth shr 1) - offsetX, cScreenHeight - offsetY, ord(amLowGravity) - 1, 1, 32, 32);
+end;
+end;
+{$ENDIF}
 // AmmoMenu
 if bShowAmmoMenu and ((AMState = AMHidden) or (AMState = AMHiding)) then
 begin
 if (AMState = AMHidden) then
 procedure HideMission;
 begin
 missionTimer:= 0;
 end;
+procedure SetAmmoTexts(ammoType: TAmmoType; name: ansistring; caption: ansistring; description: ansistring);
+var
+ammoStrId: TAmmoStrId;
+ammoStr: ansistring;
+tmpsurf: PSDL_Surface;
+begin
+ammoStrId := Ammoz[ammoType].NameId;
+trluaammo[ammoStrId] := name;
+if length(trluaammo[ammoStrId]) > 0 then
+ammoStr:= trluaammo[ammoStrId]
+else
+ammoStr:= trammo[ammoStrId];
+if checkFails(length(ammoStr) > 0,'No default text/translation found for ammo type #' + intToStr(ord(ammoType)) + '!',true) then exit;
+tmpsurf:= TTF_RenderUTF8_Blended(Fontz[CheckCJKFont(ammoStr,fnt16)].Handle, PChar(ammoStr), cWhiteColorChannels);
+if checkFails(tmpsurf <> nil,'Name-texture creation for ammo type #' + intToStr(ord(ammoType)) + ' failed!',true) then exit;
+tmpsurf:= doSurfaceConversion(tmpsurf);
+FreeAndNilTexture(Ammoz[ammoType].NameTex);
+Ammoz[ammoType].NameTex:= Surface2Tex(tmpsurf, false);
+SDL_FreeSurface(tmpsurf);
+trluaammoc[ammoStrId] := caption;
+trluaammod[ammoStrId] := description;
+end;
 procedure ShakeCamera(amount: LongInt);
 begin
 if isCursorVisible then
 exit;
 amount:= Max(1, round(amount*zoom/2));

branch	qmlfrontend
changeset 12855	1b2b84315d27
parent 12831	1fbc0d5a82d0
child 12890	9c259fb4d405
child 13018	0248cf0da834
child 13224	01ab48b253ef