more build fixes

This commit is contained in:
Tropical 2026-03-22 01:14:52 -05:00
parent 195d82340a
commit 6c92bc0be8
7 changed files with 9 additions and 9 deletions

View file

@ -115,7 +115,7 @@ private:
bool render); bool render);
float tesselateAnvilPiece(AnvilTile* tt, int x, int y, int z, int part, float tesselateAnvilPiece(AnvilTile* tt, int x, int y, int z, int part,
float bottom, float width, float height, float bottom, float width, float height,
float length, bool std::rotate, bool render, float length, bool rotate, bool render,
int data); int data);
public: public:

View file

@ -260,7 +260,8 @@ LevelData* DirectoryLevelStorage::prepareLevel() {
} else } else
#endif #endif
{ {
getSaveFile()->setFilePointer(fileEntry, 0, NULL, FILE_BEGIN); getSaveFile()->setFilePointer(fileEntry, 0,
SaveFileSeekOrigin::Begin);
#ifdef _LARGE_WORLDS #ifdef _LARGE_WORLDS
byteArray data(fileEntry->getFileSize()); byteArray data(fileEntry->getFileSize());

View file

@ -288,6 +288,8 @@ bool Connection::writeTick() {
Packet::writePacket(packet, bufferedDos); Packet::writePacket(packet, bufferedDos);
} }
#endif
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
// 4J Added for debugging // 4J Added for debugging
if (!socket->isLocal()) { if (!socket->isLocal()) {

View file

@ -51,7 +51,7 @@ void ContainerClickPacket::write(DataOutputStream* dos) // throws IOException
dos->writeShort(slotNum); dos->writeShort(slotNum);
dos->writeByte((uint8_t)buttonNum); dos->writeByte((uint8_t)buttonNum);
dos->writeShort(uid); dos->writeShort(uid);
dos->writeBoolean(quickKey); dos->writeBoolean(clickType);
writeItem(item, dos); writeItem(item, dos);
} }

View file

@ -52,9 +52,9 @@ public:
// 4J-PB // 4J-PB
virtual bool virtual bool
prerequisite(int iRecipe) requiresRecipe(int iRecipe)
= 0; = 0;
virtual void virtual void
prerequisite(INGREDIENTS_REQUIRED* pIngReq) collectRequirements(INGREDIENTS_REQUIRED* pIngReq)
= 0; = 0;
}; };

View file

@ -76,10 +76,6 @@ Achievement::Achievement(int id, const std::wstring& name, int x, int y,
y(y), y(y),
prerequisite(prerequisite) {} prerequisite(prerequisite) {}
int Achievement::getAchievementID() {
return id - Achievements::ACHIEVEMENT_OFFSET;
}
/** /**
* @brief Marks the achievement as locally awarded only. * @brief Marks the achievement as locally awarded only.
* @return self * @return self

View file

@ -3,6 +3,7 @@
class Language { class Language {
private: private:
static Language* singleton; static Language* singleton;
std::unordered_map<std::wstring, std::wstring> translateTable;
public: public:
Language(); Language();