Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/features/pedcols.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using namespace plugin;

#define RwRGBAGetRGB(a) (*(DWORD *)&(a) & 0xFFFFFF)
std::unordered_map<CPed*, std::vector<std::pair<void *, int>>> store;

void PedColors::SetEditableMaterials(RpClump *pClump) {
RpClumpForAllAtomics(pClump, [](RpAtomic * pAtomic, void *data) {
Expand All @@ -35,7 +34,7 @@ void PedColors::SetEditableMaterials(RpClump *pClump) {
default:
return pMaterial;
}
store[PedColors::m_pCurrentPed].push_back(std::make_pair(&pMaterial->color, *reinterpret_cast<int *>(&pMaterial->color)));
data.m_OriginalColors.push_back(std::make_pair(&pMaterial->color, *reinterpret_cast<int *>(&pMaterial->color)));
pMaterial->color.red = data.m_Colors[idx].r;
pMaterial->color.green = data.m_Colors[idx].g;
pMaterial->color.blue = data.m_Colors[idx].b;
Comment on lines 34 to 40
Expand Down Expand Up @@ -105,9 +104,10 @@ void PedColors::Init() {
};

Events::pedRenderEvent.after += [](CPed *pPed) {
for (auto &e : store[pPed]) {
auto &data = PedColors::m_PedData.Get(pPed);
for (auto &e : data.m_OriginalColors) {
*static_cast<int *>(e.first) = e.second;
}
store[pPed].clear();
data.m_OriginalColors.clear();
Comment on lines +107 to +111
};
}
1 change: 1 addition & 0 deletions src/features/pedcols.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class PedData {
public:
std::vector<RpMaterial*> materials;
std::vector<CRGBA> m_Colors;
std::vector<std::pair<void *, int>> m_OriginalColors;
bool m_bUsingPedCols = false;
Comment on lines 15 to 18
bool m_bInitialized = false;
int randId = -1;
Expand Down
Loading