hedgewars-draft: comparison hedgewars/CCHandlers.inc

equal deleted inserted replaced

-:793386610068
+:b1c2c2f6fc5e
 SplitBySpace(s, id);
 val(s, Gear^.Health);
 TryDo(Gear^.Health > 0, 'Invalid hedgehog health', true);
 PHedgehog(Gear^.Hedgehog)^.Team:= CurrentTeam;
 if (GameFlags and gfSharedAmmo) <> 0 then CurrentHedgehog^.AmmoStore:= Clan^.ClanIndex
+else if (GameFlags and gfPerHogAmmo) <> 0 then
+begin
+AddAmmoStore;
+CurrentHedgehog^.AmmoStore:= StoreCnt - 1
+end
 else CurrentHedgehog^.AmmoStore:= TeamsCount - 1;
 CurrentHedgehog^.Gear:= Gear;
 CurrentHedgehog^.Name:= id;
 CurrHedgehog:= HedgehogsNumber;
 inc(HedgehogsNumber)
 procedure chLeft_p(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then exit;
-bShowFinger:= false;
 if not CurrentTeam^.ExtDriven then SendIPC('L');
-with CurrentHedgehog^.Gear^ do
+if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
-Message:= Message or gm_Left
+bShowFinger:= false;
+with CurrentHedgehog^.Gear^ do
+Message:= Message or gmLeft
 end;
 procedure chLeft_m(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('l');
 with CurrentHedgehog^.Gear^ do
-Message:= Message and not gm_Left
+Message:= Message and not gmLeft
 end;
 procedure chRight_p(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then exit;
-bShowFinger:= false;
 if not CurrentTeam^.ExtDriven then SendIPC('R');
-with CurrentHedgehog^.Gear^ do
+if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
-Message:= Message or gm_Right
+bShowFinger:= false;
+with CurrentHedgehog^.Gear^ do
+Message:= Message or gmRight
 end;
 procedure chRight_m(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('r');
 with CurrentHedgehog^.Gear^ do
-Message:= Message and not gm_Right
+Message:= Message and not gmRight
 end;
 procedure chUp_p(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then exit;
-bShowFinger:= false;
 if not CurrentTeam^.ExtDriven then SendIPC('U');
-with CurrentHedgehog^.Gear^ do
+if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
-Message:= Message or gm_Up
+bShowFinger:= false;
+with CurrentHedgehog^.Gear^ do
+Message:= Message or gmUp
 end;
 procedure chUp_m(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('u');
 with CurrentHedgehog^.Gear^ do
-Message:= Message and not gm_Up
+Message:= Message and not gmUp
 end;
 procedure chDown_p(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then exit;
-bShowFinger:= false;
 if not CurrentTeam^.ExtDriven then SendIPC('D');
-with CurrentHedgehog^.Gear^ do
+if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
-Message:= Message or gm_Down
+bShowFinger:= false;
+with CurrentHedgehog^.Gear^ do
+Message:= Message or gmDown
 end;
 procedure chDown_m(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('d');
 with CurrentHedgehog^.Gear^ do
-Message:= Message and not gm_Down
+Message:= Message and not gmDown
 end;
 procedure chPrecise_p(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then exit;
-bShowFinger:= false;
 if not CurrentTeam^.ExtDriven then SendIPC('Z');
-with CurrentHedgehog^.Gear^ do
+if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
-Message:= Message or gm_Precise
+bShowFinger:= false;
+with CurrentHedgehog^.Gear^ do
+Message:= Message or gmPrecise
 end;
 procedure chPrecise_m(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('z');
 with CurrentHedgehog^.Gear^ do
-Message:= Message and not gm_Precise
+Message:= Message and not gmPrecise
 end;
 procedure chLJump(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then exit;
-bShowFinger:= false;
 if not CurrentTeam^.ExtDriven then SendIPC('j');
-with CurrentHedgehog^.Gear^ do
+if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
-Message:= Message or gm_LJump
+bShowFinger:= false;
+with CurrentHedgehog^.Gear^ do
+Message:= Message or gmLJump
 end;
 procedure chHJump(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then exit;
-bShowFinger:= false;
 if not CurrentTeam^.ExtDriven then SendIPC('J');
-with CurrentHedgehog^.Gear^ do
+if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
-Message:= Message or gm_HJump
+bShowFinger:= false;
+with CurrentHedgehog^.Gear^ do
+Message:= Message or gmHJump
 end;
 procedure chAttack_p(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then exit;
+if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
 begin
 {$IFDEF DEBUGFILE}AddFileLog('/+attack: hedgehog''s Gear^.State = '+inttostr(State));{$ENDIF}
 if ((State and gstHHDriven) <> 0) then
 begin
 FollowGear:= CurrentHedgehog^.Gear;
 if not CurrentTeam^.ExtDriven then SendIPC('A');
-Message:= Message or gm_Attack
+Message:= Message or gmAttack
 end
 end
 end;
 procedure chAttack_m(var s: shortstring);
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH then exit;
 with CurrentHedgehog^.Gear^ do
 begin
 if not CurrentTeam^.ExtDriven and
-((Message and gm_Attack) <> 0) then SendIPC('a');
+((Message and gmAttack) <> 0) then SendIPC('a');
-Message:= Message and not gm_Attack
+Message:= Message and not gmAttack
 end
 end;
 procedure chSwitch(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('S');
-with CurrentHedgehog^.Gear^ do
+if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
-Message:= Message or gm_Switch
+bShowFinger:= false;
+with CurrentHedgehog^.Gear^ do
+Message:= Message or gmSwitch
 end;
 procedure chNextTurn(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if not CurrentTeam^.ExtDriven then SendIPC('N');
 {$IFDEF DEBUGFILE}
 AddFileLog('Doing SwitchHedgehog: time '+inttostr(GameTicks));
 {$ENDIF}
-{$IFDEF IPHONEOS}
+perfExt_NewTurnBeginning();
-clearView();
-{$ENDIF}
 end;
 procedure chSay(var s: shortstring);
 begin
 SendIPC('s' + s);
 end;
 procedure chTimer(var s: shortstring);
 begin
 if (s[0] <> #1) or (s[1] < '1') or (s[1] > '5') or CheckNoTeamOrHH then exit;
-bShowFinger:= false;
 if not CurrentTeam^.ExtDriven then SendIPC(s);
-with CurrentHedgehog^.Gear^ do
+if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
-begin
+bShowFinger:= false;
-Message:= Message or gm_Timer;
+with CurrentHedgehog^.Gear^ do
+begin
+Message:= Message or gmTimer;
 MsgParam:= byte(s[1]) - ord('0')
 end
 end;
 procedure chSlot(var s: shortstring);
 var slot: LongWord;
 begin
 if (s[0] <> #1) or CheckNoTeamOrHH then exit;
-bShowFinger:= false;
 slot:= byte(s[1]) - 49;
 if slot > cMaxSlotIndex then exit;
 if not CurrentTeam^.ExtDriven then SendIPC(char(byte(s[1]) + 79));
-with CurrentHedgehog^.Gear^ do
+if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
-begin
+bShowFinger:= false;
-Message:= Message or gm_Slot;
+with CurrentHedgehog^.Gear^ do
+begin
+Message:= Message or gmSlot;
 MsgParam:= slot
 end
 end;
 procedure chSetWeapon(var s: shortstring);
 if not CurrentTeam^.ExtDriven then SendIPC('w' + s);
 with CurrentHedgehog^.Gear^ do
 begin
-Message:= Message or gm_Weapon;
+Message:= Message or gmWeapon;
 MsgParam:= byte(s[1]);
 end;
 end;
 procedure chTaunt(var s: shortstring);
 if not CurrentTeam^.ExtDriven then SendIPC('t' + s);
 with CurrentHedgehog^.Gear^ do
 begin
-Message:= Message or gm_Animate;
+Message:= Message or gmAnimate;
 MsgParam:= byte(s[1])
 end
 end;
 procedure chHogSay(var s: shortstring);
 SpeechText:= text
 end;
 end;
-procedure chNewGrave;
-begin
-if CheckNoTeamOrHH or isPaused then exit;
-if not CurrentTeam^.ExtDriven then SendIPC('g');
-AddGear(hwRound(CurrentHedgehog^.Gear^.X), hwRound(CurrentHedgehog^.Gear^.Y), gtGrave, 0, _0, _0, 0)
-end;
 procedure doPut(putX, putY: LongInt; fromAI: boolean);
 begin
 if CheckNoTeamOrHH or isPaused then exit;
+if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
+bShowFinger:= false;
 if not CurrentTeam^.ExtDriven and bShowAmmoMenu then
 begin
 bSelected:= true;
 exit
 end;
 TargetPoint.X:= putX;
 TargetPoint.Y:= putY
 end;
 {$IFDEF DEBUGFILE}AddFilelog('put: ' + inttostr(TargetPoint.X) + ', ' + inttostr(TargetPoint.Y));{$ENDIF}
 State:= State and not gstHHChooseTarget;
-if (Ammo^[CurSlot, CurAmmo].Propz and ammoprop_AttackingPut) <> 0 then
+if (Ammoz[CurAmmoType].Ammo.Propz and ammoprop_AttackingPut) <> 0 then
-Message:= Message or gm_Attack;
+Message:= Message or gmAttack;
 end
 else
 if CurrentTeam^.ExtDriven then
 OutError('got /put while not being in choose target mode', false)
 end;
 end;
 procedure chAmmoMenu(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH then
 bShowAmmoMenu:= true
 else
-with CurrentTeam^ do
+begin
+with CurrentTeam^ do
 with Hedgehogs[CurrHedgehog] do
 begin
 bSelected:= false;
 if bShowAmmoMenu then bShowAmmoMenu:= false
 else if ((Gear^.State and (gstAttacking or gstAttacked)) <> 0) or
-((MultiShootAttacks > 0) and ((Ammo^[CurSlot, CurAmmo].Propz and ammoprop_NoRoundEndHint) = 0)) or
+((MultiShootAttacks > 0) and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEndHint) = 0)) or
 ((Gear^.State and gstHHDriven) = 0) then else bShowAmmoMenu:= true
-end
+end;
+if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1
+end
 end;
 procedure chFullScr(var s: shortstring);
 var flags: Longword = 0;
 ico: PSDL_Surface;
 end;
 procedure chPause(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
+if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
 if gameType <> gmtNet then
 isPaused:= not isPaused;
 SDL_ShowCursor(ord(isPaused))
 end;
 ZoomValue:= cDefaultZoomLevel;
 end;
 procedure chChat(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 GameState:= gsChat;
 KeyPressChat(27)
 end;
 procedure chHistory(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 uChat.showAll:= not uChat.showAll
 end;

branch	experimental3D
changeset 4004	b1c2c2f6fc5e
parent 3969	5f4ef3db0a65
child 4099	af612377fcba