# HG changeset patch # User unc0rr # Date 1290451411 -10800 # Node ID 46caab3a8f84efed0b85b4a6d41b1172c02d6cff # Parent c9a78ba03679f9b70c6c2d8f58035b4fcb95688c uCommandHandlers diff -r c9a78ba03679 -r 46caab3a8f84 hedgewars/CCHandlers.inc --- a/hedgewars/CCHandlers.inc Mon Nov 22 12:35:52 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,565 +0,0 @@ -(* -* Hedgewars, a free turn based strategy game -* Copyright (c) 2004-2010 Andrey Korotaev -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; version 2 of the License -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -*) - -//////////////////////////////////////////////////////////////////////////////// -procedure chQuit(var s: shortstring); -const prevGState: TGameState = gsConfirm; -begin -s:= s; // avoid compiler hint -if GameState <> gsConfirm then - begin - prevGState:= GameState; - GameState:= gsConfirm - end else - GameState:= prevGState -end; - -procedure chConfirm(var s: shortstring); -begin -s:= s; // avoid compiler hint -if GameState = gsConfirm then - begin - SendIPC('Q'); - GameState:= gsExit - end -else - ParseCommand('chat team', true); -end; - -procedure chCheckProto(var s: shortstring); -var i, c: LongInt; -begin -if isDeveloperMode then -begin -val(s, i, c); -if (c <> 0) or (i = 0) then exit; -TryDo(i <= cNetProtoVersion, 'Protocol version mismatch: engine is too old', true); -TryDo(i >= cNetProtoVersion, 'Protocol version mismatch: engine is too new', true) -end -end; - -procedure chTeamLocal(var s: shortstring); -begin -s:= s; // avoid compiler hint -if not isDeveloperMode then exit; -if CurrentTeam = nil then OutError(errmsgIncorrectUse + ' "/rdriven"', true); -CurrentTeam^.ExtDriven:= true -end; - -procedure chGrave(var s: shortstring); -begin -if CurrentTeam = nil then OutError(errmsgIncorrectUse + ' "/grave"', true); -if s[1]='"' then Delete(s, 1, 1); -if s[byte(s[0])]='"' then Delete(s, byte(s[0]), 1); -CurrentTeam^.GraveName:= s -end; - -procedure chFort(var s: shortstring); -begin -if CurrentTeam = nil then OutError(errmsgIncorrectUse + ' "/fort"', true); -if s[1]='"' then Delete(s, 1, 1); -if s[byte(s[0])]='"' then Delete(s, byte(s[0]), 1); -CurrentTeam^.FortName:= s -end; - -procedure chFlag(var s: shortstring); -begin -if CurrentTeam = nil then OutError(errmsgIncorrectUse + ' "/flag"', true); -if s[1]='"' then Delete(s, 1, 1); -if s[byte(s[0])]='"' then Delete(s, byte(s[0]), 1); -CurrentTeam^.flag:= s -end; - -procedure chScript(var s: shortstring); -begin -if s[1]='"' then Delete(s, 1, 1); -if s[byte(s[0])]='"' then Delete(s, byte(s[0]), 1); -ScriptLoad(s) -end; - -procedure chSetHat(var s: shortstring); -begin -if (not isDeveloperMode) or (CurrentTeam = nil) then exit; -with CurrentTeam^ do - begin - if not CurrentHedgehog^.King then - if (s = '') or - (((GameFlags and gfKing) <> 0) and (s = 'crown')) or - ((Length(s) > 39) and (Copy(s,1,8) = 'Reserved') and (Copy(s,9,32) <> PlayerHash)) then - CurrentHedgehog^.Hat:= 'NoHat' - else - CurrentHedgehog^.Hat:= s - end; -end; - -procedure chCurU_p(var s: shortstring); -begin -s:= s; // avoid compiler hint -CursorMovementY:= -1; -end; - -procedure chCurU_m(var s: shortstring); -begin -s:= s; // avoid compiler hint -CursorMovementY:= 0; -end; - -procedure chCurD_p(var s: shortstring); -begin -s:= s; // avoid compiler hint -CursorMovementY:= 1; -end; - -procedure chCurD_m(var s: shortstring); -begin -s:= s; // avoid compiler hint -CursorMovementY:= 0; -end; - -procedure chCurL_p(var s: shortstring); -begin -s:= s; // avoid compiler hint -CursorMovementX:= -1; -end; - -procedure chCurL_m(var s: shortstring); -begin -s:= s; // avoid compiler hint -CursorMovementX:= 0; -end; - -procedure chCurR_p(var s: shortstring); -begin -s:= s; // avoid compiler hint -CursorMovementX:= 1; -end; - -procedure chCurR_m(var s: shortstring); -begin -s:= s; // avoid compiler hint -CursorMovementX:= 0; -end; - -procedure chLeft_p(var s: shortstring); -begin -s:= s; // avoid compiler hint -if CheckNoTeamOrHH or isPaused then exit; -if not CurrentTeam^.ExtDriven then SendIPC('L'); -if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; -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 gmLeft -end; - -procedure chRight_p(var s: shortstring); -begin -s:= s; // avoid compiler hint -if CheckNoTeamOrHH or isPaused then exit; -if not CurrentTeam^.ExtDriven then SendIPC('R'); -if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; -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 gmRight -end; - -procedure chUp_p(var s: shortstring); -begin -s:= s; // avoid compiler hint -if CheckNoTeamOrHH or isPaused then exit; -if not CurrentTeam^.ExtDriven then SendIPC('U'); -if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; -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 gmUp -end; - -procedure chDown_p(var s: shortstring); -begin -s:= s; // avoid compiler hint -if CheckNoTeamOrHH or isPaused then exit; -if not CurrentTeam^.ExtDriven then SendIPC('D'); -if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; -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 gmDown -end; - -procedure chPrecise_p(var s: shortstring); -begin -s:= s; // avoid compiler hint -if CheckNoTeamOrHH or isPaused then exit; -if not CurrentTeam^.ExtDriven then SendIPC('Z'); -if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; -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 gmPrecise -end; - -procedure chLJump(var s: shortstring); -begin -s:= s; // avoid compiler hint -if CheckNoTeamOrHH or isPaused then exit; -if not CurrentTeam^.ExtDriven then SendIPC('j'); -if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; -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; -if not CurrentTeam^.ExtDriven then SendIPC('J'); -if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; -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 gmAttack - end - end -end; - -procedure chAttack_m(var s: shortstring); -begin -s:= s; // avoid compiler hint -if CheckNoTeamOrHH then exit; -with CurrentHedgehog^.Gear^ do - begin - if not CurrentTeam^.ExtDriven and - ((Message and gmAttack) <> 0) then SendIPC('a'); - 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'); -if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; -bShowFinger:= false; -with CurrentHedgehog^.Gear^ do - Message:= Message or gmSwitch -end; - -procedure chNextTurn(var s: shortstring); -begin - s:= s; // avoid compiler hint - TryDo(AllInactive, '/nextturn called when not all gears are inactive', true); - - if not CurrentTeam^.ExtDriven then SendIPC('N'); -{$IFDEF DEBUGFILE} - AddFileLog('Doing SwitchHedgehog: time '+inttostr(GameTicks)); -{$ENDIF} - perfExt_NewTurnBeginning(); -end; - -procedure chTimer(var s: shortstring); -begin -if (s[0] <> #1) or (s[1] < '1') or (s[1] > '5') or CheckNoTeamOrHH then exit; - -if not CurrentTeam^.ExtDriven then SendIPC(s); -if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; -bShowFinger:= false; -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; -slot:= byte(s[1]) - 49; -if slot > cMaxSlotIndex then exit; -if not CurrentTeam^.ExtDriven then SendIPC(char(byte(s[1]) + 79)); -if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; -bShowFinger:= false; -with CurrentHedgehog^.Gear^ do - begin - Message:= Message or gmSlot; - MsgParam:= slot - end -end; - -procedure chSetWeapon(var s: shortstring); -begin - if (s[0] <> #1) or CheckNoTeamOrHH then exit; - - if TAmmoType(s[1]) > High(TAmmoType) then exit; - - if not CurrentTeam^.ExtDriven then SendIPC('w' + s); - - with CurrentHedgehog^.Gear^ do - begin - Message:= Message or gmWeapon; - MsgParam:= byte(s[1]); - end; -end; - -procedure chTaunt(var s: shortstring); -begin -if (s[0] <> #1) or CheckNoTeamOrHH then exit; - -if TWave(s[1]) > High(TWave) then exit; - -if not CurrentTeam^.ExtDriven then SendIPC('t' + s); - -with CurrentHedgehog^.Gear^ do - begin - Message:= Message or gmAnimate; - MsgParam:= byte(s[1]) - end -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; - -with CurrentHedgehog^.Gear^, - CurrentHedgehog^ do - if (State and gstHHChooseTarget) <> 0 then - begin - isCursorVisible:= false; - if not CurrentTeam^.ExtDriven then - begin - if fromAI then - begin - TargetPoint.X:= putX; - TargetPoint.Y:= putY - end else - begin - TargetPoint.X:= CursorPoint.X - WorldDx; - TargetPoint.Y:= cScreenHeight - CursorPoint.Y - WorldDy; - end; - SendIPCXY('p', TargetPoint.X, TargetPoint.Y); - end - else - begin - TargetPoint.X:= putX; - TargetPoint.Y:= putY - end; - {$IFDEF DEBUGFILE}AddFilelog('put: ' + inttostr(TargetPoint.X) + ', ' + inttostr(TargetPoint.Y));{$ENDIF} - State:= State and not gstHHChooseTarget; - if (Ammoz[CurAmmoType].Ammo.Propz and ammoprop_AttackingPut) <> 0 then - Message:= Message or gmAttack; - end - else - if CurrentTeam^.ExtDriven then - OutError('got /put while not being in choose target mode', false) -end; - -procedure chPut(var s: shortstring); -begin - s:= s; // avoid compiler hint - doPut(0, 0, false); -end; - -procedure chCapture(var s: shortstring); -begin -s:= s; // avoid compiler hint -flagMakeCapture:= true -end; - -procedure chSetMap(var s: shortstring); -begin -if isDeveloperMode then -begin -Pathz[ptMapCurrent]:= Pathz[ptMaps] + '/' + s; -InitStepsFlags:= InitStepsFlags or cifMap -end -end; - -procedure chSetTheme(var s: shortstring); -begin -if isDeveloperMode then -begin -Pathz[ptCurrTheme]:= Pathz[ptThemes] + '/' + s; -InitStepsFlags:= InitStepsFlags or cifTheme -end -end; - -procedure chSetSeed(var s: shortstring); -begin -if isDeveloperMode then -begin -SetRandomSeed(s); -cSeed:= s; -InitStepsFlags:= InitStepsFlags or cifRandomize -end -end; - -procedure chAmmoMenu(var s: shortstring); -begin -s:= s; // avoid compiler hint -if CheckNoTeamOrHH then - bShowAmmoMenu:= true -else - 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 ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEnd) = 0)) or - ((Gear^.State and gstHHDriven) = 0) then else bShowAmmoMenu:= true - end; - if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1 - end -end; - -procedure chVol_p(var s: shortstring); -begin -s:= s; // avoid compiler hint -inc(cVolumeDelta, 3) -end; - -procedure chVol_m(var s: shortstring); -begin -s:= s; // avoid compiler hint -dec(cVolumeDelta, 3) -end; - -procedure chFindhh(var s: shortstring); -begin -s:= s; // avoid compiler hint -if CheckNoTeamOrHH or isPaused then exit; -bShowFinger:= true; -FollowGear:= CurrentHedgehog^.Gear -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; - -procedure chRotateMask(var s: shortstring); -begin -s:= s; // avoid compiler hint -if ((GameFlags and gfInvulnerable) = 0) then cTagsMask:= cTagsMasks[cTagsMask] else cTagsMask:= cTagsMasksNoHealth[cTagsMask]; -end; - -procedure chSpeedup_p(var s: shortstring); -begin -s:= s; // avoid compiler hint -isSpeed:= true -end; - -procedure chSpeedup_m(var s: shortstring); -begin -s:= s; // avoid compiler hint -isSpeed:= false -end; - -procedure chZoomIn(var s: shortstring); -begin - s:= s; // avoid compiler hint - if ZoomValue < cMinZoomLevel then - ZoomValue:= ZoomValue + cZoomDelta; -end; - -procedure chZoomOut(var s: shortstring); -begin - s:= s; // avoid compiler hint - if ZoomValue > cMaxZoomLevel then - ZoomValue:= ZoomValue - cZoomDelta; -end; - -procedure chZoomReset(var s: shortstring); -begin - s:= s; // avoid compiler hint - ZoomValue:= cDefaultZoomLevel; -end; - - diff -r c9a78ba03679 -r 46caab3a8f84 hedgewars/CMakeLists.txt --- a/hedgewars/CMakeLists.txt Mon Nov 22 12:35:52 2010 +0100 +++ b/hedgewars/CMakeLists.txt Mon Nov 22 21:43:31 2010 +0300 @@ -47,6 +47,7 @@ uChat.pas uCollisions.pas uCommands.pas + uCommandHandlers.pas uConsole.pas uConsts.pas uDebug.pas @@ -77,7 +78,6 @@ uUtils.pas uVisualGears.pas uWorld.pas - CCHandlers.inc GSHandlers.inc VGSHandlers.inc HHHandlers.inc diff -r c9a78ba03679 -r 46caab3a8f84 hedgewars/hwengine.pas --- a/hedgewars/hwengine.pas Mon Nov 22 12:35:52 2010 +0100 +++ b/hedgewars/hwengine.pas Mon Nov 22 21:43:31 2010 +0300 @@ -31,7 +31,7 @@ uses SDLh, uMisc, uConsole, uGame, uConsts, uLand, uAmmos, uVisualGears, uGears, uStore, uWorld, uKeys, uSound, uScript, uTeams, uStats, uIO, uLocale, uChat, uAI, uAIMisc, uRandom, uLandTexture, uCollisions, uMobile, - sysutils, uTypes, uVariables, uCommands, uUtils, uCaptions, uDebug; + sysutils, uTypes, uVariables, uCommands, uUtils, uCaptions, uDebug, uCommandHandlers; var isTerminated: boolean = false; alsoShutdownFrontend: boolean = false; @@ -324,6 +324,7 @@ uVariables.initModule; uConsole.initModule; // MUST happen after uMisc uCommands.initModule; + uCommandHandlers.initModule; uLand.initModule; uIO.initModule; @@ -392,6 +393,7 @@ uIO.freeModule; //stub uLand.freeModule; + uCommandHandlers.freeModule; uCommands.freeModule; uConsole.freeModule; uVariables.freeModule; diff -r c9a78ba03679 -r 46caab3a8f84 hedgewars/uCommandHandlers.pas --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hedgewars/uCommandHandlers.pas Mon Nov 22 21:43:31 2010 +0300 @@ -0,0 +1,598 @@ +{$INCLUDE "options.inc"} +unit uCommandHandlers; + +interface + +procedure initModule; +procedure freeModule; + +implementation +uses uCommands, uTypes, uVariables, uIO, uDebug, uConsts, uScript, uUtils, SDLh, uMobile, uRandom; + +procedure chQuit(var s: shortstring); +const prevGState: TGameState = gsConfirm; +begin +s:= s; // avoid compiler hint +if GameState <> gsConfirm then + begin + prevGState:= GameState; + GameState:= gsConfirm + end else + GameState:= prevGState +end; + +procedure chConfirm(var s: shortstring); +begin +s:= s; // avoid compiler hint +if GameState = gsConfirm then + begin + SendIPC('Q'); + GameState:= gsExit + end +else + ParseCommand('chat team', true); +end; + +procedure chCheckProto(var s: shortstring); +var i, c: LongInt; +begin +if isDeveloperMode then +begin +val(s, i, c); +if (c <> 0) or (i = 0) then exit; +TryDo(i <= cNetProtoVersion, 'Protocol version mismatch: engine is too old', true); +TryDo(i >= cNetProtoVersion, 'Protocol version mismatch: engine is too new', true) +end +end; + +procedure chTeamLocal(var s: shortstring); +begin +s:= s; // avoid compiler hint +if not isDeveloperMode then exit; +if CurrentTeam = nil then OutError(errmsgIncorrectUse + ' "/rdriven"', true); +CurrentTeam^.ExtDriven:= true +end; + +procedure chGrave(var s: shortstring); +begin +if CurrentTeam = nil then OutError(errmsgIncorrectUse + ' "/grave"', true); +if s[1]='"' then Delete(s, 1, 1); +if s[byte(s[0])]='"' then Delete(s, byte(s[0]), 1); +CurrentTeam^.GraveName:= s +end; + +procedure chFort(var s: shortstring); +begin +if CurrentTeam = nil then OutError(errmsgIncorrectUse + ' "/fort"', true); +if s[1]='"' then Delete(s, 1, 1); +if s[byte(s[0])]='"' then Delete(s, byte(s[0]), 1); +CurrentTeam^.FortName:= s +end; + +procedure chFlag(var s: shortstring); +begin +if CurrentTeam = nil then OutError(errmsgIncorrectUse + ' "/flag"', true); +if s[1]='"' then Delete(s, 1, 1); +if s[byte(s[0])]='"' then Delete(s, byte(s[0]), 1); +CurrentTeam^.flag:= s +end; + +procedure chScript(var s: shortstring); +begin +if s[1]='"' then Delete(s, 1, 1); +if s[byte(s[0])]='"' then Delete(s, byte(s[0]), 1); +ScriptLoad(s) +end; + +procedure chSetHat(var s: shortstring); +begin +if (not isDeveloperMode) or (CurrentTeam = nil) then exit; +with CurrentTeam^ do + begin + if not CurrentHedgehog^.King then + if (s = '') or + (((GameFlags and gfKing) <> 0) and (s = 'crown')) or + ((Length(s) > 39) and (Copy(s,1,8) = 'Reserved') and (Copy(s,9,32) <> PlayerHash)) then + CurrentHedgehog^.Hat:= 'NoHat' + else + CurrentHedgehog^.Hat:= s + end; +end; + +procedure chCurU_p(var s: shortstring); +begin +s:= s; // avoid compiler hint +CursorMovementY:= -1; +end; + +procedure chCurU_m(var s: shortstring); +begin +s:= s; // avoid compiler hint +CursorMovementY:= 0; +end; + +procedure chCurD_p(var s: shortstring); +begin +s:= s; // avoid compiler hint +CursorMovementY:= 1; +end; + +procedure chCurD_m(var s: shortstring); +begin +s:= s; // avoid compiler hint +CursorMovementY:= 0; +end; + +procedure chCurL_p(var s: shortstring); +begin +s:= s; // avoid compiler hint +CursorMovementX:= -1; +end; + +procedure chCurL_m(var s: shortstring); +begin +s:= s; // avoid compiler hint +CursorMovementX:= 0; +end; + +procedure chCurR_p(var s: shortstring); +begin +s:= s; // avoid compiler hint +CursorMovementX:= 1; +end; + +procedure chCurR_m(var s: shortstring); +begin +s:= s; // avoid compiler hint +CursorMovementX:= 0; +end; + +procedure chLeft_p(var s: shortstring); +begin +s:= s; // avoid compiler hint +if CheckNoTeamOrHH or isPaused then exit; +if not CurrentTeam^.ExtDriven then SendIPC('L'); +if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; +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 gmLeft +end; + +procedure chRight_p(var s: shortstring); +begin +s:= s; // avoid compiler hint +if CheckNoTeamOrHH or isPaused then exit; +if not CurrentTeam^.ExtDriven then SendIPC('R'); +if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; +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 gmRight +end; + +procedure chUp_p(var s: shortstring); +begin +s:= s; // avoid compiler hint +if CheckNoTeamOrHH or isPaused then exit; +if not CurrentTeam^.ExtDriven then SendIPC('U'); +if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; +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 gmUp +end; + +procedure chDown_p(var s: shortstring); +begin +s:= s; // avoid compiler hint +if CheckNoTeamOrHH or isPaused then exit; +if not CurrentTeam^.ExtDriven then SendIPC('D'); +if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; +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 gmDown +end; + +procedure chPrecise_p(var s: shortstring); +begin +s:= s; // avoid compiler hint +if CheckNoTeamOrHH or isPaused then exit; +if not CurrentTeam^.ExtDriven then SendIPC('Z'); +if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; +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 gmPrecise +end; + +procedure chLJump(var s: shortstring); +begin +s:= s; // avoid compiler hint +if CheckNoTeamOrHH or isPaused then exit; +if not CurrentTeam^.ExtDriven then SendIPC('j'); +if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; +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; +if not CurrentTeam^.ExtDriven then SendIPC('J'); +if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; +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 gmAttack + end + end +end; + +procedure chAttack_m(var s: shortstring); +begin +s:= s; // avoid compiler hint +if CheckNoTeamOrHH then exit; +with CurrentHedgehog^.Gear^ do + begin + if not CurrentTeam^.ExtDriven and + ((Message and gmAttack) <> 0) then SendIPC('a'); + 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'); +if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; +bShowFinger:= false; +with CurrentHedgehog^.Gear^ do + Message:= Message or gmSwitch +end; + +procedure chNextTurn(var s: shortstring); +begin + s:= s; // avoid compiler hint + TryDo(AllInactive, '/nextturn called when not all gears are inactive', true); + + if not CurrentTeam^.ExtDriven then SendIPC('N'); +{$IFDEF DEBUGFILE} + AddFileLog('Doing SwitchHedgehog: time '+inttostr(GameTicks)); +{$ENDIF} + perfExt_NewTurnBeginning(); +end; + +procedure chTimer(var s: shortstring); +begin +if (s[0] <> #1) or (s[1] < '1') or (s[1] > '5') or CheckNoTeamOrHH then exit; + +if not CurrentTeam^.ExtDriven then SendIPC(s); +if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; +bShowFinger:= false; +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; +slot:= byte(s[1]) - 49; +if slot > cMaxSlotIndex then exit; +if not CurrentTeam^.ExtDriven then SendIPC(char(byte(s[1]) + 79)); +if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; +bShowFinger:= false; +with CurrentHedgehog^.Gear^ do + begin + Message:= Message or gmSlot; + MsgParam:= slot + end +end; + +procedure chSetWeapon(var s: shortstring); +begin + if (s[0] <> #1) or CheckNoTeamOrHH then exit; + + if TAmmoType(s[1]) > High(TAmmoType) then exit; + + if not CurrentTeam^.ExtDriven then SendIPC('w' + s); + + with CurrentHedgehog^.Gear^ do + begin + Message:= Message or gmWeapon; + MsgParam:= byte(s[1]); + end; +end; + +procedure chTaunt(var s: shortstring); +begin +if (s[0] <> #1) or CheckNoTeamOrHH then exit; + +if TWave(s[1]) > High(TWave) then exit; + +if not CurrentTeam^.ExtDriven then SendIPC('t' + s); + +with CurrentHedgehog^.Gear^ do + begin + Message:= Message or gmAnimate; + MsgParam:= byte(s[1]) + end +end; + +procedure chPut(var s: shortstring); +begin + s:= s; // avoid compiler hint + doPut(0, 0, false); +end; + +procedure chCapture(var s: shortstring); +begin +s:= s; // avoid compiler hint +flagMakeCapture:= true +end; + +procedure chSetMap(var s: shortstring); +begin +if isDeveloperMode then +begin +Pathz[ptMapCurrent]:= Pathz[ptMaps] + '/' + s; +InitStepsFlags:= InitStepsFlags or cifMap +end +end; + +procedure chSetTheme(var s: shortstring); +begin +if isDeveloperMode then +begin +Pathz[ptCurrTheme]:= Pathz[ptThemes] + '/' + s; +InitStepsFlags:= InitStepsFlags or cifTheme +end +end; + +procedure chSetSeed(var s: shortstring); +begin +if isDeveloperMode then +begin +SetRandomSeed(s); +cSeed:= s; +InitStepsFlags:= InitStepsFlags or cifRandomize +end +end; + +procedure chAmmoMenu(var s: shortstring); +begin +s:= s; // avoid compiler hint +if CheckNoTeamOrHH then + bShowAmmoMenu:= true +else + 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 ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEnd) = 0)) or + ((Gear^.State and gstHHDriven) = 0) then else bShowAmmoMenu:= true + end; + if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1 + end +end; + +procedure chVol_p(var s: shortstring); +begin +s:= s; // avoid compiler hint +inc(cVolumeDelta, 3) +end; + +procedure chVol_m(var s: shortstring); +begin +s:= s; // avoid compiler hint +dec(cVolumeDelta, 3) +end; + +procedure chFindhh(var s: shortstring); +begin +s:= s; // avoid compiler hint +if CheckNoTeamOrHH or isPaused then exit; +bShowFinger:= true; +FollowGear:= CurrentHedgehog^.Gear +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; + +procedure chRotateMask(var s: shortstring); +begin +s:= s; // avoid compiler hint +if ((GameFlags and gfInvulnerable) = 0) then cTagsMask:= cTagsMasks[cTagsMask] else cTagsMask:= cTagsMasksNoHealth[cTagsMask]; +end; + +procedure chSpeedup_p(var s: shortstring); +begin +s:= s; // avoid compiler hint +isSpeed:= true +end; + +procedure chSpeedup_m(var s: shortstring); +begin +s:= s; // avoid compiler hint +isSpeed:= false +end; + +procedure chZoomIn(var s: shortstring); +begin + s:= s; // avoid compiler hint + if ZoomValue < cMinZoomLevel then + ZoomValue:= ZoomValue + cZoomDelta; +end; + +procedure chZoomOut(var s: shortstring); +begin + s:= s; // avoid compiler hint + if ZoomValue > cMaxZoomLevel then + ZoomValue:= ZoomValue - cZoomDelta; +end; + +procedure chZoomReset(var s: shortstring); +begin + s:= s; // avoid compiler hint + ZoomValue:= cDefaultZoomLevel; +end; + + +procedure initModule; +begin + RegisterVariable('flag' , vtCommand, @chFlag , false); + RegisterVariable('script' , vtCommand, @chScript , false); + RegisterVariable('proto' , vtCommand, @chCheckProto , true ); + RegisterVariable('spectate', vtBoolean, @fastUntilLag , false); + RegisterVariable('capture' , vtCommand, @chCapture , true ); + RegisterVariable('rotmask' , vtCommand, @chRotateMask , true ); + RegisterVariable('rdriven' , vtCommand, @chTeamLocal , false); + RegisterVariable('map' , vtCommand, @chSetMap , false); + RegisterVariable('theme' , vtCommand, @chSetTheme , false); + RegisterVariable('seed' , vtCommand, @chSetSeed , false); + RegisterVariable('template_filter', vtLongInt, @cTemplateFilter, false); + RegisterVariable('mapgen' , vtLongInt, @cMapGen , false); + RegisterVariable('maze_size',vtLongInt, @cMazeSize , false); + RegisterVariable('delay' , vtLongInt, @cInactDelay , false); + RegisterVariable('ready' , vtLongInt, @cReadyDelay , false); + RegisterVariable('casefreq', vtLongInt, @cCaseFactor , false); + RegisterVariable('healthprob', vtLongInt, @cHealthCaseProb, false); + RegisterVariable('hcaseamount', vtLongInt, @cHealthCaseAmount, false); + RegisterVariable('sd_turns', vtLongInt, @cSuddenDTurns , false); + RegisterVariable('waterrise', vtLongInt, @cWaterRise , false); + RegisterVariable('healthdec', vtLongInt, @cHealthDecrease, false); + RegisterVariable('damagepct',vtLongInt, @cDamagePercent , false); + RegisterVariable('ropepct' , vtLongInt, @cRopePercent , false); + RegisterVariable('minedudpct',vtLongInt,@cMineDudPercent, false); + RegisterVariable('minesnum', vtLongInt, @cLandMines , false); + RegisterVariable('explosives',vtLongInt,@cExplosives , false); + RegisterVariable('gmflags' , vtLongInt, @GameFlags , false); + RegisterVariable('trflags' , vtLongInt, @TrainingFlags , false); + RegisterVariable('turntime', vtLongInt, @cHedgehogTurnTime, false); + RegisterVariable('minestime',vtLongInt, @cMinesTime , false); + RegisterVariable('fort' , vtCommand, @chFort , false); + RegisterVariable('grave' , vtCommand, @chGrave , false); + RegisterVariable('hat' , vtCommand, @chSetHat , false); + RegisterVariable('quit' , vtCommand, @chQuit , true ); + RegisterVariable('confirm' , vtCommand, @chConfirm , true ); + RegisterVariable('+speedup', vtCommand, @chSpeedup_p , true ); + RegisterVariable('-speedup', vtCommand, @chSpeedup_m , true ); + RegisterVariable('zoomin' , vtCommand, @chZoomIn , true ); + RegisterVariable('zoomout' , vtCommand, @chZoomOut , true ); + RegisterVariable('zoomreset',vtCommand, @chZoomReset , true ); + RegisterVariable('ammomenu', vtCommand, @chAmmoMenu , true); + RegisterVariable('+precise', vtCommand, @chPrecise_p , false); + RegisterVariable('-precise', vtCommand, @chPrecise_m , false); + RegisterVariable('+left' , vtCommand, @chLeft_p , false); + RegisterVariable('-left' , vtCommand, @chLeft_m , false); + RegisterVariable('+right' , vtCommand, @chRight_p , false); + RegisterVariable('-right' , vtCommand, @chRight_m , false); + RegisterVariable('+up' , vtCommand, @chUp_p , false); + RegisterVariable('-up' , vtCommand, @chUp_m , false); + RegisterVariable('+down' , vtCommand, @chDown_p , false); + RegisterVariable('-down' , vtCommand, @chDown_m , false); + RegisterVariable('+attack' , vtCommand, @chAttack_p , false); + RegisterVariable('-attack' , vtCommand, @chAttack_m , false); + RegisterVariable('switch' , vtCommand, @chSwitch , false); + RegisterVariable('nextturn', vtCommand, @chNextTurn , false); + RegisterVariable('timer' , vtCommand, @chTimer , false); + RegisterVariable('taunt' , vtCommand, @chTaunt , false); + RegisterVariable('setweap' , vtCommand, @chSetWeapon , false); + RegisterVariable('slot' , vtCommand, @chSlot , false); + RegisterVariable('put' , vtCommand, @chPut , false); + RegisterVariable('ljump' , vtCommand, @chLJump , false); + RegisterVariable('hjump' , vtCommand, @chHJump , false); + RegisterVariable('+volup' , vtCommand, @chVol_p , true ); + RegisterVariable('-volup' , vtCommand, @chVol_m , true ); + RegisterVariable('+voldown', vtCommand, @chVol_m , true ); + RegisterVariable('-voldown', vtCommand, @chVol_p , true ); + RegisterVariable('findhh' , vtCommand, @chFindhh , true ); + RegisterVariable('pause' , vtCommand, @chPause , true ); + RegisterVariable('+cur_u' , vtCommand, @chCurU_p , true ); + RegisterVariable('-cur_u' , vtCommand, @chCurU_m , true ); + RegisterVariable('+cur_d' , vtCommand, @chCurD_p , true ); + RegisterVariable('-cur_d' , vtCommand, @chCurD_m , true ); + RegisterVariable('+cur_l' , vtCommand, @chCurL_p , true ); + RegisterVariable('-cur_l' , vtCommand, @chCurL_m , true ); + RegisterVariable('+cur_r' , vtCommand, @chCurR_p , true ); + RegisterVariable('-cur_r' , vtCommand, @chCurR_m , true ); +end; + +procedure freeModule; +begin +end; + +end. diff -r c9a78ba03679 -r 46caab3a8f84 hedgewars/uCommands.pas --- a/hedgewars/uCommands.pas Mon Nov 22 12:35:52 2010 +0100 +++ b/hedgewars/uCommands.pas Mon Nov 22 21:43:31 2010 +0300 @@ -16,9 +16,7 @@ procedure doPut(putX, putY: LongInt; fromAI: boolean); implementation -uses Types, uConsts, uIO, uMobile, - uRandom, SDLh, uScript, uTypes, - uVariables, uConsole, uUtils, uDebug; +uses Types, uConsts, uIO, uVariables, uConsole, uUtils, uDebug; type PVariable = ^TVariable; TVariable = record @@ -116,90 +114,55 @@ if (Message and gmAttack) <> 0 then ParseCommand('/-attack', true) end; -{$INCLUDE "CCHandlers.inc"} + +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; + +with CurrentHedgehog^.Gear^, + CurrentHedgehog^ do + if (State and gstHHChooseTarget) <> 0 then + begin + isCursorVisible:= false; + if not CurrentTeam^.ExtDriven then + begin + if fromAI then + begin + TargetPoint.X:= putX; + TargetPoint.Y:= putY + end else + begin + TargetPoint.X:= CursorPoint.X - WorldDx; + TargetPoint.Y:= cScreenHeight - CursorPoint.Y - WorldDy; + end; + SendIPCXY('p', TargetPoint.X, TargetPoint.Y); + end + else + begin + TargetPoint.X:= putX; + TargetPoint.Y:= putY + end; + {$IFDEF DEBUGFILE}AddFilelog('put: ' + inttostr(TargetPoint.X) + ', ' + inttostr(TargetPoint.Y));{$ENDIF} + State:= State and not gstHHChooseTarget; + if (Ammoz[CurAmmoType].Ammo.Propz and ammoprop_AttackingPut) <> 0 then + Message:= Message or gmAttack; + end + else + if CurrentTeam^.ExtDriven then + OutError('got /put while not being in choose target mode', false) +end; procedure initModule; begin Variables:= nil; isDeveloperMode:= true; - - // NOTE: please, keep most frequently used commands on bottom - RegisterVariable('flag' , vtCommand, @chFlag , false); - RegisterVariable('script' , vtCommand, @chScript , false); - RegisterVariable('proto' , vtCommand, @chCheckProto , true ); - RegisterVariable('spectate', vtBoolean, @fastUntilLag , false); - RegisterVariable('capture' , vtCommand, @chCapture , true ); - RegisterVariable('rotmask' , vtCommand, @chRotateMask , true ); - RegisterVariable('rdriven' , vtCommand, @chTeamLocal , false); - RegisterVariable('map' , vtCommand, @chSetMap , false); - RegisterVariable('theme' , vtCommand, @chSetTheme , false); - RegisterVariable('seed' , vtCommand, @chSetSeed , false); - RegisterVariable('template_filter', vtLongInt, @cTemplateFilter, false); - RegisterVariable('mapgen' , vtLongInt, @cMapGen , false); - RegisterVariable('maze_size',vtLongInt, @cMazeSize , false); - RegisterVariable('delay' , vtLongInt, @cInactDelay , false); - RegisterVariable('ready' , vtLongInt, @cReadyDelay , false); - RegisterVariable('casefreq', vtLongInt, @cCaseFactor , false); - RegisterVariable('healthprob', vtLongInt, @cHealthCaseProb, false); - RegisterVariable('hcaseamount', vtLongInt, @cHealthCaseAmount, false); - RegisterVariable('sd_turns', vtLongInt, @cSuddenDTurns , false); - RegisterVariable('waterrise', vtLongInt, @cWaterRise , false); - RegisterVariable('healthdec', vtLongInt, @cHealthDecrease, false); - RegisterVariable('damagepct',vtLongInt, @cDamagePercent , false); - RegisterVariable('ropepct' , vtLongInt, @cRopePercent , false); - RegisterVariable('minedudpct',vtLongInt,@cMineDudPercent, false); - RegisterVariable('minesnum', vtLongInt, @cLandMines , false); - RegisterVariable('explosives',vtLongInt,@cExplosives , false); - RegisterVariable('gmflags' , vtLongInt, @GameFlags , false); - RegisterVariable('trflags' , vtLongInt, @TrainingFlags , false); - RegisterVariable('turntime', vtLongInt, @cHedgehogTurnTime, false); - RegisterVariable('minestime',vtLongInt, @cMinesTime , false); - RegisterVariable('fort' , vtCommand, @chFort , false); - RegisterVariable('grave' , vtCommand, @chGrave , false); - RegisterVariable('hat' , vtCommand, @chSetHat , false); - RegisterVariable('quit' , vtCommand, @chQuit , true ); - RegisterVariable('confirm' , vtCommand, @chConfirm , true ); - RegisterVariable('+speedup', vtCommand, @chSpeedup_p , true ); - RegisterVariable('-speedup', vtCommand, @chSpeedup_m , true ); - RegisterVariable('zoomin' , vtCommand, @chZoomIn , true ); - RegisterVariable('zoomout' , vtCommand, @chZoomOut , true ); - RegisterVariable('zoomreset',vtCommand, @chZoomReset , true ); - RegisterVariable('ammomenu', vtCommand, @chAmmoMenu , true); - RegisterVariable('+precise', vtCommand, @chPrecise_p , false); - RegisterVariable('-precise', vtCommand, @chPrecise_m , false); - RegisterVariable('+left' , vtCommand, @chLeft_p , false); - RegisterVariable('-left' , vtCommand, @chLeft_m , false); - RegisterVariable('+right' , vtCommand, @chRight_p , false); - RegisterVariable('-right' , vtCommand, @chRight_m , false); - RegisterVariable('+up' , vtCommand, @chUp_p , false); - RegisterVariable('-up' , vtCommand, @chUp_m , false); - RegisterVariable('+down' , vtCommand, @chDown_p , false); - RegisterVariable('-down' , vtCommand, @chDown_m , false); - RegisterVariable('+attack' , vtCommand, @chAttack_p , false); - RegisterVariable('-attack' , vtCommand, @chAttack_m , false); - RegisterVariable('switch' , vtCommand, @chSwitch , false); - RegisterVariable('nextturn', vtCommand, @chNextTurn , false); - RegisterVariable('timer' , vtCommand, @chTimer , false); - RegisterVariable('taunt' , vtCommand, @chTaunt , false); - RegisterVariable('setweap' , vtCommand, @chSetWeapon , false); - RegisterVariable('slot' , vtCommand, @chSlot , false); - RegisterVariable('put' , vtCommand, @chPut , false); - RegisterVariable('ljump' , vtCommand, @chLJump , false); - RegisterVariable('hjump' , vtCommand, @chHJump , false); - RegisterVariable('+volup' , vtCommand, @chVol_p , true ); - RegisterVariable('-volup' , vtCommand, @chVol_m , true ); - RegisterVariable('+voldown', vtCommand, @chVol_m , true ); - RegisterVariable('-voldown', vtCommand, @chVol_p , true ); - RegisterVariable('findhh' , vtCommand, @chFindhh , true ); - RegisterVariable('pause' , vtCommand, @chPause , true ); - RegisterVariable('+cur_u' , vtCommand, @chCurU_p , true ); - RegisterVariable('-cur_u' , vtCommand, @chCurU_m , true ); - RegisterVariable('+cur_d' , vtCommand, @chCurD_p , true ); - RegisterVariable('-cur_d' , vtCommand, @chCurD_m , true ); - RegisterVariable('+cur_l' , vtCommand, @chCurL_p , true ); - RegisterVariable('-cur_l' , vtCommand, @chCurL_m , true ); - RegisterVariable('+cur_r' , vtCommand, @chCurR_p , true ); - RegisterVariable('-cur_r' , vtCommand, @chCurR_m , true ); end; procedure freeModule; diff -r c9a78ba03679 -r 46caab3a8f84 hedgewars/uMisc.pas --- a/hedgewars/uMisc.pas Mon Nov 22 12:35:52 2010 +0100 +++ b/hedgewars/uMisc.pas Mon Nov 22 21:43:31 2010 +0300 @@ -27,6 +27,7 @@ procedure movecursor(dx, dy: LongInt); function doSurfaceConversion(tmpsurf: PSDL_Surface): PSDL_Surface; procedure MakeScreenshot(filename: shortstring); +function GetTeamStatString(p: PTeam): shortstring; procedure initModule; procedure freeModule; @@ -131,6 +132,13 @@ end; +function GetTeamStatString(p: PTeam): shortstring; +var s: ansistring; +begin + s:= p^.TeamName + ':' + IntToStr(p^.TeamHealth) + ':'; + GetTeamStatString:= s; +end; + procedure initModule; begin end; diff -r c9a78ba03679 -r 46caab3a8f84 hedgewars/uStats.pas --- a/hedgewars/uStats.pas Mon Nov 22 12:35:52 2010 +0100 +++ b/hedgewars/uStats.pas Mon Nov 22 21:43:31 2010 +0300 @@ -35,7 +35,7 @@ procedure SendStats; implementation -uses uTeams, uSound, uLocale, uVariables, uUtils, uIO, uCaptions, uDebug; +uses uSound, uLocale, uVariables, uUtils, uIO, uCaptions, uDebug, uMisc; var DamageGiven : Longword = 0; DamageClan : Longword = 0; diff -r c9a78ba03679 -r 46caab3a8f84 hedgewars/uTeams.pas --- a/hedgewars/uTeams.pas Mon Nov 22 12:35:52 2010 +0100 +++ b/hedgewars/uTeams.pas Mon Nov 22 21:43:31 2010 +0300 @@ -34,7 +34,6 @@ procedure RestoreTeamsFromSave; function CheckForWin: boolean; procedure TeamGoneEffect(var Team: TTeam); -function GetTeamStatString(p: PTeam): shortstring; implementation uses uLocale, uAmmos, uChat, uMobile, uVariables, uUtils, uIO, uCaptions, uCommands, uDebug; @@ -406,13 +405,6 @@ end end; -function GetTeamStatString(p: PTeam): shortstring; -var s: ansistring; -begin - s:= p^.TeamName + ':' + IntToStr(p^.TeamHealth) + ':'; - GetTeamStatString:= s; -end; - procedure chAddHH(var id: shortstring); var s: shortstring; Gear: PGear;