merge... need to remember to update first
authornemo
Sat, 17 Nov 2012 20:30:32 -0500
changeset 8058 bcebfc477459
parent 8054 39f8ea1a441f (diff)
parent 8057 93e16240f178 (current diff)
child 8059 07661fb20586
merge... need to remember to update first
misc/quazip/CMakeLists.txt
misc/quazip/JlCompress.cpp
misc/quazip/JlCompress.h
misc/quazip/crypt.h
misc/quazip/doc/faq.dox
misc/quazip/doc/index.dox
misc/quazip/doc/usage.dox
misc/quazip/ioapi.h
misc/quazip/qioapi.cpp
misc/quazip/quaadler32.cpp
misc/quazip/quaadler32.h
misc/quazip/quachecksum32.h
misc/quazip/quacrc32.cpp
misc/quazip/quacrc32.h
misc/quazip/quazip.cpp
misc/quazip/quazip.h
misc/quazip/quazip.pri
misc/quazip/quazip.pro
misc/quazip/quazip_global.h
misc/quazip/quazipfile.cpp
misc/quazip/quazipfile.h
misc/quazip/quazipfileinfo.h
misc/quazip/quazipnewinfo.cpp
misc/quazip/quazipnewinfo.h
misc/quazip/unzip.c
misc/quazip/unzip.h
misc/quazip/zconf.h
misc/quazip/zip.c
misc/quazip/zip.h
misc/quazip/zlib.h
--- a/hedgewars/uTeams.pas	Sun Nov 18 01:00:26 2012 +0400
+++ b/hedgewars/uTeams.pas	Sat Nov 17 20:30:32 2012 -0500
@@ -302,7 +302,10 @@
         else AddVoice(sndJustYouWait, CurrentTeam^.voicepack)
         end
     else
+        begin
+        GetRandom(2); // needed to avoid extdriven desync
         AddVoice(sndYesSir, CurrentTeam^.voicepack);
+        end;
     if cHedgehogTurnTime < 1000000 then
         ReadyTimeLeft:= cReadyDelay;
     AddCaption(Format(shortstring(trmsg[sidReady]), CurrentTeam^.TeamName), cWhiteColor, capgrpGameState)