From 50c9c0365cc2e1b8a28fd46b5f5f437693d72d86 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Mon, 17 Dec 2012 08:27:44 +0000
Subject: [PATCH] enet random seed fix

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6985 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/enet/host.c  |   8 ++++++--
 source/lib/enet.lib | Bin 45290 -> 45296 bytes
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/source/enet/host.c b/source/enet/host.c
index a3317c34..d0ee595c 100755
--- a/source/enet/host.c
+++ b/source/enet/host.c
@@ -3,7 +3,6 @@
  @brief ENet host management functions
 */
 #define ENET_BUILDING_LIB 1
-#define __MINGW_USE_VC2005_COMPAT 1
 #include <string.h>
 #include <time.h>
 #include "enet/enet.h"
@@ -76,7 +75,12 @@ enet_host_create (const ENetAddress * address, size_t peerCount, size_t channelL
     if (channelLimit < ENET_PROTOCOL_MINIMUM_CHANNEL_COUNT)
       channelLimit = ENET_PROTOCOL_MINIMUM_CHANNEL_COUNT;
 
-    host -> randomSeed = (enet_uint32) time(NULL) + (enet_uint32) (size_t) host;
+    host -> randomSeed = (enet_uint32) (size_t) host;
+#ifdef WIN32
+    host -> randomSeed += (enet_uint32) timeGetTime();
+#else
+    host -> randomSeed += (enet_uint32) time(NULL);
+#endif
     host -> randomSeed = (host -> randomSeed << 16) | (host -> randomSeed >> 16);
     host -> channelLimit = channelLimit;
     host -> incomingBandwidth = incomingBandwidth;
diff --git a/source/lib/enet.lib b/source/lib/enet.lib
index 92009bf94fb175b75748d431f8c03c047fcf69fd..0af1d82c82cc61be637e2a1146877201e0a9ea10 100644
GIT binary patch
delta 917
zcmaF$km<uirU^1^CZ;A9hK3WBGVAX#FqorZt2GP^$k<Vgfq@!0xrBiM8PA!*z~BZV
zD94)v7(cOsd}VHFG5LU%*ycEPGiGG|2Cg|$5WXcyp2fu6(0Fo=>PGSPObiUiSyU!y
zFfhDe0D{&7orn2bW==Lyvtax>Iaf_fc0W)>>s$U7TOi$;qr%e3q5@UP-!WzK7PWTf
z&S;s*PU;`o<^uJ1ewgf_v6QWM8_2N9Pc_mRA58Yu)ZmHv|NlQkuy_CF8qFUZ^$v^-
z41z#KYz)#slO=&H5rz~vs|e0&fV2AGtT}MjDmZHgkR=5+<qMD{0cP<r!&n+{mJ@^}
z0kkd*$dm>vOa!uIz^v@e+{V8dh0g#vFaR_T2yRc7G*zyD1ruaYV1S5!#}MHL`V0bK
zYGg4)Off{<Fhs&JL~_C~gvv2QW@3n}#1PqsB64=JpxNHZ3F}2CKbyh7_>CDOQc~H>
zVX=t`%HMpzDuoTiwlFXNCo=~}e??|fQ?tqUW{6LIW5zjoQ_=;5y!ht%$;-_Ve6h_*
SvmL-@TNoIE_3xXbBLV<A;j9b*

delta 892
zcmezHkm=P!rU^1^Mn)#)29^_*GV5<JFqorZt7Qxf$k<VUfq@!0Igfz>8PDlsU~mHw
zl;h0-jGtIRzB02knQY)FwmFX7j2W4~foqNwgl`IxX90TOd~%NJM)6%t3=GFvR3>OJ
zFuY&@g4P3_hxuEUOg2%oVEi>XS4~Uy2v9}qTmBX&Al;dx!qUm20#(W1F>~@3wRU!(
zevsD5cIqE_mjD@^A9}Z_fkjL;mQH@4k<NH~vWKPyd(!{^|A8`_Yczjw)VnY;FbDz_
zu`$R44VDD5L>ThntXep$8_t>uXDx@bw!&G5fh;MoDL;WM2{22T8OG9uv)myp37~b+
zK&CWUVH%Jn17;O$<~IJ#D0~dafdQa#KyY=kq^WZ16PO@_0s}<+BZdeo&}R?;QzMQc
zqK_fsfDoC?Jxww^4Z(-nREQxm8AD_-hR6;Sk>isE&Gxd#mt^Lqnwf0AZ6?l$lqxp!
zS!`lL=HIdMV}tO`HXAsmDl(f{8c)7$rZ9O&(gldPIXJZ~NnT-&%+HwZ05umPe`Jo1
F2mnU#qdNcq