# HG changeset patch # User nemo # Date 1286828934 14400 # Node ID 5f4ef3db0a65716dcc5a31488bd2cfc6b1cb64cb # Parent b73bf885e127dbaebf6ae604df35c0562da43676 Ok. Let's disable the right one this time. In fact, let's just remove newgrave entirely - no point in half-measures. diff -r b73bf885e127 -r 5f4ef3db0a65 hedgewars/CCHandlers.inc --- a/hedgewars/CCHandlers.inc Mon Oct 11 16:23:36 2010 -0400 +++ b/hedgewars/CCHandlers.inc Mon Oct 11 16:28:54 2010 -0400 @@ -105,7 +105,7 @@ if CurrentTeam = nil then OutError(errmsgIncorrectUse + ' "/rdriven"', true); CurrentTeam^.ExtDriven:= true end; -(* conflicts with resurrection + procedure chGrave(var s: shortstring); begin if CurrentTeam = nil then OutError(errmsgIncorrectUse + ' "/grave"', true); @@ -113,7 +113,6 @@ if s[byte(s[0])]='"' then Delete(s, byte(s[0]), 1); CurrentTeam^.GraveName:= s end; -*) procedure chFort(var s: shortstring); begin @@ -580,17 +579,6 @@ end; -procedure chNewGrave; -begin -if CheckNoTeamOrHH or isPaused then exit; - -if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1; - -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; diff -r b73bf885e127 -r 5f4ef3db0a65 hedgewars/uChat.pas --- a/hedgewars/uChat.pas Mon Oct 11 16:23:36 2010 -0400 +++ b/hedgewars/uChat.pas Mon Oct 11 16:28:54 2010 -0400 @@ -253,11 +253,6 @@ ParseCommand('/taunt ' + char(i), true); exit end; - if (s = '/newgrave') then - begin - ParseCommand('/newgrave', true); - exit - end; end else ParseCommand('/say ' + s, true); diff -r b73bf885e127 -r 5f4ef3db0a65 hedgewars/uConsole.pas --- a/hedgewars/uConsole.pas Mon Oct 11 16:23:36 2010 -0400 +++ b/hedgewars/uConsole.pas Mon Oct 11 16:28:54 2010 -0400 @@ -245,7 +245,7 @@ RegisterVariable('minestime',vtLongInt, @cMinesTime , false); RegisterVariable('fort' , vtCommand, @chFort , false); RegisterVariable('voicepack',vtCommand, @chVoicepack , false); - //RegisterVariable('grave' , vtCommand, @chGrave , false); + RegisterVariable('grave' , vtCommand, @chGrave , false); RegisterVariable('bind' , vtCommand, @chBind , true ); RegisterVariable('addhh' , vtCommand, @chAddHH , false); RegisterVariable('hat' , vtCommand, @chSetHat , false); @@ -265,7 +265,6 @@ RegisterVariable('skip' , vtCommand, @chSkip , false); RegisterVariable('history' , vtCommand, @chHistory , true ); RegisterVariable('chat' , vtCommand, @chChat , true ); - RegisterVariable('newgrave', vtCommand, @chNewGrave , false); RegisterVariable('say' , vtCommand, @chSay , true ); RegisterVariable('hogsay' , vtCommand, @chHogSay , true ); RegisterVariable('team' , vtCommand, @chTeamSay , true ); diff -r b73bf885e127 -r 5f4ef3db0a65 hedgewars/uIO.pas --- a/hedgewars/uIO.pas Mon Oct 11 16:23:36 2010 -0400 +++ b/hedgewars/uIO.pas Mon Oct 11 16:28:54 2010 -0400 @@ -330,7 +330,6 @@ end; 'w': ParseCommand('setweap ' + headcmd^.str[2], true); 't': ParseCommand('taunt ' + headcmd^.str[2], true); - 'g': ParseCommand('newgrave', true); 'h': ParseCommand('hogsay ' + copy(headcmd^.str, 2, Pred(headcmd^.len)), true); '1'..'5': ParseCommand('timer ' + headcmd^.cmd, true); #128..char(128 + cMaxSlotIndex): ParseCommand('slot ' + char(byte(headcmd^.cmd) - 79), true)