# HG changeset patch # User nemo # Date 1320084490 14400 # Node ID e90fb60cb46d65b7322cb5526e0c891bb7dfbb9f # Parent d73317579ae4859ab3556f6a78c38b5d529521bf Force a desync if there is a script name mismatch. This avoids playing until the game desyncs due to script differences. diff -r d73317579ae4 -r e90fb60cb46d hedgewars/uCommandHandlers.pas --- a/hedgewars/uCommandHandlers.pas Mon Oct 31 19:40:39 2011 +0200 +++ b/hedgewars/uCommandHandlers.pas Mon Oct 31 14:08:10 2011 -0400 @@ -130,6 +130,7 @@ begin if s[1]='"' then Delete(s, 1, 1); if s[byte(s[0])]='"' then Delete(s, byte(s[0]), 1); +cScriptName:= s; ScriptLoad(s) end; diff -r d73317579ae4 -r e90fb60cb46d hedgewars/uLand.pas --- a/hedgewars/uLand.pas Mon Oct 31 19:40:39 2011 +0200 +++ b/hedgewars/uLand.pas Mon Oct 31 14:08:10 2011 -0400 @@ -1439,7 +1439,7 @@ adler:= 1; for i:= 0 to LAND_HEIGHT-1 do Adler32Update(adler, @Land[i,0], LAND_WIDTH); - s:= 'M' + IntToStr(adler); + s:= 'M' + IntToStr(adler) + cScriptName; chLandCheck(s); SendIPCRaw(@s[0], Length(s) + 1) diff -r d73317579ae4 -r e90fb60cb46d hedgewars/uVariables.pas --- a/hedgewars/uVariables.pas Mon Oct 31 19:40:39 2011 +0200 +++ b/hedgewars/uVariables.pas Mon Oct 31 14:08:10 2011 -0400 @@ -126,6 +126,7 @@ cLandMines : Longword; cExplosives : Longword; + cScriptName : shortstring; cSeed : shortstring; cVolumeDelta : LongInt; cHasFocus : boolean; @@ -2500,6 +2501,7 @@ isFirstFrame := true; isSEBackup := true; autoCameraOn := true; + cScriptName := ''; cSeed := ''; cVolumeDelta := 0; cHasFocus := true;