RunUO 2.4 will be the latest release supporting the 2.0 .NET Framework.

Framework_4_0 preprocessors have been removed. ScriptCompiler will set Framework_4_0 as legacy.
This commit is contained in:
Mark Sturgill 2013-10-30 11:28:34 -07:00
parent 951f8b7d01
commit e67faba4d8
20 changed files with 43 additions and 623 deletions

View file

@ -23,10 +23,8 @@ using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Text;
#if Framework_4_0
using System.Linq;
using System.Threading.Tasks;
#endif
using Server;
using Server.Accounting;
using Server.Commands;
@ -10061,18 +10059,7 @@ namespace Server
sendFacialHair = true;
}
#if Framework_4_0
Packet[][] cache = new Packet[2][] { new Packet[8], new Packet[8] };
#else
Packet[][] cache = m_MovingPacketCache;
/*if( sendMoving || sendNonlocalMoving || sendHealthbarPoison || sendHealthbarYellow )
{
for( int i = 0; i < cache.Length; ++i )
for( int j = 0; j < cache[i].Length; ++j )
Packet.Release( ref cache[i][j] );
}*/
#endif
NetState ourState = m.m_NetState;
@ -10322,7 +10309,6 @@ namespace Server
public static void ProcessDeltaQueue()
{
#if Framework_4_0
_processing = true;
if (m_DeltaQueue.Count >= 512) {
@ -10335,13 +10321,6 @@ namespace Server
_processing = false;
while (m_DeltaQueueR.Count > 0) m_DeltaQueueR.Dequeue().ProcessDelta();
#else
int count = m_DeltaQueue.Count;
int index = 0;
while (m_DeltaQueue.Count > 0 && index++ < count)
m_DeltaQueue.Dequeue().ProcessDelta();
#endif
}
[CommandProperty( AccessLevel.Counselor, AccessLevel.GameMaster )]