feat: TU19 (Dec 2014) Features & Content (#155)

* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a4399472.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
daoge
2026-03-03 03:04:10 +08:00
committed by GitHub
parent 84c31a2331
commit b3feddfef3
2069 changed files with 264842 additions and 139522 deletions

View File

@@ -5,6 +5,11 @@
class MapItemSavedData : public SavedData
{
private:
static const int HEADER_COLOURS = 0;
static const int HEADER_DECORATIONS = 1;
static const int HEADER_METADATA = 2;
public:
static const int MAP_SIZE = 64;
static const int MAX_SCALE = 4;
@@ -37,6 +42,12 @@ public:
int sendPosTick;
charArray lastSentDecorations;
public:
int step;
private:
bool hasSentInitial;
protected:
const MapItemSavedData *parent;
@@ -52,10 +63,10 @@ public:
char dimension;
byte scale;
byteArray colors;
int step;
vector<shared_ptr<HoldingPlayer> > carriedBy;
private:
typedef unordered_map<shared_ptr<Player> , shared_ptr<HoldingPlayer> , PlayerKeyHash, PlayerKeyEq> playerHoldingPlayerMapType;
playerHoldingPlayerMapType carriedByPlayers;
@@ -82,6 +93,7 @@ public:
using SavedData::setDirty;
void setDirty(int x, int y0, int y1);
void handleComplexItemData(charArray &data);
shared_ptr<HoldingPlayer> getHoldingPlayer(shared_ptr<Player> player);
// 4J Stu Added
void mergeInMapData(shared_ptr<MapItemSavedData> dataToAdd);