Merge remote-tracking branch 'isle/master'

LEGO1/define.cpp

@@ -10,6 +10,7 @@ const char* g_strANIMATION = "ANIMATION";
 
 // GLOBAL: LEGO1 0x10102050
 // STRING: LEGO1 0x10102024
+// GLOBAL: BETA10 0x102028b4
 const char* g_strATTACH_CAMERA = "ATTACH_CAMERA";
 
 // GLOBAL: LEGO1 0x10102054
@@ -138,6 +139,7 @@ const char* g_strBMP_ISMAP = "BMP_ISMAP";
 
 // GLOBAL: LEGO1 0x101020e4
 // STRING: LEGO1 0x10101eac
+// GLOBAL: BETA10 0x10202948
 const char* g_parseExtraTokens = ":;";
 
 // GLOBAL: LEGO1 0x100f0c14

LEGO1/lego/legoomni/include/legoactor.h

@@ -34,6 +34,7 @@ public:
 	}
 
 	// FUNCTION: LEGO1 0x1002d220
+	// FUNCTION: BETA10 0x10012530
 	MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, LegoActor::ClassName()) || LegoEntity::IsA(p_name);
@@ -43,18 +44,22 @@ public:
 	void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) override; // vtable+0x24
 
 	// FUNCTION: LEGO1 0x10002cc0
+	// FUNCTION: BETA10 0x1000f3e0
 	virtual MxFloat GetSoundFrequencyFactor() { return m_frequencyFactor; } // vtable+0x50
 
 	// FUNCTION: LEGO1 0x10002cd0
+	// FUNCTION: BETA10 0x1000f410
 	virtual void SetSoundFrequencyFactor(MxFloat p_frequencyFactor)
 	{
 		m_frequencyFactor = p_frequencyFactor;
 	} // vtable+0x54
 
 	// FUNCTION: LEGO1 0x10002ce0
+	// FUNCTION: BETA10 0x1000f440
 	virtual void VTable0x58(MxFloat p_unk0x70) { m_unk0x70 = p_unk0x70; } // vtable+0x58
 
 	// FUNCTION: LEGO1 0x10002cf0
+	// FUNCTION: BETA10 0x1000f470
 	virtual MxFloat VTable0x5c() { return m_unk0x70; } // vtable+0x5c
 
 	// FUNCTION: LEGO1 0x10002d00
@@ -62,6 +67,7 @@ public:
 	virtual MxU8 GetActorId() { return m_actorId; } // vtable+0x60
 
 	// FUNCTION: LEGO1 0x10002d10
+	// FUNCTION: BETA10 0x1000f4d0
 	virtual void SetActorId(MxU8 p_actorId) { m_actorId = p_actorId; } // vtable+0x64
 
 	static const char* GetActorName(MxU8 p_id);
@@ -76,6 +82,7 @@ protected:
 };
 
 // SYNTHETIC: LEGO1 0x1002d300
+// SYNTHETIC: BETA10 0x1003d900
 // LegoActor::`scalar deleting destructor'
 
 #endif // LEGOACTOR_H

LEGO1/lego/legoomni/include/legopathactor.h

@@ -51,9 +51,11 @@ public:
 	virtual void VTable0x74(Matrix4& p_transform); // vtable+0x74
 
 	// FUNCTION: LEGO1 0x10002d20
+	// FUNCTION: BETA10 0x1000f500
 	virtual void SetUserNavFlag(MxBool p_userNavFlag) { m_userNavFlag = p_userNavFlag; } // vtable+0x78
 
 	// FUNCTION: LEGO1 0x10002d30
+	// FUNCTION: BETA10 0x1000f530
 	virtual MxBool GetUserNavFlag() { return m_userNavFlag; } // vtable+0x7c
 
 	virtual MxResult VTable0x80(
@@ -67,7 +69,7 @@ public:
 		float p_time,
 		Vector3& p_p1,
 		Vector3& p_p4,
-		LegoOrientedEdge& p_destEdge,
+		LegoOrientedEdge* p_destEdge,
 		float p_destScale
 	); // vtable+0x84
 	virtual MxResult VTable0x88(
@@ -81,9 +83,11 @@ public:
 	virtual MxS32 VTable0x8c(float p_time, Matrix4& p_transform); // vtable+0x8c
 
 	// FUNCTION: LEGO1 0x10002d40
+	// FUNCTION: BETA10 0x1000f560
 	virtual MxU32 VTable0x90(float, Matrix4&) { return FALSE; } // vtable+0x90
 
 	// FUNCTION: LEGO1 0x10002d50
+	// FUNCTION: BETA10 0x1000f800
 	virtual MxResult HitActor(LegoPathActor*, MxBool) { return 0; } // vtable+0x94
 
 	virtual void SwitchBoundary(
@@ -94,30 +98,38 @@ public:
 	virtual MxResult VTable0x9c(); // vtable+0x9c
 
 	// FUNCTION: LEGO1 0x10002d60
+	// FUNCTION: BETA10 0x1000f820
 	virtual MxS32 VTable0xa0() { return 0; } // vtable+0xa0
 
 	virtual void VTable0xa4(MxBool& p_und1, MxS32& p_und2); // vtable+0xa4
 	virtual void VTable0xa8();                              // vtable+0xa8
 
 	// FUNCTION: LEGO1 0x10002d70
+	// FUNCTION: BETA10 0x1000f580
 	virtual void SetMaxLinearVel(MxFloat p_maxLinearVel) { m_maxLinearVel = p_maxLinearVel; } // vtable+0xac
 
 	// FUNCTION: LEGO1 0x10002d80
+	// FUNCTION: BETA10 0x1000f5b0
 	virtual MxFloat GetMaxLinearVel() { return m_maxLinearVel; } // vtable+0xb0
 
 	// FUNCTION: LEGO1 0x10002d90
+	// FUNCTION: BETA10 0x1000f5e0
 	virtual MxFloat VTable0xb4() { return m_unk0x140; } // vtable+0xb4
 
 	// FUNCTION: LEGO1 0x10002da0
+	// FUNCTION: BETA10 0x1000f610
 	virtual MxFloat VTable0xb8() { return m_unk0x144; } // vtable+0xb8
 
 	// FUNCTION: LEGO1 0x10002db0
+	// FUNCTION: BETA10 0x1000f640
 	virtual void VTable0xbc(MxFloat p_unk0x140) { m_unk0x140 = p_unk0x140; } // vtable+0xbc
 
 	// FUNCTION: LEGO1 0x10002dc0
+	// FUNCTION: BETA10 0x1000f670
 	virtual void VTable0xc0(MxFloat p_unk0x144) { m_unk0x144 = p_unk0x144; } // vtable+0xc0
 
 	// FUNCTION: LEGO1 0x10002dd0
+	// FUNCTION: BETA10 0x1000f6a0
 	virtual void VTable0xc4() {} // vtable+0xc4
 
 	// FUNCTION: LEGO1 0x10002de0
@@ -132,6 +144,7 @@ public:
 	}
 
 	// FUNCTION: LEGO1 0x1000c440
+	// FUNCTION: BETA10 0x100124c0
 	MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, LegoPathActor::ClassName()) || LegoActor::IsA(p_name);
@@ -161,6 +174,7 @@ public:
 	void PlaceActor(LegoNamedPlane& p_namedPlane);
 
 	// SYNTHETIC: LEGO1 0x1002d800
+	// SYNTHETIC: BETA10 0x100b04d0
 	// LegoPathActor::`scalar deleting destructor'
 
 protected:

LEGO1/lego/legoomni/src/actors/act2actor.cpp

@@ -133,7 +133,6 @@ Act2Actor::Act2Actor()
 }
 
 // FUNCTION: LEGO1 0x10018940
-// FUNCTION: BETA10 0x1003d65f
 void Act2Actor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2)
 {
 	LegoAnimActor::SetROI(p_roi, p_bool1, p_bool2);

LEGO1/lego/legoomni/src/actors/helicopter.cpp

@@ -455,7 +455,9 @@ void Helicopter::FUN_100042a0(const Matrix4& p_matrix)
 	Vector3 vec3(m_unk0x1a8[0]); // locala8  // esp+0x20
 	Vector3 vec4(m_unk0x1a8[1]); // localb8  // esp+0x10
 	Vector3 vec5(m_unk0x1a8[2]); // EDI
-	Vector3 vec6(m_unk0x1a8[3]); // locala0  // esp+0x28
+
+	// the typecast makes this function match for unknown reasons
+	Vector3 vec6((const float*) m_unk0x1a8[3]); // locala0  // esp+0x28
 
 	m_world->GetCameraController()->FUN_100123b0(local48);
 	m_unk0x1a8.SetIdentity();

LEGO1/lego/legoomni/src/build/legocarbuildpresenter.cpp

@@ -47,8 +47,8 @@ LegoCarBuildAnimPresenter::~LegoCarBuildAnimPresenter()
 {
 	if (m_parts) {
 		for (MxS16 i = 0; i < m_numberOfParts; i++) {
-			delete m_parts[i].m_name;
+			delete[] m_parts[i].m_name;
-			delete m_parts[i].m_wiredName;
+			delete[] m_parts[i].m_wiredName;
 		}
 		delete[] m_parts;
 	}

LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp

@@ -1562,7 +1562,7 @@ MxResult LegoAnimationManager::Tickle()
 		return SUCCESS;
 	}
 
-	m_unk0x410 = (rand() * 10000 / SHRT_MAX) + 5000;
+	m_unk0x410 = (rand() * 10000 / RAND_MAX) + 5000;
 	m_unk0x408 = time;
 
 	if (time - m_unk0x404 > 10000) {
@@ -2020,10 +2020,10 @@ void LegoAnimationManager::AddExtra(MxS32 p_location, MxBool p_und)
 
 											float speed;
 											if (m_extras[i].m_unk0x14) {
-												speed = ((float) (rand() * 1.5) / 32767.0f) + 0.9;
+												speed = ((float) (rand() * 1.5) / RAND_MAX) + 0.9;
 											}
 											else {
-												speed = ((float) (rand() * 1.4) / 32767.0f) + 0.6;
+												speed = ((float) (rand() * 1.4) / RAND_MAX) + 0.6;
 											}
 
 											actor->SetWorldSpeed(speed);
@@ -2426,10 +2426,10 @@ void LegoAnimationManager::FUN_10063d10()
 
 						if (speed < 0.0f) {
 							if (m_extras[i].m_unk0x14) {
-								speed = ((float) (rand() * 1.5) / 32767.0f) + 0.9;
+								speed = ((float) (rand() * 1.5) / RAND_MAX) + 0.9;
 							}
 							else {
-								speed = ((float) (rand() * 1.4) / 32767.0f) + 0.6;
+								speed = ((float) (rand() * 1.4) / RAND_MAX) + 0.6;
 							}
 						}
 
@@ -2513,7 +2513,7 @@ MxBool LegoAnimationManager::FUN_10064010(LegoPathBoundary* p_boundary, LegoOrie
 MxBool LegoAnimationManager::FUN_10064120(LegoLocation::Boundary* p_boundary, MxBool p_bool1, MxBool p_bool2)
 {
 	MxU32 local2c = 12;
-	float destScale = ((rand() * 0.5) / 32767.0) + 0.25;
+	float destScale = ((rand() * 0.5) / RAND_MAX) + 0.25;
 	LegoPathActor* actor = UserActor();
 
 	if (actor == NULL) {

LEGO1/lego/legoomni/src/entity/legoactor.cpp

@@ -25,6 +25,7 @@ LegoActor::LegoActor()
 }
 
 // FUNCTION: LEGO1 0x1002d320
+// FUNCTION: BETA10 0x1003d08b
 LegoActor::~LegoActor()
 {
 	if (m_sound) {
@@ -33,6 +34,7 @@ LegoActor::~LegoActor()
 }
 
 // FUNCTION: LEGO1 0x1002d390
+// FUNCTION: BETA10 0x1003d10b
 void LegoActor::ParseAction(char* p_extra)
 {
 	MxFloat speed = 0.0F;
@@ -92,6 +94,8 @@ void LegoActor::ParseAction(char* p_extra)
 				up[2] = atof(token);
 			}
 
+			assert(token);
+
 			SetWorldTransform(location, direction, up);
 		}
 		else {
@@ -124,6 +128,7 @@ const char* LegoActor::GetActorName(MxU8 p_id)
 }
 
 // FUNCTION: LEGO1 0x1002d670
+// FUNCTION: BETA10 0x1003d65f
 void LegoActor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2)
 {
 	if (p_roi) {

LEGO1/lego/legoomni/src/paths/legopathactor.cpp

@@ -68,6 +68,7 @@ LegoPathActor::~LegoPathActor()
 }
 
 // FUNCTION: LEGO1 0x1002d8d0
+// FUNCTION: BETA10 0x100ae8cd
 MxResult LegoPathActor::VTable0x80(const Vector3& p_point1, Vector3& p_point2, Vector3& p_point3, Vector3& p_point4)
 {
 	Mx3DPointFloat p1, p2, p3;
@@ -84,8 +85,10 @@ MxResult LegoPathActor::VTable0x80(const Vector3& p_point1, Vector3& p_point2, V
 		m_BADuration /= 0.001;
 		return SUCCESS;
 	}
-
+	else {
-	return FAILURE;
+		MxTrace("Warning: m_BADuration = %g, roi = %s\n", m_BADuration, m_roi->GetName());
+		return FAILURE;
+	}
 }
 
 // FUNCTION: LEGO1 0x1002d9c0
@@ -167,17 +170,22 @@ MxResult LegoPathActor::VTable0x88(
 }
 
 // FUNCTION: LEGO1 0x1002de10
+// FUNCTION: BETA10 0x100aee61
 MxResult LegoPathActor::VTable0x84(
 	LegoPathBoundary* p_boundary,
 	float p_time,
 	Vector3& p_p1,
 	Vector3& p_p4,
-	LegoOrientedEdge& p_destEdge,
+	LegoOrientedEdge* p_destEdge,
 	float p_destScale
 )
 {
-	Vector3* v3 = p_destEdge.CWVertex(*p_boundary);
+	assert(p_destEdge);
-	Vector3* v4 = p_destEdge.CCWVertex(*p_boundary);
+
+	Vector3* v3 = p_destEdge->CWVertex(*p_boundary);
+	Vector3* v4 = p_destEdge->CCWVertex(*p_boundary);
+
+	assert(v3 && v4);
 
 	Mx3DPointFloat p2, p3, p5;
 
@@ -187,12 +195,12 @@ MxResult LegoPathActor::VTable0x84(
 	p2 += *v3;
 
 	m_boundary = p_boundary;
-	m_destEdge = &p_destEdge;
+	m_destEdge = p_destEdge;
 	m_unk0xe4 = p_destScale;
 	m_unk0x7c = 0;
 	m_lastTime = p_time;
 	m_actorTime = p_time;
-	p_destEdge.GetFaceNormal(*p_boundary, p3);
+	p_destEdge->GetFaceNormal(*p_boundary, p3);
 
 	MxMatrix matrix;
 	Vector3 pos(matrix[3]);
@@ -217,6 +225,7 @@ MxResult LegoPathActor::VTable0x84(
 		p5.Unitize();
 
 		if (VTable0x80(p_p1, p_p4, p2, p5) == SUCCESS) {
+			MxTrace("Warning: m_BADuration = %g, roi = %s\n", m_BADuration, m_roi->GetName());
 			m_boundary->AddActor(this);
 		}
 		else {
@@ -379,6 +388,7 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
 }
 
 // FUNCTION: LEGO1 0x1002e740
+// FUNCTION: BETA10 0x100b0f70
 void LegoPathActor::VTable0x74(Matrix4& p_transform)
 {
 	if (m_userNavFlag) {

LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp

@@ -305,7 +305,7 @@ MxResult LegoPathController::PlaceActor(
 				return FAILURE;
 			}
 
-			if (p_actor->VTable0x84(boundary, time, p_position, p_direction, *edge, 0.5f) == SUCCESS) {
+			if (p_actor->VTable0x84(boundary, time, p_position, p_direction, edge, 0.5f) == SUCCESS) {
 				p_actor->SetController(this);
 				m_actors.insert(p_actor);
 				return SUCCESS;

LEGO1/library_msvc.h

@@ -840,6 +840,9 @@
 // LIBRARY: BETA10 0x100f8ad0
 // strcmp
 
+// LIBRARY: BETA10 0x100f9f60
+// strtok
+
 // LIBRARY: BETA10 0x100f9610
 // rand
 

LEGO1/tgl/d3drm/camera.cpp

@@ -1,5 +1,7 @@
 #include "impl.h"
 
+#include <assert.h>
+
 using namespace TglImpl;
 
 DECOMP_SIZE_ASSERT(Camera, 0x04);
@@ -12,8 +14,8 @@ void* CameraImpl::ImplementationDataPtr()
 	return reinterpret_cast<void*>(&m_data);
 }
 
-// FUNCTION: LEGO1 0x100a3700
+// FUNCTION: BETA10 0x1016f390
-Result CameraImpl::SetTransformation(FloatMatrix4& matrix)
+inline Result CameraSetTransformation(IDirect3DRMFrame2* pCamera, FloatMatrix4& matrix)
 {
 	D3DRMMATRIX4D helper;
 	D3DRMMATRIX4D* pTransformation = Translate(matrix, helper);
@@ -22,10 +24,23 @@ Result CameraImpl::SetTransformation(FloatMatrix4& matrix)
 	Result result;
 	Result result2;
 
-	result2 = ResultVal(m_data->GetPosition(NULL, &position));
+	result2 = ResultVal(pCamera->GetPosition(NULL, &position));
-	result = ResultVal(m_data->AddTransform(D3DRMCOMBINE_REPLACE, *pTransformation));
+	assert(Succeeded(result2));
-	// The did this second call just to assert on the return value
+
-	result2 = ResultVal(m_data->GetPosition(NULL, &position));
+	result = ResultVal(pCamera->AddTransform(D3DRMCOMBINE_REPLACE, *pTransformation));
+	assert(Succeeded(result));
+
+	result2 = ResultVal(pCamera->GetPosition(NULL, &position));
+	assert(Succeeded(result2));
 
 	return result;
 }
+
+// FUNCTION: LEGO1 0x100a3700
+// FUNCTION: BETA10 0x1016f330
+Result CameraImpl::SetTransformation(FloatMatrix4& matrix)
+{
+	assert(m_data);
+
+	return CameraSetTransformation(m_data, matrix);
+}

LEGO1/tgl/d3drm/impl.h

@@ -109,6 +109,7 @@ public:
 	inline Result Create();
 	inline void Destroy();
 	inline Result CreateLight(LightType type, float r, float g, float b, LightImpl& rLight);
+	inline Result CreateGroup(const GroupImpl* pParentGroup, GroupImpl& rpGroup);
 	inline Result CreateView(
 		const DeviceImpl& rDevice,
 		const CameraImpl& rCamera,

LEGO1/tgl/d3drm/light.cpp

@@ -1,5 +1,7 @@
 #include "impl.h"
 
+#include <assert.h>
+
 using namespace TglImpl;
 
 DECOMP_SIZE_ASSERT(Light, 0x04);
@@ -12,20 +14,43 @@ void* LightImpl::ImplementationDataPtr()
 	return reinterpret_cast<void*>(&m_data);
 }
 
-// FUNCTION: LEGO1 0x100a3780
+// FUNCTION: BETA10 0x1016f6e0
-Result LightImpl::SetTransformation(FloatMatrix4& matrix)
+inline Result LightSetTransformation(IDirect3DRMFrame2* pLight, FloatMatrix4& matrix)
 {
 	D3DRMMATRIX4D helper;
 	D3DRMMATRIX4D* d3dMatrix = Translate(matrix, helper);
-	return ResultVal(m_data->AddTransform(D3DRMCOMBINE_REPLACE, *d3dMatrix));
+	return ResultVal(pLight->AddTransform(D3DRMCOMBINE_REPLACE, *d3dMatrix));
+}
+
+// FUNCTION: LEGO1 0x100a3780
+// FUNCTION: BETA10 0x1016f680
+Result LightImpl::SetTransformation(FloatMatrix4& matrix)
+{
+	assert(m_data);
+
+	return LightSetTransformation(m_data, matrix);
+}
+
+// FUNCTION: BETA10 0x1016f860
+inline Result LightSetColor(IDirect3DRMFrame2* pLight, float r, float g, float b)
+{
+	IDirect3DRMLightArray* lights;
+	IDirect3DRMLight* light;
+	Result result = ResultVal(pLight->GetLights(&lights));
+	assert(Succeeded(result));
+	assert(lights->GetSize() == 1);
+
+	result = ResultVal(lights->GetElement(0, &light));
+	assert(Succeeded(result));
+
+	return ResultVal(light->SetColorRGB(r, g, b));
 }
 
 // FUNCTION: LEGO1 0x100a37e0
+// FUNCTION: BETA10 0x1016f7f0
 Result LightImpl::SetColor(float r, float g, float b)
 {
-	IDirect3DRMLightArray* lightArray;
+	assert(m_data);
-	IDirect3DRMLight* light;
+
-	m_data->GetLights(&lightArray);
+	return LightSetColor(m_data, r, g, b);
-	lightArray->GetElement(0, &light);
-	return ResultVal(light->SetColorRGB(r, g, b));
 }

LEGO1/tgl/d3drm/renderer.cpp

@@ -218,11 +218,16 @@ View* RendererImpl::CreateView(
 	return view;
 }
 
-inline Result RendererCreateGroup(IDirect3DRM2* pRenderer, IDirect3DRMFrame2* pParent, IDirect3DRMFrame2*& rpGroup)
+// FUNCTION: BETA10 0x1016d380
+inline Result RendererCreateGroup(
+	IDirect3DRM2* pRenderer,
+	const IDirect3DRMFrame2* pParent,
+	IDirect3DRMFrame2*& rpGroup
+)
 {
 	Result result = ResultVal(pRenderer->CreateFrame(NULL, &rpGroup));
 	if (Succeeded(result) && pParent) {
-		result = ResultVal(pParent->AddVisual(rpGroup));
+		result = ResultVal(const_cast<IDirect3DRMFrame2*>(pParent)->AddVisual(rpGroup));
 		if (!Succeeded(result)) {
 			rpGroup->Release();
 			rpGroup = NULL;
@@ -231,13 +236,28 @@ inline Result RendererCreateGroup(IDirect3DRM2* pRenderer, IDirect3DRMFrame2* pP
 	return result;
 }
 
+// FUNCTION: BETA10 0x1016d280
+inline Result RendererImpl::CreateGroup(const GroupImpl* pParentGroup, GroupImpl& rGroup)
+{
+	assert(m_data);
+	assert(!pParentGroup || pParentGroup->ImplementationData());
+	assert(!rGroup.ImplementationData());
+
+	return RendererCreateGroup(
+		m_data,
+		pParentGroup ? pParentGroup->ImplementationData() : NULL,
+		rGroup.ImplementationData()
+	);
+}
+
 // FUNCTION: LEGO1 0x100a1b20
+// FUNCTION: BETA10 0x1016a130
 Group* RendererImpl::CreateGroup(const Group* pParent)
 {
+	assert(m_data);
+
 	GroupImpl* group = new GroupImpl();
-	Result result =
+	if (!CreateGroup(static_cast<const GroupImpl*>(pParent), *group)) {
-		RendererCreateGroup(m_data, pParent ? static_cast<const GroupImpl*>(pParent)->m_data : NULL, group->m_data);
-	if (!result) {
 		delete group;
 		group = NULL;
 	}
@@ -511,16 +531,34 @@ Texture* RendererImpl::CreateTexture()
 	return texture;
 }
 
+// FUNCTION: BETA10 0x1016af90
+inline Result RendererSetTextureDefaultShadeCount(IDirect3DRM2* pRenderer, unsigned long shadeCount)
+{
+	return ResultVal(pRenderer->SetDefaultTextureShades(shadeCount));
+}
+
 // FUNCTION: LEGO1 0x100a2270
+// FUNCTION: BETA10 0x1016af30
 Result RendererImpl::SetTextureDefaultShadeCount(unsigned int shadeCount)
 {
-	return ResultVal(m_data->SetDefaultTextureShades(shadeCount));
+	assert(m_data);
+
+	return RendererSetTextureDefaultShadeCount(m_data, shadeCount);
+}
+
+// FUNCTION: BETA10 0x1016b020
+inline Result RendererSetTextureDefaultColorCount(IDirect3DRM2* pRenderer, unsigned long colorCount)
+{
+	return ResultVal(pRenderer->SetDefaultTextureColors(colorCount));
 }
 
 // FUNCTION: LEGO1 0x100a2290
+// FUNCTION: BETA10 0x1016afc0
 Result RendererImpl::SetTextureDefaultColorCount(unsigned int colorCount)
 {
-	return ResultVal(m_data->SetDefaultTextureColors(colorCount));
+	assert(m_data);
+
+	return RendererSetTextureDefaultColorCount(m_data, colorCount);
 }
 
 // FUNCTION: LEGO1 0x100a22b0