backups/LCEMP
2
0
Fork 0
mirror of https://github.com/LCEMP/LCEMP.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

change define name

Browse source
This commit is contained in:
NOTPIES 2026-03-08 22:19:39 -03:00
parent 6e2afbde93
commit 09000cc4a1
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Minecraft.Client/Common/Consoles_App.cpp
View file

@ -242,7 +242,7 @@ void CMinecraftApp::DebugPrintf(const char *szFormat, ...)
vsnprintf(buf, sizeof(buf), szFormat, ap); vsnprintf(buf, sizeof(buf), szFormat, ap);
va_end(ap); va_end(ap);
OutputDebugStringA(buf); OutputDebugStringA(buf);
#ifdef _DEDICATED_SERVER #ifdef WITH_SERVER_CODE
bool hasContent = false; bool hasContent = false;
for (const char *p = buf; *p; p++) { for (const char *p = buf; *p; p++) {
if (*p != ' ' && *p != '\t' && *p != '\n' && *p != '\r' && *p != '=') { if (*p != ' ' && *p != '\t' && *p != '\n' && *p != '\r' && *p != '=') {
@ -324,7 +324,7 @@ LPCWSTR CMinecraftApp::GetString(int iID)
{ {
//return L"Değişiklikler ve Yenilikler"; //return L"Değişiklikler ve Yenilikler";
//return L"ÕÕÕÕÖÖÖÖ"; //return L"ÕÕÕÕÖÖÖÖ";
#ifdef _DEDICATED_SERVER #ifdef WITH_SERVER_CODE
if (!app.m_stringTable) return L""; if (!app.m_stringTable) return L"";
#endif #endif
return app.m_stringTable->getString(iID); return app.m_stringTable->getString(iID);

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

@ -790,7 +790,7 @@ int CGameNetworkManager::JoinFromInvite_SignInReturned(void *pParam,bool bContin
void CGameNetworkManager::UpdateAndSetGameSessionData(INetworkPlayer *pNetworkPlayerLeaving) void CGameNetworkManager::UpdateAndSetGameSessionData(INetworkPlayer *pNetworkPlayerLeaving)
{ {
#ifndef _DEDICATED_SERVER #ifndef WITH_SERVER_CODE
Minecraft *pMinecraft = Minecraft::GetInstance(); Minecraft *pMinecraft = Minecraft::GetInstance();
TexturePack *tPack = pMinecraft->skins->getSelected(); TexturePack *tPack = pMinecraft->skins->getSelected();
s_pPlatformNetworkManager->SetSessionTexturePackParentId( tPack->getDLCParentPackId() ); s_pPlatformNetworkManager->SetSessionTexturePackParentId( tPack->getDLCParentPackId() );

4
Minecraft.Client/Minecraft.cpp
View file

@ -5046,7 +5046,7 @@ void Minecraft::handleClientTextureReceived(const wstring &textureName)
unsigned int Minecraft::getCurrentTexturePackId() unsigned int Minecraft::getCurrentTexturePackId()
{ {
#ifdef _DEDICATED_SERVER #ifdef WITH_SERVER_CODE
return 0; return 0;
#else #else
return skins->getSelected()->getId(); return skins->getSelected()->getId();
@ -5055,7 +5055,7 @@ unsigned int Minecraft::getCurrentTexturePackId()
ColourTable *Minecraft::getColourTable() ColourTable *Minecraft::getColourTable()
{ {
#ifdef _DEDICATED_SERVER #ifdef WITH_SERVER_CODE
return NULL; return NULL;
#else #else
TexturePack *selected = skins->getSelected(); TexturePack *selected = skins->getSelected();

10
Minecraft.Client/MinecraftServer.cpp
View file

@ -50,7 +50,7 @@
#include "PS3\PS3Extras\ShutdownManager.h" #include "PS3\PS3Extras\ShutdownManager.h"
#include "ServerCommandDispatcher.h" #include "ServerCommandDispatcher.h"
#ifdef _DEDICATED_SERVER #ifdef WITH_SERVER_CODE
#include "..\Minecraft.Server\ServerCommands.h" #include "..\Minecraft.Server\ServerCommands.h"
#endif #endif
@ -275,7 +275,7 @@ bool MinecraftServer::initServer(__int64 seed, NetworkGameInitData *initData, DW
g_NetworkManager.ServerReady(); // 4J added g_NetworkManager.ServerReady(); // 4J added
#ifdef _DEDICATED_SERVER #ifdef WITH_SERVER_CODE
{ {
extern QNET_STATE _iQNetStubState; extern QNET_STATE _iQNetStubState;
_iQNetStubState = QNET_STATE_GAME_PLAY; _iQNetStubState = QNET_STATE_GAME_PLAY;
@ -1087,7 +1087,7 @@ void MinecraftServer::run(__int64 seed, void *lpParameter)
} }
} }
#ifdef _DEDICATED_SERVER #ifdef WITH_SERVER_CODE
{ {
__int64 doneTime = System::currentTimeMillis(); __int64 doneTime = System::currentTimeMillis();
app.DebugPrintf("Done! For help, type \"help\" or \"?\""); app.DebugPrintf("Done! For help, type \"help\" or \"?\"");
@ -1546,7 +1546,7 @@ void MinecraftServer::tick()
} }
Entity::tickExtraWandering(); // 4J added Entity::tickExtraWandering(); // 4J added
#ifdef _DEDICATED_SERVER #ifdef WITH_SERVER_CODE
g_NetworkManager.DoWork(); g_NetworkManager.DoWork();
WinsockNetLayer::FlushPendingData(); WinsockNetLayer::FlushPendingData();
#endif #endif
@ -1584,7 +1584,7 @@ void MinecraftServer::handleConsoleInputs()
AUTO_VAR(it, consoleInput.begin()); AUTO_VAR(it, consoleInput.begin());
ConsoleInput *input = *it; ConsoleInput *input = *it;
consoleInput.erase(it); consoleInput.erase(it);
#ifdef _DEDICATED_SERVER #ifdef WITH_SERVER_CODE
HandleServerCommand(input->msg, input->source, this); HandleServerCommand(input->msg, input->source, this);
delete input; delete input;
#else #else

4
Minecraft.Client/PlayerConnection.cpp
View file

@ -130,14 +130,14 @@ void PlayerConnection::disconnect(DisconnectPacket::eDisconnectReason reason)
if(getWasKicked()) if(getWasKicked())
{ {
server->getPlayers()->broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(player->name, ChatPacket::e_ChatPlayerKickedFromGame) ) ); server->getPlayers()->broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(player->name, ChatPacket::e_ChatPlayerKickedFromGame) ) );
#ifdef _DEDICATED_SERVER #ifdef WITH_SERVER_CODE
app.DebugPrintf("%ls was kicked from the game", player->name.c_str()); app.DebugPrintf("%ls was kicked from the game", player->name.c_str());
#endif #endif
} }
else else
{ {
server->getPlayers()->broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(player->name, ChatPacket::e_ChatPlayerLeftGame) ) ); server->getPlayers()->broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(player->name, ChatPacket::e_ChatPlayerLeftGame) ) );
#ifdef _DEDICATED_SERVER #ifdef WITH_SERVER_CODE
app.DebugPrintf("%ls left the game", player->name.c_str()); app.DebugPrintf("%ls left the game", player->name.c_str());
#endif #endif
} }

2
Minecraft.Client/PlayerList.cpp
View file

@ -236,7 +236,7 @@ void PlayerList::placeNewPlayer(Connection *connection, shared_ptr<ServerPlayer>
//server->players->broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(L"<22>e" + playerEntity->name + L" joined the game.") ) ); //server->players->broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(L"<22>e" + playerEntity->name + L" joined the game.") ) );
broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(player->name, ChatPacket::e_ChatPlayerJoinedGame) ) ); broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(player->name, ChatPacket::e_ChatPlayerJoinedGame) ) );
#ifdef _DEDICATED_SERVER #ifdef WITH_SERVER_CODE
app.DebugPrintf("%ls joined the game", player->name.c_str()); app.DebugPrintf("%ls joined the game", player->name.c_str());
#endif #endif

2
Minecraft.Client/ServerLevel.cpp
View file

@ -922,7 +922,7 @@ void ServerLevel::saveToDisc(ProgressListener *progressListener, bool autosave)
// 4J-PB - check that saves are enabled // 4J-PB - check that saves are enabled
if(StorageManager.GetSaveDisabled()) return; if(StorageManager.GetSaveDisabled()) return;
#ifndef _DEDICATED_SERVER #ifndef WITH_SERVER_CODE
// Check if we are using a trial version of a texture pack (which will be the case for going into the mash-up pack world with a trial version) // Check if we are using a trial version of a texture pack (which will be the case for going into the mash-up pack world with a trial version)
if(!Minecraft::GetInstance()->skins->isUsingDefaultSkin()) if(!Minecraft::GetInstance()->skins->isUsingDefaultSkin())
{ {