[Scummvm-git-logs] scummvm master -> 92eed15cb799c394e9cade998fb790895581b4e2

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b82a8f1dec BLADERUNNER: Fixed actor declaration order
92eed15cb7 BLADERUNNER: Added actor ids for reference


Commit: b82a8f1dec6436034586b3972149372fb271588a
    https://github.com/scummvm/scummvm/commit/b82a8f1dec6436034586b3972149372fb271588a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-09T19:39:51+01:00

Commit Message:
BLADERUNNER: Fixed actor declaration order

Changed paths:
    engines/bladerunner/script/ai_script.h


diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index 936667a..8464c2a 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -131,6 +131,14 @@ END_SCRIPT
 DECLARE_SCRIPT(Lance)
 END_SCRIPT
 
+DECLARE_SCRIPT(Runciter)
+	int var_45CD78;
+	int var_45CD7C;
+	int var_45CD80;
+	int var_45CD84;
+	int var_45CD88;
+END_SCRIPT
+
 DECLARE_SCRIPT(InsectDealer)
 	bool _flag1;
 	int _state1;
@@ -144,14 +152,6 @@ DECLARE_SCRIPT(TyrellGuard)
 	bool _flag1;
 END_SCRIPT
 
-DECLARE_SCRIPT(Runciter)
-	int var_45CD78;
-	int var_45CD7C;
-	int var_45CD80;
-	int var_45CD84;
-	int var_45CD88;
-END_SCRIPT
-
 DECLARE_SCRIPT(Zuben)
 	int _var_45D258;
 	int _var_45D25C;


Commit: 92eed15cb799c394e9cade998fb790895581b4e2
    https://github.com/scummvm/scummvm/commit/92eed15cb799c394e9cade998fb790895581b4e2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-09T19:40:08+01:00

Commit Message:
BLADERUNNER: Added actor ids for reference

Changed paths:
    engines/bladerunner/script/ai_script.cpp


diff --git a/engines/bladerunner/script/ai_script.cpp b/engines/bladerunner/script/ai_script.cpp
index 31efed1..c057d0c 100644
--- a/engines/bladerunner/script/ai_script.cpp
+++ b/engines/bladerunner/script/ai_script.cpp
@@ -39,31 +39,31 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorCount) {
 		_actorUpdating[i] = false;
 	}
 
-	_AIScripts[kActorMcCoy] = new AIScriptMcCoy(_vm);
-	_AIScripts[kActorGrigorian] = new AIScriptGrigorian(_vm);
-	_AIScripts[kActorTransient] = new AIScriptTransient(_vm);
-	_AIScripts[kActorLance] = new AIScriptLance(_vm);
-	_AIScripts[kActorInsectDealer] = new AIScriptInsectDealer(_vm);
-	_AIScripts[kActorTyrellGuard] = new AIScriptTyrellGuard(_vm);
-	_AIScripts[kActorRunciter] = new AIScriptRunciter(_vm);
-	_AIScripts[kActorZuben] = new AIScriptZuben(_vm);
-	_AIScripts[kActorOfficerLeary] = new AIScriptOfficerLeary(_vm);
-	_AIScripts[kActorHowieLee] = new AIScriptHowieLee(_vm);
-	_AIScripts[kActorKlein] = new AIScriptKlein(_vm);
-	_AIScripts[kActorSergeantWalls] = new AIScriptSergeantWalls(_vm);
-	_AIScripts[kActorHysteriaPatron1] = new AIScriptHysteriaPatron1(_vm);
-	_AIScripts[kActorHysteriaPatron2] = new AIScriptHysteriaPatron2(_vm);
-	_AIScripts[kActorHysteriaPatron3] = new AIScriptHysteriaPatron3(_vm);
-	_AIScripts[kActorShoeshineMan] = new AIScriptShoeshineMan(_vm);
-	_AIScripts[kActorGaff] = new AIScriptGaff(_vm);
-	_AIScripts[kActorBryant] = new AIScriptBryant(_vm);
-	_AIScripts[kActorNewscaster] = new AIScriptNewscaster(_vm);
-	_AIScripts[kActorLeon] = new AIScriptLeon(_vm);
-	_AIScripts[kActorMaleAnnouncer] = new AIScriptMaleAnnouncer(_vm);
-	_AIScripts[kActorMaggie] = new AIScriptMaggie(_vm);
-	_AIScripts[kActorGenwalkerA] = new AIScriptGenericWalkerA(_vm);
-	_AIScripts[kActorGenwalkerB] = new AIScriptGenericWalkerB(_vm);
-	_AIScripts[kActorGenwalkerC] = new AIScriptGenericWalkerC(_vm);
+	_AIScripts[kActorMcCoy] = new AIScriptMcCoy(_vm);					// 0
+	_AIScripts[kActorGrigorian] = new AIScriptGrigorian(_vm);			// 11
+	_AIScripts[kActorTransient] = new AIScriptTransient(_vm);			// 12
+	_AIScripts[kActorLance] = new AIScriptLance(_vm);					// 13
+	_AIScripts[kActorRunciter] = new AIScriptRunciter(_vm);				// 15
+	_AIScripts[kActorInsectDealer] = new AIScriptInsectDealer(_vm);		// 16
+	_AIScripts[kActorTyrellGuard] = new AIScriptTyrellGuard(_vm);		// 17
+	_AIScripts[kActorZuben] = new AIScriptZuben(_vm);					// 19
+	_AIScripts[kActorOfficerLeary] = new AIScriptOfficerLeary(_vm);		// 23
+	_AIScripts[kActorHowieLee] = new AIScriptHowieLee(_vm);				// 28
+	_AIScripts[kActorKlein] = new AIScriptKlein(_vm);					// 30
+	_AIScripts[kActorSergeantWalls] = new AIScriptSergeantWalls(_vm);	// 34
+	_AIScripts[kActorHysteriaPatron1] = new AIScriptHysteriaPatron1(_vm);// 47
+	_AIScripts[kActorHysteriaPatron2] = new AIScriptHysteriaPatron2(_vm);// 48
+	_AIScripts[kActorHysteriaPatron3] = new AIScriptHysteriaPatron3(_vm);// 49
+	_AIScripts[kActorShoeshineMan] = new AIScriptShoeshineMan(_vm);		// 50
+	_AIScripts[kActorGaff] = new AIScriptGaff(_vm);						// 53
+	_AIScripts[kActorBryant] = new AIScriptBryant(_vm);					// 54
+	_AIScripts[kActorNewscaster] = new AIScriptNewscaster(_vm);			// 61
+	_AIScripts[kActorLeon] = new AIScriptLeon(_vm);						// 62
+	_AIScripts[kActorMaleAnnouncer] = new AIScriptMaleAnnouncer(_vm);	// 63
+	_AIScripts[kActorMaggie] = new AIScriptMaggie(_vm);					// 66
+	_AIScripts[kActorGenwalkerA] = new AIScriptGenericWalkerA(_vm);		// 67
+	_AIScripts[kActorGenwalkerB] = new AIScriptGenericWalkerB(_vm);		// 68
+	_AIScripts[kActorGenwalkerC] = new AIScriptGenericWalkerC(_vm);		// 69
 }
 
 AIScripts::~AIScripts() {