diff options
| author | void_17 <heroerror3@gmail.com> | 2026-03-02 17:37:16 +0700 |
|---|---|---|
| committer | void_17 <heroerror3@gmail.com> | 2026-03-02 17:37:16 +0700 |
| commit | 119bff351450ea16ffda550b6e0f67379b29f708 (patch) | |
| tree | d9f28714afd516bc2450f33b0a77c5e05ff4de90 /Minecraft.Client/GameMode.cpp | |
| parent | 8a2a62ea1d47364f802cf9aae97668bc4a7007b5 (diff) | |
Revert "shared_ptr -> std::shared_ptr"
This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.
Diffstat (limited to 'Minecraft.Client/GameMode.cpp')
| -rw-r--r-- | Minecraft.Client/GameMode.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/Minecraft.Client/GameMode.cpp b/Minecraft.Client/GameMode.cpp index 975f81f8..a11d6c07 100644 --- a/Minecraft.Client/GameMode.cpp +++ b/Minecraft.Client/GameMode.cpp @@ -46,11 +46,11 @@ void GameMode::render(float a) { } -bool GameMode::useItem(std::shared_ptr<Player> player, Level *level, std::shared_ptr<ItemInstance> item, bool bTestUseOnly) +bool GameMode::useItem(shared_ptr<Player> player, Level *level, shared_ptr<ItemInstance> item, bool bTestUseOnly) { } -void GameMode::initPlayer(std::shared_ptr<Player> player) +void GameMode::initPlayer(shared_ptr<Player> player) { } @@ -58,11 +58,11 @@ void GameMode::tick() { } -void GameMode::adjustPlayer(std::shared_ptr<Player> player) +void GameMode::adjustPlayer(shared_ptr<Player> player) { } -//bool GameMode::useItemOn(std::shared_ptr<Player> player, Level *level, std::shared_ptr<ItemInstance> item, int x, int y, int z, int face, bool bTestUseOnOnly) +//bool GameMode::useItemOn(shared_ptr<Player> player, Level *level, shared_ptr<ItemInstance> item, int x, int y, int z, int face, bool bTestUseOnOnly) //{ // // 4J-PB - Adding a test only version to allow tooltips to be displayed // int t = level->getTile(x, y, z); @@ -72,9 +72,9 @@ void GameMode::adjustPlayer(std::shared_ptr<Player> player) // { // switch(t) // { -// case Tile::recordPlayer_Id: +// case Tile::recordPlayer_Id: // case Tile::bed_Id: // special case for a bed -// if (Tile::tiles[t]->TestUse(level, x, y, z, player )) +// if (Tile::tiles[t]->TestUse(level, x, y, z, player )) // { // return true; // } @@ -89,38 +89,38 @@ void GameMode::adjustPlayer(std::shared_ptr<Player> player) // break; // } // } -// else +// else // { // if (Tile::tiles[t]->use(level, x, y, z, player )) return true; // } // } -// +// // if (item == NULL) return false; // return item->useOn(player, level, x, y, z, face, bTestUseOnOnly); //} -std::shared_ptr<Player> GameMode::createPlayer(Level *level) +shared_ptr<Player> GameMode::createPlayer(Level *level) { - return std::shared_ptr<Player>( new LocalPlayer(minecraft, level, minecraft->user, level->dimension->id) ); + return shared_ptr<Player>( new LocalPlayer(minecraft, level, minecraft->user, level->dimension->id) ); } -bool GameMode::interact(std::shared_ptr<Player> player, std::shared_ptr<Entity> entity) +bool GameMode::interact(shared_ptr<Player> player, shared_ptr<Entity> entity) { return player->interact(entity); } -void GameMode::attack(std::shared_ptr<Player> player, std::shared_ptr<Entity> entity) +void GameMode::attack(shared_ptr<Player> player, shared_ptr<Entity> entity) { player->attack(entity); } -std::shared_ptr<ItemInstance> GameMode::handleInventoryMouseClick(int containerId, int slotNum, int buttonNum, bool quickKeyHeld, std::shared_ptr<Player> player) +shared_ptr<ItemInstance> GameMode::handleInventoryMouseClick(int containerId, int slotNum, int buttonNum, bool quickKeyHeld, shared_ptr<Player> player) { return nullptr; } -void GameMode::handleCloseInventory(int containerId, std::shared_ptr<Player> player) +void GameMode::handleCloseInventory(int containerId, shared_ptr<Player> player) { player->containerMenu->removed(player); delete player->containerMenu; @@ -137,7 +137,7 @@ bool GameMode::isCutScene() return false; } -void GameMode::releaseUsingItem(std::shared_ptr<Player> player) +void GameMode::releaseUsingItem(shared_ptr<Player> player) { player->releaseUsingItem(); } @@ -162,21 +162,21 @@ bool GameMode::hasFarPickRange() return false; } -void GameMode::handleCreativeModeItemAdd(std::shared_ptr<ItemInstance> clicked, int i) +void GameMode::handleCreativeModeItemAdd(shared_ptr<ItemInstance> clicked, int i) { } -void GameMode::handleCreativeModeItemDrop(std::shared_ptr<ItemInstance> clicked) +void GameMode::handleCreativeModeItemDrop(shared_ptr<ItemInstance> clicked) { } -bool GameMode::handleCraftItem(int recipe, std::shared_ptr<Player> player) +bool GameMode::handleCraftItem(int recipe, shared_ptr<Player> player) { return true; } // 4J-PB -void GameMode::handleDebugOptions(unsigned int uiVal, std::shared_ptr<Player> player) +void GameMode::handleDebugOptions(unsigned int uiVal, shared_ptr<Player> player) { player->SetDebugOptions(uiVal); } |
