backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-11 03:47:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

some fixes

Browse source
This commit is contained in:
Mohamed Ashraf 2026-03-03 19:52:54 +04:00
parent 8fc68f1f3e
commit 4cfbb320e5
6 changed files with 15 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Minecraft.Client/Common/DLC/DLCSkinFile.cpp
View file

@ -114,12 +114,8 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, const wstring
SKIN_BOX *pSkinBox = new SKIN_BOX;
ZeroMemory(pSkinBox,sizeof(SKIN_BOX));
#ifdef __PS3__
// 4J Stu - The Xbox version used swscanf_s which isn't available in GCC.
swscanf(value.c_str(), L"%10ls%f%f%f%f%f%f%f%f", wchBodyPart,
#else
swscanf_s(value.c_str(), L"%9ls%f%f%f%f%f%f%f%f", wchBodyPart,10,
#endif
&pSkinBox->fX,
&pSkinBox->fY,
&pSkinBox->fZ,
@ -159,12 +155,8 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, const wstring
}
break;
case DLCManager::e_DLCParamType_Anim:
#ifdef __PS3__
// 4J Stu - The Xbox version used swscanf_s which isn't available in GCC.
swscanf(value.c_str(), L"%X", &m_uiAnimOverrideBitmask);
#else
swscanf_s(value.c_str(), L"%X", &m_uiAnimOverrideBitmask,sizeof(unsigned int));
#endif
DWORD skinId = app.getSkinIdFromPath(m_path);
app.SetAnimOverrideBitmask(skinId, m_uiAnimOverrideBitmask);
break;

14
Minecraft.Client/Common/Network/GameNetworkManager.cpp
View file

@ -40,6 +40,8 @@
#include "../Minecraft.World/DurangoStats.h"
#endif
#define WAIT_TIMEOUT 258
// Global instance
CGameNetworkManager g_NetworkManager;
CPlatformNetworkManager *CGameNetworkManager::s_pPlatformNetworkManager;
@ -878,7 +880,7 @@ int CGameNetworkManager::ServerThreadProc( void* lpParameter )
if(lpParameter != NULL) delete lpParameter;
return S_OK;
return 0;
}
int CGameNetworkManager::ExitAndJoinFromInviteThreadProc( void* lpParam )
@ -918,7 +920,7 @@ int CGameNetworkManager::ExitAndJoinFromInviteThreadProc( void* lpParam )
}
#endif
return S_OK;
return 0;
}
#if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__
@ -1095,7 +1097,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)TRUE);
// wait for the server to be in a non-ticking state
pServer->m_serverPausedEvent->WaitForSignal(INFINITE);
pServer->m_serverPausedEvent->WaitForSignal(INFINITY);
#if defined(__PS3__) || defined(__ORBIS__) || defined __PSVITA__
// Swap these two messages around as one is too long to display at 480
@ -1245,7 +1247,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
app.SetChangingSessionType(false);
app.SetReallyChangingSessionType(false);
return S_OK;
return 0;
}
@ -1904,7 +1906,7 @@ void CGameNetworkManager::ServerReady()
void CGameNetworkManager::ServerReadyWait()
{
m_hServerReadyEvent->WaitForSignal(INFINITE);
m_hServerReadyEvent->WaitForSignal(INFINITY);
}
void CGameNetworkManager::ServerReadyDestroy()
@ -1954,7 +1956,7 @@ void CGameNetworkManager::ServerStoppedWait()
}
else
{
m_hServerStoppedEvent->WaitForSignal(INFINITE);
m_hServerStoppedEvent->WaitForSignal(INFINITY);
}
}

8
Minecraft.Client/Common/Telemetry/TelemetryManager.cpp
View file

@ -16,17 +16,17 @@ CTelemetryManager *TelemetryManager = new CTelemetryManager();
HRESULT CTelemetryManager::Init()
{
return S_OK;
return 0;
}
HRESULT CTelemetryManager::Tick()
{
return S_OK;
return 0;
}
HRESULT CTelemetryManager::Flush()
{
return S_OK;
return 0;
}
bool CTelemetryManager::RecordPlayerSessionStart(int iPad)
@ -447,4 +447,4 @@ INT CTelemetryManager::GetLevelExitProgressStat2()
{
// 4J Stu - Unused
return 0;
}
}

70
Minecraft.Client/Common/Telemetry/TelemetryManager.h
View file

@ -1,76 +1,8 @@
#pragma once
#include "../../Windows64/Sentient/TelemetryEnum.h"
#include "../../Common/UI/UIEnums.h"
enum ETelemetryChallenges
{
eTelemetryChallenges_Unknown = 0,
eTelemetryTutorial_TrialStart,
eTelemetryTutorial_Halfway,
eTelemetryTutorial_Complete,
eTelemetryTutorial_Inventory,
eTelemetryTutorial_Crafting,
eTelemetryTutorial_Furnace,
eTelemetryTutorial_Fishing,
eTelemetryTutorial_Minecart,
eTelemetryTutorial_Boat,
eTelemetryTutorial_Bed,
eTelemetryTutorial_Redstone_And_Pistons,
eTelemetryTutorial_Portal,
eTelemetryTutorial_FoodBar,
eTelemetryTutorial_CreativeMode,
eTelemetryTutorial_BrewingMenu,
eTelemetryInGame_Ride_Minecart,
eTelemetryInGame_Ride_Boat,
eTelemetryInGame_Ride_Pig,
eTelemetryInGame_UseBed,
eTelemetryTutorial_CreativeInventory, // Added TU5
eTelemetryTutorial_EnchantingMenu,
eTelemetryTutorial_Brewing,
eTelemetryTutorial_Enchanting,
eTelemetryTutorial_Farming,
eTelemetryPlayerDeathSource_Fall,
eTelemetryPlayerDeathSource_Lava,
eTelemetryPlayerDeathSource_Fire,
eTelemetryPlayerDeathSource_Water,
eTelemetryPlayerDeathSource_Suffocate,
eTelemetryPlayerDeathSource_OutOfWorld,
eTelemetryPlayerDeathSource_Cactus,
eTelemetryPlayerDeathSource_Player_Weapon,
eTelemetryPlayerDeathSource_Player_Arrow,
eTelemetryPlayerDeathSource_Explosion_Tnt,
eTelemetryPlayerDeathSource_Explosion_Creeper,
eTelemetryPlayerDeathSource_Wolf,
eTelemetryPlayerDeathSource_Zombie,
eTelemetryPlayerDeathSource_Skeleton,
eTelemetryPlayerDeathSource_Spider,
eTelemetryPlayerDeathSource_Slime,
eTelemetryPlayerDeathSource_Ghast,
eTelemetryPlayerDeathSource_ZombiePigman,
eTelemetryTutorial_Breeding,
eTelemetryTutorial_Golem,
eTelemetryTutorial_Anvil, // Added TU14
eTelemetryTutorial_AnvilMenu,
eTelemetryTutorial_Trading,
eTelemetryTutorial_TradingMenu,
eTelemetryTutorial_Enderchest,
// Sent over network as a byte
};
class CTelemetryManager
{
public:

1
Minecraft.Client/Linux/LinuxStubs.h
View file

@ -101,6 +101,7 @@ typedef float FLOAT;
#define OPEN_EXISTING 3
#define OPEN_ALWAYS 4
#define TRUNCATE_EXISTING 5
#define WAIT_TIMEOUT 258
#define FILE_ATTRIBUTE_READONLY 0x00000001
#define FILE_ATTRIBUTE_HIDDEN 0x00000002

2
Minecraft.Client/StringTable.cpp
View file

@ -1,4 +1,4 @@
#include "StdAfx.h"
#include "stdafx.h"
#include "StringTable.h"
StringTable::StringTable(void)