BLADERUNNER: Fix compilation issues

scummvm · Jan 28, 2018 · 9dffe62 · 9dffe62
1 parent 1e5f9d3
commit 9dffe62
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/engines/bladerunner/actor_clues.cpp b/engines/bladerunner/actor_clues.cpp
@@ -132,13 +132,13 @@ bool ActorClues::isPrivate(int clueId) const {
 	return _clues[clueIndex].flags & 0x08;
 }
 
-void ActorClues::setPrivate(int clueId, bool isPrivate) {
+void ActorClues::setPrivate(int clueId, bool value) {
 	int clueIndex = findClueIndex(clueId);
 	if (clueIndex == -1) {
 		return;
 	}
 
-	if (isPrivate) {
+	if (value) {
 		_clues[clueIndex].flags |= 0x08;
 	} else {
 		_clues[clueIndex].flags &= ~0x08;

diff --git a/engines/bladerunner/actor_clues.h b/engines/bladerunner/actor_clues.h
@@ -66,7 +66,7 @@ class ActorClues {
 	void setViewed(int clueId, bool viewed);
 
 	bool isPrivate(int clueId) const;
-	void setPrivate(int clueId, bool isPrivate);
+	void setPrivate(int clueId, bool value);
 
 	int getField1(int clueId) const;
 

diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
@@ -1154,7 +1154,7 @@ void BladeRunnerEngine::outtakePlay(int id, bool noLocalization, int container)
 }
 
 bool BladeRunnerEngine::openArchive(const Common::String &name) {
-	uint i;
+	int i;
 
 	// If archive is already open, return true
 	for (i = 0; i != kArchiveCount; ++i) {
@@ -1182,7 +1182,7 @@ bool BladeRunnerEngine::openArchive(const Common::String &name) {
 }
 
 bool BladeRunnerEngine::closeArchive(const Common::String &name) {
-	for (uint i = 0; i != kArchiveCount; ++i) {
+	for (int i = 0; i != kArchiveCount; ++i) {
 		if (_archives[i].isOpen() && _archives[i].getName() == name) {
 			_archives[i].close();
 			return true;
@@ -1194,7 +1194,7 @@ bool BladeRunnerEngine::closeArchive(const Common::String &name) {
 }
 
 bool BladeRunnerEngine::isArchiveOpen(const Common::String &name) const {
-	for (uint i = 0; i != kArchiveCount; ++i) {
+	for (int i = 0; i != kArchiveCount; ++i) {
 		if (_archives[i].isOpen() && _archives[i].getName() == name)
 			return true;
 	}
@@ -1203,7 +1203,7 @@ bool BladeRunnerEngine::isArchiveOpen(const Common::String &name) const {
 }
 
 Common::SeekableReadStream *BladeRunnerEngine::getResourceStream(const Common::String &name) {
-	for (uint i = 0; i != kArchiveCount; ++i) {
+	for (int i = 0; i != kArchiveCount; ++i) {
 		if (!_archives[i].isOpen()) {
 			continue;
 		}

diff --git a/engines/bladerunner/scene.cpp b/engines/bladerunner/scene.cpp
@@ -53,7 +53,7 @@ Scene::Scene(BladeRunnerEngine *vm)
 	_specialLoopMode(0),
 	_specialLoop(0),
 	_specialLoopAtEnd(false),
-	_introFinished(false),
+	// _introFinished(false),
 	_nextSetId(-1),
 	_nextSceneId(-1),
 	_frame(0),

diff --git a/engines/bladerunner/scene.h b/engines/bladerunner/scene.h
@@ -45,7 +45,7 @@ class Scene {
 	int         _specialLoopMode;
 	int         _specialLoop;
 	bool        _specialLoopAtEnd;
-	int         _introFinished;
+	// int         _introFinished;
 	int         _nextSetId;
 	int         _nextSceneId;
 	int         _frame;

diff --git a/engines/bladerunner/script/script.cpp b/engines/bladerunner/script/script.cpp
@@ -315,7 +315,7 @@ void ScriptBase::Actor_Start_Speech_Sample(int actorId, int sentenceId) {
 
 void ScriptBase::Actor_Start_Voice_Over_Sample(int sentenceId) {
 	_vm->loopActorSpeaking();
-	_vm->_actors[Actors::kActorVoiceOver]->speechPlay(sentenceId, true);
+	_vm->_actors[kActorVoiceOver]->speechPlay(sentenceId, true);
 }
 
 int ScriptBase::Actor_Query_Which_Set_In(int actorId) {
@@ -572,11 +572,11 @@ bool ScriptBase::Actor_Clue_Query(int actorId, int clueId) {
 }
 
 void ScriptBase::Actor_Clues_Transfer_New_To_Mainframe(int actorId) {
-	_vm->_actors[actorId]->copyClues(Actors::kActorVoiceOver);
+	_vm->_actors[actorId]->copyClues(kActorVoiceOver);
 }
 
 void ScriptBase::Actor_Clues_Transfer_New_From_Mainframe(int actorId) {
-	_vm->_actors[Actors::kActorVoiceOver]->copyClues(actorId);
+	_vm->_actors[kActorVoiceOver]->copyClues(actorId);
 }
 
 void ScriptBase::Actor_Set_Invisible(int actorId, bool isInvisible) {

diff --git a/engines/bladerunner/ui/kia_section_clues.cpp b/engines/bladerunner/ui/kia_section_clues.cpp
@@ -321,12 +321,6 @@ void KIASectionClues::populateFilters() {
 
 		_filterScrollBox->addLine(_vm->_textKIA->getText(12), -1, 0x04);
 
-		struct Line {
-			Common::String crimeName;
-			int lineData;
-			int flags;
-		};
-
 		Common::Array<Line> crimeLines;
 		crimeLines.reserve(crimeFiltersAvailable);
 

diff --git a/engines/bladerunner/ui/kia_section_clues.h b/engines/bladerunner/ui/kia_section_clues.h
@@ -38,6 +38,12 @@ class UIScrollBox;
 class KIASectionClues : public KIASectionBase {
 	static const int kClueCount = 288;
 
+	struct Line {
+		Common::String crimeName;
+		int lineData;
+		int flags;
+	};
+
 	UIContainer         *_uiContainer;
 	UIImagePicker       *_buttons;
 	UIScrollBox         *_cluesScrollBox;

diff --git a/engines/bladerunner/ui/ui_input_box.cpp b/engines/bladerunner/ui/ui_input_box.cpp
@@ -109,7 +109,7 @@ bool UIInputBox::charIsValid(const Common::KeyState &kbd)
 		&& kbd.ascii != '|'
 		&& kbd.ascii != '?'
 		&& kbd.ascii != '*'
-		&& (kbd.ascii <= '¿' || kbd.ascii == '¡' || kbd.ascii == 'ß');
+		&& kbd.ascii <= '~';// || kbd.ascii == '¡' || kbd.ascii == 'ß');
 }
 
 } // End of namespace BladeRunner