forked from cafeberry/cafeberry
attempt at trying to get XB360 to work
This commit is contained in:
@@ -255,7 +255,7 @@ bool Connection::writeTick()
|
||||
// 4J Stu - Changed this so that rather than writing to the network stream through a buffered stream we want to:
|
||||
// a) Only push whole "game" packets to QNet, rather than amalgamated chunks of data that may include many packets, and partial packets
|
||||
// b) To be able to change the priority and queue of a packet if required
|
||||
#ifdef _XBOX
|
||||
#if defined _XBOX && !defined _DISABLE_XBLIVE
|
||||
int flags = QNET_SENDDATA_LOW_PRIORITY | QNET_SENDDATA_SECONDARY;
|
||||
#else
|
||||
int flags = NON_QNET_SENDDATA_ACK_REQUIRED;
|
||||
|
||||
@@ -589,6 +589,7 @@
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
|
||||
<OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
|
||||
<IncludePath>$(Xbox360TechPreviewInclude);$(XDKInstallDir)\include\xbox;</IncludePath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">
|
||||
<OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
|
||||
@@ -884,7 +885,7 @@
|
||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||
<PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;NDEBUG;_XBOX;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>_DISABLE_XBLIVE;_ITERATOR_DEBUG_LEVEL=0;NDEBUG;_XBOX;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeTypeInfo>true</RuntimeTypeInfo>
|
||||
<ShowIncludes>false</ShowIncludes>
|
||||
<UseFullPaths>false</UseFullPaths>
|
||||
@@ -2589,7 +2590,9 @@
|
||||
<ClInclude Include="WoolCarpetTile.h" />
|
||||
<ClInclude Include="WorldlyContainer.h" />
|
||||
<ClInclude Include="WrittenBookItem.h" />
|
||||
<ClInclude Include="x64headers\extraX64.h" />
|
||||
<ClInclude Include="x64headers\extraX64.h">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">false</ExcludedFromBuild>
|
||||
</ClInclude>
|
||||
<ClInclude Include="x64headers\qnet.h" />
|
||||
<ClInclude Include="x64headers\xmcore.h" />
|
||||
<ClInclude Include="x64headers\xrnm.h" />
|
||||
|
||||
@@ -2,7 +2,9 @@
|
||||
#include "net.minecraft.world.entity.player.h"
|
||||
#include "..\Minecraft.Client\ServerPlayer.h"
|
||||
#include "..\Minecraft.Client\PlayerConnection.h"
|
||||
#ifndef _DISABLE_XBLIVE
|
||||
#include <qnet.h>
|
||||
#endif
|
||||
#include "PacketListener.h"
|
||||
#include "InputOutputStream.h"
|
||||
#include "PlayerInfoPacket.h"
|
||||
|
||||
@@ -500,7 +500,7 @@ void Socket::SocketOutputStreamNetwork::writeWithFlags(byteArray b, unsigned int
|
||||
return;
|
||||
}
|
||||
|
||||
#ifdef _XBOX
|
||||
#if defined _XBOX && !defined _DISABLE_XBLIVE
|
||||
bool lowPriority = ( ( flags & QNET_SENDDATA_LOW_PRIORITY ) == QNET_SENDDATA_LOW_PRIORITY );
|
||||
bool requireAck = lowPriority;
|
||||
#else
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
#pragma once
|
||||
#include <xrnm.h>
|
||||
#include <queue>
|
||||
#ifndef _DISABLE_XBLIVE
|
||||
#include <qnet.h>
|
||||
#endif
|
||||
#include "InputStream.h"
|
||||
#include "OutputStream.h"
|
||||
|
||||
|
||||
@@ -53,10 +53,17 @@ using namespace DirectX;
|
||||
#include <xboxmath.h>
|
||||
#include <xuiapp.h>
|
||||
#include <xact3.h>
|
||||
#ifdef _DISABLE_XBLIVE
|
||||
typedef ULONGLONG PlayerUID;
|
||||
typedef ULONGLONG SessionID;
|
||||
typedef PlayerUID GameSessionUID;
|
||||
class INVITE_INFO;
|
||||
#else
|
||||
typedef XINVITE_INFO INVITE_INFO;
|
||||
typedef XUID PlayerUID;
|
||||
typedef XNKID SessionID;
|
||||
typedef XUID GameSessionUID;
|
||||
#endif // _DISABLE_XBLIVE
|
||||
#endif
|
||||
|
||||
#ifdef __PS3__
|
||||
|
||||
Reference in New Issue
Block a user