BLADERUNNER: added implementation of more script methods added combat structure (maybe it combat mode??)

1 files changed, 106 insertions, 67 deletions

diff --git a/engines/bladerunner/set_effects.cpp b/engines/bladerunner/set_effects.cpp
index f524820033..6db81ce631 100644
--- a/engines/bladerunner/set_effects.cpp
+++ b/engines/bladerunner/set_effects.cpp
@@ -2,82 +2,121 @@
 
 namespace BladeRunner
 {
-	SetEffects::SetEffects(BladeRunnerEngine* vm)
-	{
-		_vm = vm;
-
-		_distanceColor.r = 1.0f;
-		_distanceColor.g = 1.0f;
-		_distanceColor.b = 1.0f;
-		_distanceCoeficient = 0.1f;
-
-		_fadeColor.r = 0.0f;
-		_fadeColor.g = 0.0f;
-		_fadeColor.b = 0.0f;
-		_fadeDensity = 0.0f;
-
-		_fogsCount = 0;
-		_fogs = NULL;
-	}
 
-	SetEffects::~SetEffects()
-	{
-		reset();
-	}
+SetEffects::SetEffects(BladeRunnerEngine* vm) {
+	_vm = vm;
+
+	_distanceColor.r = 1.0f;
+	_distanceColor.g = 1.0f;
+	_distanceColor.b = 1.0f;
+	_distanceCoeficient = 0.1f;
+
+	_fadeColor.r = 0.0f;
+	_fadeColor.g = 0.0f;
+	_fadeColor.b = 0.0f;
+	_fadeDensity = 0.0f;
+
+	_fogsCount = 0;
+	_fogs = NULL;
+}
+
+SetEffects::~SetEffects() {
+	reset();
+}
 
-	void SetEffects::read(Common::ReadStream* stream, int framesCount)
-	{
-		_distanceCoeficient = stream->readFloatLE();
-		_distanceColor.r = stream->readFloatLE();
-		_distanceColor.g = stream->readFloatLE();
-		_distanceColor.b = stream->readFloatLE();
+void SetEffects::read(Common::ReadStream* stream, int framesCount) {
+	_distanceCoeficient = stream->readFloatLE();
+	_distanceColor.r = stream->readFloatLE();
+	_distanceColor.g = stream->readFloatLE();
+	_distanceColor.b = stream->readFloatLE();
 
-		_fogsCount = stream->readUint32LE();
-		int i;
-		for (i = 0; i < _fogsCount; i++)
+	_fogsCount = stream->readUint32LE();
+	int i;
+	for (i = 0; i < _fogsCount; i++) {
+		int type = stream->readUint32LE();
+		Fog* fog = NULL;
+		switch (type)
 		{
-			int type = stream->readUint32LE();
-			Fog* fog = NULL;
-			switch(type)
-			{
-			case 0: 
-				fog = new FogCone();
-				break;
-			case 1:
-				fog = new FogSphere();
-				break;
-			case 2:
-				fog = new FogBox();
-				break;
-			}
-			if(!fog)
-			{
-				//TODO exception, unknown fog type
-			}
-			fog->read(stream, framesCount);
-			fog->_next = _fogs;
-			_fogs = fog;
+		case 0:
+			fog = new FogCone();
+			break;
+		case 1:
+			fog = new FogSphere();
+			break;
+		case 2:
+			fog = new FogBox();
+			break;
 		}
+		if (!fog)
+		{
+			//TODO exception, unknown fog type
+		}
+		fog->read(stream, framesCount);
+		fog->_next = _fogs;
+		_fogs = fog;
 	}
+}
 
-	void SetEffects::reset()
-	{
-		Fog* fog, *nextFog;
-		
-		if (!_fogs)
-			return;
+void SetEffects::reset() {
+	Fog* fog, *nextFog;
 
-		do
-		{
-			fog = _fogs;
-			nextFog = fog->_next;
-			delete fog;
-			fog = nextFog;
-		} while (nextFog);
+	if (!_fogs)
+		return;
 
-	}
+	do {
+		fog = _fogs;
+		nextFog = fog->_next;
+		delete fog;
+		fog = nextFog;
+	} while (nextFog);
+
+}
+
+void SetEffects::setupFrame(int frame) {
+}
 
-	void SetEffects::setupFrame(int frame)
-	{
+void SetEffects::setFadeColor(float r, float g, float b) {
+	_fadeColor.r = r;
+	_fadeColor.r = g;
+	_fadeColor.b = b;
+}
+
+void SetEffects::setFadeDensity(float density) {
+	_fadeDensity = density;
+}
+
+void SetEffects::setFogColor(char* fogName, float r, float g, float b) {
+	Fog* fog = findFog(fogName);
+	if (fog == nullptr)
+		return;
+
+	fog->_fogColor.r = r;
+	fog->_fogColor.g = g;
+	fog->_fogColor.b = b;
+}
+
+void SetEffects::setFogDensity(char* fogName, float density) {
+	Fog* fog = findFog(fogName);
+	if (fog == nullptr)
+		return;
+
+	fog->_fogDensity = density;
+}
+
+Fog* SetEffects::findFog(char* fogName) {
+	if (!_fogs)
+		return nullptr;
+
+	Fog* fog = _fogs;
+
+	while (fog != nullptr) {
+		if (strcmp(fogName, fog->_name) == 0) {
+			break;
+		}
+		fog = fog->_next;
 	}
+
+	return fog;
+}
+
 }
\ No newline at end of file