hedgewars-draft: comparison hedgewars/uWorld.pas

equal deleted inserted replaced

-:803b277e4894
+:3f21a9dc93d0
 procedure AddCaption(s: shortstring; Color: Longword; Group: TCapGroup);
 procedure ShowMission(caption, subcaption, text: ansistring; icon, time : LongInt);
 procedure HideMission;
 implementation
-uses	uStore, uMisc, uTeams, uIO, uConsole, uKeys, uLocale, uSound, uAmmos, uVisualGears, uChat, uLandTexture, uLand,
+uses    uStore, uMisc, uTeams, uIO, uConsole, uKeys, uLocale, uSound, uAmmos, uVisualGears, uChat, uLandTexture, uLand,
 {$IFDEF GLES11}
-	gles11;
+gles11;
 {$ELSE}
-	GL;
+GL;
 {$ENDIF}
 type TCaptionStr = record
 Tex: PTexture;
 EndTime: LongWord;
 timeTexture: PTexture;
 FPS: Longword;
 CountTicks: Longword;
 SoundTimerTicks: Longword;
 prevPoint: TPoint;
-	amSel: TAmmoType = amNothing;
+amSel: TAmmoType = amNothing;
-	missionTex: PTexture;
+missionTex: PTexture;
-	missionTimer: LongInt;
+missionTimer: LongInt;
 procedure InitWorld;
 var i, t: LongInt;
 cp: PClan;
 g: ansistring;
 // 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
 // modified damage modificator?
 if cDamagePercent <> 100 then
-	g:= AddGoal(g, gfAny, gidDamageModifier, cDamagePercent);
+g:= AddGoal(g, gfAny, gidDamageModifier, cDamagePercent);
 // modified mine timers?
 if cMinesTime <> 3000 then
-	begin
+begin
-	if cMinesTime = 0 then
+if cMinesTime = 0 then
-		g:= AddGoal(g, gfMines, gidNoMineTimer)
+g:= AddGoal(g, gfMines, gidNoMineTimer)
-	else if cMinesTime < 0 then
+else if cMinesTime < 0 then
-		g:= AddGoal(g, gfMines, gidRandomMineTimer)
+g:= AddGoal(g, gfMines, gidRandomMineTimer)
-	else
+else
-		g:= AddGoal(g, gfMines, gidMineTimer, cMinesTime div 1000);
+g:= AddGoal(g, gfMines, gidMineTimer, cMinesTime div 1000);
-	end;
+end;
 // check different game flags
 g:= AddGoal(g, gfForts, gidForts); // forts?
 g:= AddGoal(g, gfLowGravity, gidLowGravity); // low gravity?
 g:= AddGoal(g, gfInvulnerable, gidInvulnerable); // invulnerability?
 dec(y);
 DrawSprite(sprAMBorders, x, y, 1);
 dec(y, 33);
 DrawSprite(sprAMSlotName, x, y, 0);
 for i:= cMaxSlotIndex downto 0 do
-	if ((i = 0) and (Ammo^[i, 1].Count > 0)) or ((i <> 0) and (Ammo^[i, 0].Count > 0)) then
+if ((i = 0) and (Ammo^[i, 1].Count > 0)) or ((i <> 0) and (Ammo^[i, 0].Count > 0)) then
-		begin
+begin
-		if (cScreenHeight - CursorPoint.Y >= y - 33) and (cScreenHeight - CursorPoint.Y < y) then Slot:= i;
+if (cScreenHeight - CursorPoint.Y >= y - 33) and (cScreenHeight - CursorPoint.Y < y) then Slot:= i;
-		dec(y, 33);
+dec(y, 33);
-		inc(SlotsNum);
+inc(SlotsNum);
-		DrawSprite(sprAMSlot, x, y, 0);
+DrawSprite(sprAMSlot, x, y, 0);
-		DrawSprite(sprAMSlotKeys, x + 2, y + 1, i);
+DrawSprite(sprAMSlotKeys, x + 2, y + 1, i);
-		t:= 0;
+t:= 0;
 g:= 0;
-		while (t <= cMaxSlotAmmoIndex) and (Ammo^[i, t].Count > 0) do
+while (t <= cMaxSlotAmmoIndex) and (Ammo^[i, t].Count > 0) do
-			begin
+begin
-			if (Ammo^[i, t].AmmoType <> amNothing) then
+if (Ammo^[i, t].AmmoType <> amNothing) then
-				begin
+begin
-				l:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber;
+l:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber;
-				if l >= 0 then
+if l >= 0 then
-					begin
+begin
-					DrawSprite(sprAMAmmosBW, x + g * 33 + 35, y + 1, LongInt(Ammo^[i, t].AmmoType)-1);
+DrawSprite(sprAMAmmosBW, x + g * 33 + 35, y + 1, LongInt(Ammo^[i, t].AmmoType)-1);
 if l < 100 then DrawSprite(sprTurnsLeft, x + g * 33 + 51, y + 17, l);
-					end else
+end else
-					DrawSprite(sprAMAmmos, x + g * 33 + 35, y + 1, LongInt(Ammo^[i, t].AmmoType)-1);
+DrawSprite(sprAMAmmos, x + g * 33 + 35, y + 1, LongInt(Ammo^[i, t].AmmoType)-1);
-				if (Slot = i)
+if (Slot = i)
-				and (CursorPoint.X >= x + g * 33 + 35)
+and (CursorPoint.X >= x + g * 33 + 35)
-				and (CursorPoint.X < x + g * 33 + 68) then
+and (CursorPoint.X < x + g * 33 + 68) then
-					begin
+begin
-					if (l < 0) then DrawSprite(sprAMSelection, x + g * 33 + 35, y + 1, 0);
+if (l < 0) then DrawSprite(sprAMSelection, x + g * 33 + 35, y + 1, 0);
-					Pos:= t;
+Pos:= t;
-					end;
+end;
-				inc(g)
+inc(g)
-				end;
+end;
-				inc(t)
+inc(t)
-			end
+end
-		end;
+end;
 dec(y, 1);
 DrawSprite(sprAMBorders, x, y, 0);
 if (Pos >= 0) then
-	begin
+begin
-	if (Ammo^[Slot, Pos].Count > 0) and (Ammo^[Slot, Pos].AmmoType <> amNothing) then
+if (Ammo^[Slot, Pos].Count > 0) and (Ammo^[Slot, Pos].AmmoType <> amNothing) then
-		if (amSel <> Ammo^[Slot, Pos].AmmoType) or (WeaponTooltipTex = nil) then
+if (amSel <> Ammo^[Slot, Pos].AmmoType) or (WeaponTooltipTex = nil) then
-			begin
+begin
-			amSel:= Ammo^[Slot, Pos].AmmoType;
+amSel:= Ammo^[Slot, Pos].AmmoType;
-			RenderWeaponTooltip(amSel)
+RenderWeaponTooltip(amSel)
-			end;
+end;
-		DrawTexture(cScreenWidth div 2 - 200 + AMxShift, cScreenHeight - 68, Ammoz[Ammo^[Slot, Pos].AmmoType].NameTex);
+DrawTexture(cScreenWidth div 2 - 200 + AMxShift, cScreenHeight - 68, Ammoz[Ammo^[Slot, Pos].AmmoType].NameTex);
-		if Ammo^[Slot, Pos].Count < AMMO_INFINITE then
+if Ammo^[Slot, Pos].Count < AMMO_INFINITE then
-			DrawTexture(cScreenWidth div 2 + AMxShift - 35, cScreenHeight - 68, CountTexz[Ammo^[Slot, Pos].Count]);
+DrawTexture(cScreenWidth div 2 + AMxShift - 35, cScreenHeight - 68, CountTexz[Ammo^[Slot, Pos].Count]);
-		if bSelected and (Ammoz[Ammo^[Slot, Pos].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber < 0) then
+if bSelected and (Ammoz[Ammo^[Slot, Pos].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber < 0) then
-			begin
+begin
-			bShowAmmoMenu:= false;
+bShowAmmoMenu:= false;
-			SetWeapon(Ammo^[Slot, Pos].AmmoType);
+SetWeapon(Ammo^[Slot, Pos].AmmoType);
-			bSelected:= false;
+bSelected:= false;
-			FreeWeaponTooltip;
+FreeWeaponTooltip;
-			exit
+exit
-			end;
+end;
-	end
+end
 else
-	FreeWeaponTooltip;
+FreeWeaponTooltip;
 if (WeaponTooltipTex <> nil) and (AMxShift = 0) then
-	ShowWeaponTooltip(x - WeaponTooltipTex^.w - 3, y);
+ShowWeaponTooltip(x - WeaponTooltipTex^.w - 3, y);
 bSelected:= false;
 if AMxShift = 0 then DrawSprite(sprArrow, CursorPoint.X, cScreenHeight - CursorPoint.Y, (RealTicks shr 6) mod 8)
 end;
 lw:= cScreenWidth / cScaleFactor;
 lh:= trunc(cScreenHeight / cScaleFactor) + cScreenHeight div 2 + 16;
 // Water
 r.y:= WorldDy + cWaterLine;
 if WorldDy < trunc(cScreenHeight / cScaleFactor) + cScreenHeight div 2 - cWaterLine then
-	begin
+begin
-	if r.y < 0 then r.y:= 0;
+if r.y < 0 then r.y:= 0;
-	glDisable(GL_TEXTURE_2D);
+glDisable(GL_TEXTURE_2D);
-	VertexBuffer[0].X:= -lw;
+VertexBuffer[0].X:= -lw;
-	VertexBuffer[0].Y:= r.y;
+VertexBuffer[0].Y:= r.y;
-	VertexBuffer[1].X:= lw;
+VertexBuffer[1].X:= lw;
-	VertexBuffer[1].Y:= r.y;
+VertexBuffer[1].Y:= r.y;
-	VertexBuffer[2].X:= lw;
+VertexBuffer[2].X:= lw;
-	VertexBuffer[2].Y:= lh;
+VertexBuffer[2].Y:= lh;
-	VertexBuffer[3].X:= -lw;
+VertexBuffer[3].X:= -lw;
-	VertexBuffer[3].Y:= lh;
+VertexBuffer[3].Y:= lh;
-	glEnableClientState (GL_COLOR_ARRAY);
+glEnableClientState (GL_COLOR_ARRAY);
-	glColorPointer(4, GL_UNSIGNED_BYTE, 0, @WaterColorArray[0]);
+glColorPointer(4, GL_UNSIGNED_BYTE, 0, @WaterColorArray[0]);
-	glEnableClientState(GL_VERTEX_ARRAY);
+glEnableClientState(GL_VERTEX_ARRAY);
-	glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
+glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
-	glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
+glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
-	glDisableClientState(GL_VERTEX_ARRAY);
+glDisableClientState(GL_VERTEX_ARRAY);
-	glDisableClientState(GL_COLOR_ARRAY);
+glDisableClientState(GL_COLOR_ARRAY);
-	glColor4f(1, 1, 1, 1); // disable coloring
+glColor4f(1, 1, 1, 1); // disable coloring
-	glEnable(GL_TEXTURE_2D)
+glEnable(GL_TEXTURE_2D)
-	end
+end
 end;
 procedure DrawWaves(Dir, dX, dY: LongInt);
 var VertexBuffer, TextureBuffer: array [0..3] of TVertex2f;
-	lw, waves, shift: GLfloat;
+lw, waves, shift: GLfloat;
 begin
 lw:= cScreenWidth / cScaleFactor;
 waves:= lw * 2 / cWaveWidth;
 glBindTexture(GL_TEXTURE_2D, SpritesData[sprWater].Texture^.id);
 glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 glDisableClientState(GL_VERTEX_ARRAY);
 {for i:= -1 to cWaterSprCount do
-	DrawSprite(sprWater,
+DrawSprite(sprWater,
-		i * cWaveWidth + ((WorldDx + (RealTicks shr 6) * Dir + dX) mod cWaveWidth) - (cScreenWidth div 2),
+i * cWaveWidth + ((WorldDx + (RealTicks shr 6) * Dir + dX) mod cWaveWidth) - (cScreenWidth div 2),
-		cWaterLine + WorldDy + dY,
+cWaterLine + WorldDy + dY,
-		0)}
+0)}
 end;
 procedure DrawRepeated(spr, sprL, sprR: TSprite; Shift: LongInt);
 var i, w, sw: LongInt;
 begin
 sw:= round(cScreenWidth / cScaleFactor);
 if (SpritesData[sprL].Texture = nil) or (SpritesData[sprR].Texture = nil) then
-	begin
+begin
-	w:= SpritesData[spr].Width;
+w:= SpritesData[spr].Width;
-	i:= Shift mod w;
+i:= Shift mod w;
-	if i > 0 then dec(i, w);
+if i > 0 then dec(i, w);
-	dec(i, w * (sw div w + 1));
+dec(i, w * (sw div w + 1));
-	repeat
+repeat
-		DrawSprite(spr, i, WorldDy + LAND_HEIGHT - SpritesData[spr].Height, 0);
+DrawSprite(spr, i, WorldDy + LAND_HEIGHT - SpritesData[spr].Height, 0);
-		inc(i, w)
+inc(i, w)
-	until i > sw
+until i > sw
-	end else
+end else
-	begin
+begin
-	w:= SpritesData[spr].Width;
+w:= SpritesData[spr].Width;
-	dec(Shift, w div 2);
+dec(Shift, w div 2);
-	DrawSprite(spr, Shift, WorldDy + LAND_HEIGHT - SpritesData[spr].Height, 0);
+DrawSprite(spr, Shift, WorldDy + LAND_HEIGHT - SpritesData[spr].Height, 0);
-	sw:= round(cScreenWidth / cScaleFactor);
+sw:= round(cScreenWidth / cScaleFactor);
-	i:= Shift - SpritesData[sprL].Width;
+i:= Shift - SpritesData[sprL].Width;
-	while i >= -sw - SpritesData[sprL].Width do
+while i >= -sw - SpritesData[sprL].Width do
-		begin
+begin
-		DrawSprite(sprL, i, WorldDy + LAND_HEIGHT - SpritesData[sprL].Height, 0);
+DrawSprite(sprL, i, WorldDy + LAND_HEIGHT - SpritesData[sprL].Height, 0);
-		dec(i, SpritesData[sprL].Width);
+dec(i, SpritesData[sprL].Width);
-		end;
+end;
-	i:= Shift + w;
+i:= Shift + w;
-	while i <= sw do
+while i <= sw do
-		begin
+begin
-		DrawSprite(sprR, i, WorldDy + LAND_HEIGHT - SpritesData[sprR].Height, 0);
+DrawSprite(sprR, i, WorldDy + LAND_HEIGHT - SpritesData[sprR].Height, 0);
-		inc(i, SpritesData[sprR].Width)
+inc(i, SpritesData[sprR].Width)
-		end
+end
-	end
+end
 end;
 procedure DrawWorld(Lag: LongInt);
 var i, t: LongInt;
 highlight: Boolean;
 offset, offsetX, offsetY: LongInt;
 scale: GLfloat;
 begin
 if ZoomValue < zoom then
-	begin
+begin
-	zoom:= zoom - 0.002 * Lag;
+zoom:= zoom - 0.002 * Lag;
-	if ZoomValue > zoom then zoom:= ZoomValue
+if ZoomValue > zoom then zoom:= ZoomValue
-	end else
+end else
 if ZoomValue > zoom then
-	begin
+begin
-	zoom:= zoom + 0.002 * Lag;
+zoom:= zoom + 0.002 * Lag;
-	if ZoomValue < zoom then zoom:= ZoomValue
+if ZoomValue < zoom then zoom:= ZoomValue
-	end;
+end;
 // Sky
 glClear(GL_COLOR_BUFFER_BIT);
 glEnable(GL_BLEND);
 glEnable(GL_TEXTURE_2D);
 DrawWater(255);
 // Attack bar
 if CurrentTeam <> nil then
-	case AttackBar of
+case AttackBar of
 (*        1: begin
-		r:= StuffPoz[sPowerBar];
+r:= StuffPoz[sPowerBar];
-		{$WARNINGS OFF}
+{$WARNINGS OFF}
-		r.w:= (CurrentHedgehog^.Gear^.Power * 256) div cPowerDivisor;
+r.w:= (CurrentHedgehog^.Gear^.Power * 256) div cPowerDivisor;
-		{$WARNINGS ON}
+{$WARNINGS ON}
-		DrawSpriteFromRect(r, cScreenWidth - 272, cScreenHeight - 48, 16, 0, Surface);
+DrawSpriteFromRect(r, cScreenWidth - 272, cScreenHeight - 48, 16, 0, Surface);
-		end;*)
+end;*)
-		2: with CurrentHedgehog^ do
+2: with CurrentHedgehog^ do
-				begin
+begin
-				tdx:= hwSign(Gear^.dX) * Sin(Gear^.Angle * Pi / cMaxAngle);
+tdx:= hwSign(Gear^.dX) * Sin(Gear^.Angle * Pi / cMaxAngle);
-				tdy:= - Cos(Gear^.Angle * Pi / cMaxAngle);
+tdy:= - Cos(Gear^.Angle * Pi / cMaxAngle);
-				for i:= (Gear^.Power * 24) div cPowerDivisor downto 0 do
+for i:= (Gear^.Power * 24) div cPowerDivisor downto 0 do
-					DrawSprite(sprPower,
+DrawSprite(sprPower,
-							hwRound(Gear^.X) + round(WorldDx + tdx * (24 + i * 2)) - 16,
+hwRound(Gear^.X) + round(WorldDx + tdx * (24 + i * 2)) - 16,
-							hwRound(Gear^.Y) + round(WorldDy + tdy * (24 + i * 2)) - 12,
+hwRound(Gear^.Y) + round(WorldDy + tdy * (24 + i * 2)) - 12,
-							i)
+i)
-				end
+end
-		end;
+end;
 DrawVisualGears(1);
 DrawGears;
 {$WARNINGS OFF}
 // Target
 if TargetPoint.X <> NoPointX then
-	DrawRotatedF(sprTargetP, TargetPoint.X + WorldDx, TargetPoint.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360);
+DrawRotatedF(sprTargetP, TargetPoint.X + WorldDx, TargetPoint.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360);
 {$WARNINGS ON}
 {$IFDEF IPHONEOS}
 scale:= 1.5;
 {$ELSE}
 end;
 {$IFNDEF IPHONEOS}
 // Timetrial
 if ((TrainingFlags and tfTimeTrial) <> 0) and (TimeTrialStartTime > 0) then
-	begin
+begin
-	if TimeTrialStopTime = 0 then i:= RealTicks - TimeTrialStartTime else i:= TimeTrialStopTime - TimeTrialStartTime;
+if TimeTrialStopTime = 0 then i:= RealTicks - TimeTrialStartTime else i:= TimeTrialStopTime - TimeTrialStartTime;
-	t:= 272;
+t:= 272;
-	// right frame
+// right frame
-	DrawSprite(sprFrame, -cScreenWidth div 2 + t, 8, 1);
+DrawSprite(sprFrame, -cScreenWidth div 2 + t, 8, 1);
 dec(t, 32);
-	// 1 ms
+// 1 ms
 DrawSprite(sprBigDigit, -cScreenWidth div 2 + t, 8, i mod 10);
 dec(t, 32);
-	i:= i div 10;
+i:= i div 10;
-	// 10 ms
+// 10 ms
 DrawSprite(sprBigDigit, -cScreenWidth div 2 + t, 8, i mod 10);
 dec(t, 32);
-	i:= i div 10;
+i:= i div 10;
-	// 100 ms
+// 100 ms
 DrawSprite(sprBigDigit, -cScreenWidth div 2 + t, 8, i mod 10);
-	dec(t, 16);
+dec(t, 16);
-	// Point
+// Point
-	DrawSprite(sprBigDigit, -cScreenWidth div 2 + t, 8, 11);
+DrawSprite(sprBigDigit, -cScreenWidth div 2 + t, 8, 11);
 dec(t, 32);
-	i:= i div 10;
+i:= i div 10;
-	// 1 s
+// 1 s
 DrawSprite(sprBigDigit, -cScreenWidth div 2 + t, 8, i mod 10);
 dec(t, 32);
-	i:= i div 10;
+i:= i div 10;
-	// 10s
+// 10s
 DrawSprite(sprBigDigit, -cScreenWidth div 2 + t, 8, i mod 6);
-	dec(t, 16);
+dec(t, 16);
-	// Point
+// Point
-	DrawSprite(sprBigDigit, -cScreenWidth div 2 + t, 8, 10);
+DrawSprite(sprBigDigit, -cScreenWidth div 2 + t, 8, 10);
 dec(t, 32);
-	i:= i div 6;
+i:= i div 6;
-	// 1 m
+// 1 m
 DrawSprite(sprBigDigit, -cScreenWidth div 2 + t, 8, i mod 10);
 dec(t, 32);
-	i:= i div 10;
+i:= i div 10;
-	// 10 m
+// 10 m
 DrawSprite(sprBigDigit, -cScreenWidth div 2 + t, 8, i mod 10);
-	// left frame
+// left frame
-	DrawSprite(sprFrame, -cScreenWidth div 2 + t - 4, 8, 0);
+DrawSprite(sprFrame, -cScreenWidth div 2 + t - 4, 8, 0);
-	end;
+end;
 {$ENDIF}
 // Captions
 {$IFDEF IPHONEOS}
 offset:= 40;
 {$ELSE}
 if ((TrainingFlags and tfTimeTrial) <> 0) and (TimeTrialStartTime > 0) then offset:= 48
 else offset:= 8;
 {$ENDIF}
-	for grp:= Low(TCapGroup) to High(TCapGroup) do
+for grp:= Low(TCapGroup) to High(TCapGroup) do
-		with Captions[grp] do
+with Captions[grp] do
-			if Tex <> nil then
+if Tex <> nil then
-			begin
+begin
-				DrawCentered(0, offset, Tex);
+DrawCentered(0, offset, Tex);
-				inc(offset, Tex^.h + 2);
+inc(offset, Tex^.h + 2);
-				if EndTime <= RealTicks then
+if EndTime <= RealTicks then
-				begin
+begin
-					FreeTexture(Tex);
+FreeTexture(Tex);
-					Tex:= nil;
+Tex:= nil;
-					EndTime:= 0
+EndTime:= 0
-				end;
+end;
-			end;
+end;
 // Teams Healths
 for t:= 0 to Pred(TeamsCount) do
 with TeamsArray[t]^ do
 if fastUntilLag then DrawCentered(0, (cScreenHeight shr 1), SyncTexture);
 if isPaused then DrawCentered(0, (cScreenHeight shr 1), PauseTexture);
 if missionTimer <> 0 then
-	begin
+begin
-	if missionTimer > 0 then dec(missionTimer, Lag);
+if missionTimer > 0 then dec(missionTimer, Lag);
-	if missionTimer < 0 then missionTimer:= 0; // avoid subtracting below 0
+if missionTimer < 0 then missionTimer:= 0; // avoid subtracting below 0
-	if missionTex <> nil then
+if missionTex <> nil then
-		DrawCentered(0, min((cScreenHeight shr 1) + 100, cScreenHeight - 48 - missionTex^.h), missionTex);
+DrawCentered(0, min((cScreenHeight shr 1) + 100, cScreenHeight - 48 - missionTex^.h), missionTex);
-	end;
+end;
 // fps
 {$IFDEF IPHONEOS}
 offset:= 300;
 {$ELSE}
 AddCaption(Format(trmsg[sidVolume], s), cWhiteColor, capgrpVolume)
 end
 end;
 if GameState = gsConfirm then
-	DrawCentered(0, cScreenHeight div 2, ConfirmTexture);
+DrawCentered(0, cScreenHeight div 2, ConfirmTexture);
 SetScale(zoom);
 // Cursor
 if isCursorVisible then
 if Captions[Group].Tex <> nil then FreeTexture(Captions[Group].Tex);
 Captions[Group].Tex:= RenderStringTex(s, Color, fntBig);
 case Group of
-	capgrpGameState: Captions[Group].EndTime:= RealTicks + 2200
+capgrpGameState: Captions[Group].EndTime:= RealTicks + 2200
-	else
+else
-	Captions[Group].EndTime:= RealTicks + 1400 + LongWord(Captions[Group].Tex^.w) * 3;
+Captions[Group].EndTime:= RealTicks + 1400 + LongWord(Captions[Group].Tex^.w) * 3;
-	end;
+end;
 end;
 procedure MoveCamera;
 const PrevSentPointTime: LongWord = 0;
 var EdgesDist,  wdy: LongInt;
 begin
 if (not (CurrentTeam^.ExtDriven and isCursorVisible)) and cHasFocus then
-	begin
+begin
-	SDL_GetMouseState(@CursorPoint.X, @CursorPoint.Y);
+SDL_GetMouseState(@CursorPoint.X, @CursorPoint.Y);
-	CursorPoint.X:= CursorPoint.X - (cScreenWidth shr 1);
+CursorPoint.X:= CursorPoint.X - (cScreenWidth shr 1);
-	CursorPoint.Y:= cScreenHeight - CursorPoint.Y;
+CursorPoint.Y:= cScreenHeight - CursorPoint.Y;
-	end;
+end;
 if (not PlacingHogs) and (FollowGear <> nil) and (not isCursorVisible) and (not fastUntilLag) then
-	if abs(CursorPoint.X - prevPoint.X) + abs(CursorPoint.Y - prevpoint.Y) > 4 then
+if abs(CursorPoint.X - prevPoint.X) + abs(CursorPoint.Y - prevpoint.Y) > 4 then
-		begin
+begin
-		FollowGear:= nil;
+FollowGear:= nil;
-		prevPoint:= CursorPoint;
+prevPoint:= CursorPoint;
-		exit
+exit
-		end
+end
-		else begin
+else begin
-		CursorPoint.x:= (prevPoint.x * 7 + hwRound(FollowGear^.X) + hwSign(FollowGear^.dX) * 100 + WorldDx) div 8;
+CursorPoint.x:= (prevPoint.x * 7 + hwRound(FollowGear^.X) + hwSign(FollowGear^.dX) * 100 + WorldDx) div 8;
-		CursorPoint.y:= (prevPoint.y * 7 + cScreenHeight - (hwRound(FollowGear^.Y) + WorldDy)) div 8;
+CursorPoint.y:= (prevPoint.y * 7 + cScreenHeight - (hwRound(FollowGear^.Y) + WorldDy)) div 8;
-		end;
+end;
 wdy:= trunc(cScreenHeight / cScaleFactor) + cScreenHeight div 2 - cWaterLine - cVisibleWater;
 if WorldDy < wdy then WorldDy:= wdy;
 if ((CursorPoint.X = prevPoint.X) and (CursorPoint.Y = prevpoint.Y)) then exit;
 if AMxShift < 210 then
-	begin
+begin
-	if CursorPoint.X < cScreenWidth div 2 + AMxShift - 175 then CursorPoint.X:= cScreenWidth div 2 + AMxShift - 175;
+if CursorPoint.X < cScreenWidth div 2 + AMxShift - 175 then CursorPoint.X:= cScreenWidth div 2 + AMxShift - 175;
-	if CursorPoint.X > cScreenWidth div 2 + AMxShift - 10 then CursorPoint.X:= cScreenWidth div 2 + AMxShift - 10;
+if CursorPoint.X > cScreenWidth div 2 + AMxShift - 10 then CursorPoint.X:= cScreenWidth div 2 + AMxShift - 10;
-	if CursorPoint.Y > 75 + SlotsNum * 33 then CursorPoint.Y:= 75 + SlotsNum * 33;
+if CursorPoint.Y > 75 + SlotsNum * 33 then CursorPoint.Y:= 75 + SlotsNum * 33;
-	if CursorPoint.Y < 76 then CursorPoint.Y:= 76;
+if CursorPoint.Y < 76 then CursorPoint.Y:= 76;
-	prevPoint:= CursorPoint;
+prevPoint:= CursorPoint;
-	if cHasFocus then SDL_WarpMouse(CursorPoint.X + cScreenWidth div 2, cScreenHeight - CursorPoint.Y);
+if cHasFocus then SDL_WarpMouse(CursorPoint.X + cScreenWidth div 2, cScreenHeight - CursorPoint.Y);
-	exit
+exit
-	end;
+end;
 if isCursorVisible then
-	begin
+begin
-	if (not CurrentTeam^.ExtDriven) and (GameTicks >= PrevSentPointTime + cSendCursorPosTime) then
+if (not CurrentTeam^.ExtDriven) and (GameTicks >= PrevSentPointTime + cSendCursorPosTime) then
-		begin
+begin
-		SendIPCXY('P', CursorPoint.X - WorldDx, cScreenHeight - CursorPoint.Y - WorldDy);
+SendIPCXY('P', CursorPoint.X - WorldDx, cScreenHeight - CursorPoint.Y - WorldDy);
-		PrevSentPointTime:= GameTicks
+PrevSentPointTime:= GameTicks
-		end;
+end;
-	end;
+end;
 if isCursorVisible or (FollowGear <> nil) then
 begin
 if isCursorVisible then EdgesDist:= cCursorEdgesDist
 else EdgesDist:= cGearScrEdgesDist;
 if time = 0 then time:= 5000;
 missionTimer:= time;
 if missionTex <> nil then FreeTexture(missionTex);
 if icon > -1 then
-	begin
+begin
-	r.x:= 0;
+r.x:= 0;
-	r.y:= icon * 32;
+r.y:= icon * 32;
-	missionTex:= RenderHelpWindow(caption, subcaption, text, '', 0, MissionIcons, @r)
+missionTex:= RenderHelpWindow(caption, subcaption, text, '', 0, MissionIcons, @r)
-	end
+end
 else
-	begin
+begin
-	r.x:= ((-icon - 1) shr 5) * 32;
+r.x:= ((-icon - 1) shr 5) * 32;
-	r.y:= ((-icon - 1) mod 32) * 32;
+r.y:= ((-icon - 1) mod 32) * 32;
-	missionTex:= RenderHelpWindow(caption, subcaption, text, '', 0, SpritesData[sprAMAmmos].Surface, @r)
+missionTex:= RenderHelpWindow(caption, subcaption, text, '', 0, SpritesData[sprAMAmmos].Surface, @r)
-	end;
+end;
 end;
 procedure HideMission;
 begin
 missionTimer:= 0
 end;
 procedure init_uWorld;
 begin
-	fpsTexture:= nil;
+fpsTexture:= nil;
-	FollowGear:= nil;
+FollowGear:= nil;
-	WindBarWidth:= 0;
+WindBarWidth:= 0;
-	bShowAmmoMenu:= false;
+bShowAmmoMenu:= false;
-	bSelected:= false;
+bSelected:= false;
-	bShowFinger:= false;
+bShowFinger:= false;
-	Frames:= 0;
+Frames:= 0;
-	WorldDx:= -512;
+WorldDx:= -512;
-	WorldDy:= -256;
+WorldDy:= -256;
-	FPS:= 0;
+FPS:= 0;
-	CountTicks:= 0;
+CountTicks:= 0;
-	SoundTimerTicks:= 0;
+SoundTimerTicks:= 0;
-	prevPoint.X:= 0;
+prevPoint.X:= 0;
-	prevPoint.Y:= 0;
+prevPoint.Y:= 0;
-	missionTimer:= 0;
+missionTimer:= 0;
-	FillChar(Captions, sizeof(Captions), 0)
+FillChar(Captions, sizeof(Captions), 0)
 end;
 procedure free_uWorld;
 begin
 if missionTex <> nil then FreeTexture(missionTex);

changeset 2948	3f21a9dc93d0
parent 2931	97f75507e1cb
child 2958	e6f7620da87e