BLADERUNNER: Using preincrement and pre-decrease where possible

In case the compiler won't optimize such cases

engines/bladerunner/actor.cpp

@@ -272,7 +272,7 @@ int32 Actor::timerLeft(int timerId) {
 }
 
 void Actor::timersUpdate() {
-	for (int i = 0; i < kActorTimers; i++) {
+	for (int i = 0; i < kActorTimers; ++i) {
 		timerUpdate(i);
 	}
 }
@@ -851,7 +851,7 @@ void Actor::setSetId(int setId) {
 
 	// leaving _setId for setId
 	if (_setId > 0) {
-		for (i = 0; i < (int)_vm->_gameInfo->getActorCount(); i++) {
+		for (i = 0; i < (int)_vm->_gameInfo->getActorCount(); ++i) {
 			if (_vm->_actors[i]->_id != _id && _vm->_actors[i]->_setId == _setId) {
 				_vm->_aiScripts->otherAgentExitedThisScene(i, _id);
 			}
@@ -861,7 +861,7 @@ void Actor::setSetId(int setId) {
 	_setId = setId;
 	_vm->_aiScripts->enteredScene(_id, _setId);
 	if (_setId > 0) {
-		for (i = 0; i < (int)_vm->_gameInfo->getActorCount(); i++) {
+		for (i = 0; i < (int)_vm->_gameInfo->getActorCount(); ++i) {
 			if (_vm->_actors[i]->_id != _id && _vm->_actors[i]->_setId == _setId) {
 				_vm->_aiScripts->otherAgentEnteredThisScene(i, _id);
 			}
@@ -1168,7 +1168,7 @@ void Actor::combatModeOn(int initialState, bool rangedAttack, int enemyId, int w
 	}
 	stopWalking(false);
 	changeAnimationMode(_animationModeCombatIdle, false);
-	for (int i = 0; i < (int)_vm->_gameInfo->getActorCount(); i++) {
+	for (int i = 0; i < (int)_vm->_gameInfo->getActorCount(); ++i) {
 		Actor *otherActor = _vm->_actors[i];
 		if (i != _id && otherActor->_setId == _setId && !otherActor->_isRetired) {
 			_vm->_aiScripts->otherAgentEnteredCombatMode(i, _id, true);
@@ -1183,7 +1183,7 @@ void Actor::combatModeOff() {
 	_inCombat = false;
 	stopWalking(false);
 	changeAnimationMode(kAnimationModeIdle, false);
-	for (int i = 0; i < (int)_vm->_gameInfo->getActorCount(); i++) {
+	for (int i = 0; i < (int)_vm->_gameInfo->getActorCount(); ++i) {
 		Actor *otherActor = _vm->_actors[i];
 		if (i != _id && otherActor->_setId == _setId && !otherActor->_isRetired) {
 			_vm->_aiScripts->otherAgentEnteredCombatMode(i, _id, false);
@@ -1299,7 +1299,7 @@ bool Actor::hasClue(int clueId) const {
 bool Actor::copyClues(int actorId) {
 	bool newCluesAcquired = false;
 	Actor *otherActor = _vm->_actors[actorId];
-	for (int i = 0; i < (int)_vm->_gameInfo->getClueCount(); i++) {
+	for (int i = 0; i < (int)_vm->_gameInfo->getClueCount(); ++i) {
 		int clueId = i;
 		if (hasClue(clueId) && !_clues->isPrivate(clueId) && otherActor->canAcquireClue(clueId) && !otherActor->hasClue(clueId)) {
 			int fromActorId = _id;
@@ -1315,7 +1315,7 @@ bool Actor::copyClues(int actorId) {
 
 void Actor::acquireCluesByRelations() {
 	if (_setId >= 0 && _setId != kSetFreeSlotG && _setId != _vm->_actors[0]->_setId) {
-		for (int i = 0; i < (int)_vm->_gameInfo->getActorCount(); i++) {
+		for (int i = 0; i < (int)_vm->_gameInfo->getActorCount(); ++i) {
 			if (i != _id && _vm->_actors[i]->_setId == _setId && i && _id
 					&& checkFriendlinessAndHonesty(i)
 					&& _vm->_actors[i]->checkFriendlinessAndHonesty(_id)) {

engines/bladerunner/actor_clues.cpp

@@ -117,7 +117,7 @@ int ActorClues::getModifier(int actorId, int otherActorId, int clueId) {
 	}
 
 	modifier2 = 0;
-	for (int i = 0; i < (int)_vm->_gameInfo->getActorCount(); i++) {
+	for (int i = 0; i < (int)_vm->_gameInfo->getActorCount(); ++i) {
 		if (i != actorId && i != otherActorId) {
 			modifier2 += (friendliness - 50) * _vm->_aiScripts->callGetFriendlinessModifierIfGetsClue(i, otherActorId, clueId) / 100;
 		}
@@ -151,12 +151,12 @@ void ActorClues::acquireCluesByRelations(int actorId, int otherActorId) {
 	int count2 = findAcquirableCluesFromActor(otherActorId, actorId, clues2, kClueCount);
 
 	if (count1 || count2) {
-		for (int i = 0; i < count1; i++) {
+		for (int i = 0; i < count1; ++i) {
 			clues1[i].modifier = getModifier(actorId, otherActorId, clues1[i].clueId);
 		}
 		qsort(clues1, count1, sizeof(CluesUS), cluesCompare);
 
-		for (int i = 0; i < count2; i++) {
+		for (int i = 0; i < count2; ++i) {
 			clues2[i].modifier = getModifier(otherActorId, actorId, clues2[i].clueId);
 		}
 		qsort(clues2, count2, sizeof(CluesUS), cluesCompare);
@@ -178,7 +178,7 @@ void ActorClues::acquireCluesByRelations(int actorId, int otherActorId) {
 			clue2count = 1;
 		}
 
-		for (int i = 0; i < clue2count; i++) {
+		for (int i = 0; i < clue2count; ++i) {
 			bool flag = false;
 			if (otherActor->_clues->isFlag2(clues2[i].clueId)) {
 				avgParameters = (2 * otherActor->getFriendlinessToOther(actorId) + otherActor->getHonesty()) / 3;
@@ -196,7 +196,7 @@ void ActorClues::acquireCluesByRelations(int actorId, int otherActorId) {
 			actor->_clues->acquire(clues2[i].clueId, flag, otherActorId);
 		}
 
-		for (int i = 0; i < clue1count; i++) {
+		for (int i = 0; i < clue1count; ++i) {
 			bool flag = false;
 			if (actor->_clues->isFlag2(clues1[i].clueId)) {
 				avgParameters = (2 * actor->getFriendlinessToOther(otherActorId) + actor->getHonesty()) / 3;
@@ -222,7 +222,7 @@ int ActorClues::findAcquirableCluesFromActor(int actorId, int targetActorId, Clu
 	int count = 0;
 	int cluesCount = actor->_clues->getCount();
 
-	for (int i = 0; i < cluesCount; i++) 	{
+	for (int i = 0; i < cluesCount; ++i) 	{
 		int clueId = actor->_clues->getClueIdByIndex(i);
 
 		if (actor->_clues->isAcquired(clueId)
@@ -231,7 +231,7 @@ int ActorClues::findAcquirableCluesFromActor(int actorId, int targetActorId, Clu
 			list[count].clueId = clueId;
 			list[count].modifier = 0;
 
-			count++;
+			++count;
 		}
 	}
 
@@ -334,7 +334,7 @@ void ActorClues::removeAll() {
 }
 
 int ActorClues::findClueIndex(int clueId) const {
-	for (int i = 0; i < _count; i++) {
+	for (int i = 0; i < _count; ++i) {
 		if (clueId == _clues[i].clueId) {
 			return i;
 		}

engines/bladerunner/actor_walk.cpp

@@ -392,7 +392,7 @@ bool ActorWalk::findEmptyPositionAroundToOriginalDestination(int actorId, Vector
 bool ActorWalk::addNearActors(int skipActorId) {
 	bool added = false;
 	int setId = _vm->_scene->getSetId();
-	for (int i = 0; i < (int)_vm->_gameInfo->getActorCount(); i++) {
+	for (int i = 0; i < (int)_vm->_gameInfo->getActorCount(); ++i) {
 		assert(_vm->_actors[i] != nullptr);
 
 		if (_vm->_actors[skipActorId] != nullptr

engines/bladerunner/ambient_sounds.cpp

@@ -108,7 +108,7 @@ void AmbientSounds::removeNonLoopingSound(int sfxId, bool stopPlaying) {
 }
 
 void AmbientSounds::removeAllNonLoopingSounds(bool stopPlaying) {
-	for (int i = 0; i < kNonLoopingSounds; i++) {
+	for (int i = 0; i < kNonLoopingSounds; ++i) {
 		removeNonLoopingSoundByIndex(i, stopPlaying);
 	}
 }
@@ -203,7 +203,7 @@ void AmbientSounds::removeLoopingSound(int sfxId, uint32 delay) {
 }
 
 void AmbientSounds::removeAllLoopingSounds(uint32 delay) {
-	for (int i = 0; i < kLoopingSounds; i++) {
+	for (int i = 0; i < kLoopingSounds; ++i) {
 		removeLoopingSoundByIndex(i, delay);
 	}
 }
@@ -243,7 +243,7 @@ void AmbientSounds::tick() {
 
 void AmbientSounds::setVolume(int volume) {
 	if (_loopingSounds) {
-		for (int i = 0; i < kLoopingSounds; i++) {
+		for (int i = 0; i < kLoopingSounds; ++i) {
 			if (_loopingSounds[i].isActive && _loopingSounds[i].audioPlayerTrack != -1) {
 				int newVolume = _loopingSounds[i].volume * volume / 100;
 				if (_vm->_audioPlayer->isActive(_loopingSounds[i].audioPlayerTrack)) {

engines/bladerunner/aud_stream.cpp

@@ -112,7 +112,7 @@ int AudStream::readBuffer(int16 *buffer, const int numSamples) {
 		}
 	} else {
 		samplesRead = MIN(numSamples, (int)(_end - _p) / 2);
-		for (int i = 0; i < samplesRead; i++, _p += 2) {
+		for (int i = 0; i < samplesRead; ++i, _p += 2) {
 			buffer[i] = READ_LE_UINT16(_p);
 		}
 	}

engines/bladerunner/audio_cache.cpp

@@ -106,7 +106,7 @@ void AudioCache::incRef(int32 hash) {
 
 	for (uint i = 0; i != _cacheItems.size(); ++i) {
 		if (_cacheItems[i].hash == hash) {
-			_cacheItems[i].refs++;
+			++(_cacheItems[i].refs);
 			return;
 		}
 	}
@@ -119,7 +119,7 @@ void AudioCache::decRef(int32 hash) {
 	for (uint i = 0; i != _cacheItems.size(); ++i) {
 		if (_cacheItems[i].hash == hash) {
 			assert(_cacheItems[i].refs > 0);
-			_cacheItems[i].refs--;
+			--(_cacheItems[i].refs);
 			return;
 		}
 	}

engines/bladerunner/audio_mixer.cpp

@@ -34,14 +34,14 @@ namespace BladeRunner {
 
 AudioMixer::AudioMixer(BladeRunnerEngine *vm) {
 	_vm = vm;
-	for (int i = 0; i < kChannels; i++) {
+	for (int i = 0; i < kChannels; ++i) {
 		_channels[i].isPresent = false;
 	}
 	_vm->getTimerManager()->installTimerProc(timerCallback, (1000 / kUpdatesPerSecond) * 1000, this, "BladeRunnerAudioMixerTimer");
 }
 
 AudioMixer::~AudioMixer() {
-	for (int i = 0; i < kChannels; i++) {
+	for (int i = 0; i < kChannels; ++i) {
 		stop(i, 0);
 	}
 	_vm->getTimerManager()->removeTimerProc(timerCallback);
@@ -53,7 +53,7 @@ int AudioMixer::play(Audio::Mixer::SoundType type, Audio::RewindableAudioStream
 	int channel = -1;
 	int lowestPriority = 1000000;
 	int lowestPriorityChannel = -1;
-	for (int i = 0; i < kUsableChannels; i++) {
+	for (int i = 0; i < kUsableChannels; ++i) {
 		if (!_channels[i].isPresent) {
 			channel = i;
 			break;
@@ -173,7 +173,7 @@ void AudioMixer::adjustPan(int channel, int newPan, uint32 time) {
 void AudioMixer::tick() {
 	Common::StackLock lock(_mutex);
 
-	for (int i = 0; i < kChannels; i++) {
+	for (int i = 0; i < kChannels; ++i) {
 		Channel *channel = &_channels[i];
 		if (!channel->isPresent) {
 			continue;

engines/bladerunner/bladerunner.cpp

@@ -1181,7 +1181,7 @@ void BladeRunnerEngine::actorsUpdate() {
 		return;
 	}
 
-	for (int i = 0; i < actorCount; i++) {
+	for (int i = 0; i < actorCount; ++i) {
 		Actor *actor = _actors[i];
 		if (actor->getSetId() == setId || i == _actorUpdateCounter) {
 			_aiScripts->update(i);

engines/bladerunner/combat.cpp

@@ -54,7 +54,7 @@ void Combat::reset() {
 	_ammoDamage[1] = 20;
 	_ammoDamage[2] = 30;
 
-	for (int i = 0; i < kSoundCount; i++) {
+	for (int i = 0; i < kSoundCount; ++i) {
 		_hitSoundId[i] = -1;
 		_missSoundId[i] = -1;
 	}

engines/bladerunner/debugger.cpp

@@ -690,7 +690,7 @@ bool Debugger::cmdScene(int argc, const char **argv) {
 
 		// Sanity check
 		uint i;
-		for (i = 0; sceneList[i].chapter != 0; i++) {
+		for (i = 0; sceneList[i].chapter != 0; ++i) {
 			if (sceneList[i].chapter == chapterIdNormalized &&
 			    sceneList[i].set == setId &&
 			    sceneList[i].scene == sceneId
@@ -735,7 +735,7 @@ bool Debugger::cmdScene(int argc, const char **argv) {
 		}
 
 		uint i;
-		for (i = 0; sceneList[i].chapter != 0; i++) {
+		for (i = 0; sceneList[i].chapter != 0; ++i) {
 			if (sceneList[i].chapter == chapterIdNormalized && sceneName.equalsIgnoreCase(sceneList[i].name))
 				break;
 		}
@@ -760,7 +760,7 @@ bool Debugger::cmdScene(int argc, const char **argv) {
 	}
 
 	uint i;
-	for (i = 0; sceneList[i].chapter != 0; i++) {
+	for (i = 0; sceneList[i].chapter != 0; ++i) {
 		if (sceneList[i].chapter == chapterIdNormalized && sceneList[i].set == _vm->_scene->getSetId()
 				&& sceneList[i].scene == _vm->_scene->getSceneId())
 			break;
@@ -1096,7 +1096,7 @@ bool Debugger::cmdOverlay(int argc, const char **argv) {
 
 			for (int i = 0; i < _vm->_overlays->kOverlayVideos; ++i) {
 				if (_vm->_overlays->_videos[i].loaded) {
-					countOfLoadedOverlaysInScene++;
+					++countOfLoadedOverlaysInScene;
 					VQADecoder::LoopInfo &loopInfo =_vm->_overlays->_videos[i].vqaPlayer->_decoder._loopInfo;
 					for (int j = 0; j < loopInfo.loopCount; ++j) {
 						debugPrintf("%s %2d %4d %4d\n", _vm->_overlays->_videos[i].name.c_str(), j, loopInfo.loops[j].begin, loopInfo.loops[j].end);
@@ -1392,7 +1392,7 @@ bool Debugger::cmdObject(int argc, const char **argv) {
 				debugPrintf("Unable to add more objects in the set\n");
 			} else {
 				int objectId = _vm->_scene->_set->_objectCount;
-				_vm->_scene->_set->_objectCount++;
+				++(_vm->_scene->_set->_objectCount);
 				_vm->_scene->_set->_objects[objectId].name = custObjName.c_str();
 
 				float x0, y0, z0, x1, y1, z1;
@@ -1934,7 +1934,7 @@ bool Debugger::cmdList(int argc, const char **argv) {
 			if (argc == 2) {
 				debugPrintf("Listing scene actors: \n");
 				int count = 0;
-				for (int i = 0; i < _vm->_sceneObjects->_count; i++) {
+				for (int i = 0; i < _vm->_sceneObjects->_count; ++i) {
 					SceneObjects::SceneObject *sceneObject = &_vm->_sceneObjects->_sceneObjects[_vm->_sceneObjects->_sceneObjectsSortedByDistance[i]];
 
 					if (sceneObject->type == kSceneObjectTypeActor) {
@@ -2044,7 +2044,7 @@ bool Debugger::cmdList(int argc, const char **argv) {
 						_vm->_view->_fovX);
 			debugPrintf("Listing scene objects: \n");
 			int count = 0;
-			for (int i = 0; i < _vm->_sceneObjects->_count; i++) {
+			for (int i = 0; i < _vm->_sceneObjects->_count; ++i) {
 				SceneObjects::SceneObject *sceneObject = &_vm->_sceneObjects->_sceneObjects[_vm->_sceneObjects->_sceneObjectsSortedByDistance[i]];
 				const BoundingBox &bbox = sceneObject->boundingBox;
 				Vector3 a, b;
@@ -2072,7 +2072,7 @@ bool Debugger::cmdList(int argc, const char **argv) {
 		} else if (arg == "item") {
 			debugPrintf("Listing scene items: \n");
 			int count = 0;
-			for (int i = 0; i < _vm->_sceneObjects->_count; i++) {
+			for (int i = 0; i < _vm->_sceneObjects->_count; ++i) {
 				SceneObjects::SceneObject *sceneObject = &_vm->_sceneObjects->_sceneObjects[_vm->_sceneObjects->_sceneObjectsSortedByDistance[i]];
 
 				if (sceneObject->type == kSceneObjectTypeItem) {
@@ -2104,7 +2104,7 @@ bool Debugger::cmdList(int argc, const char **argv) {
 			debugPrintf("Listing plain regions: \n");
 			int count = 0;
 			//list regions
-			for (int i = 0; i < 10; i++) {
+			for (int i = 0; i < 10; ++i) {
 				Regions::Region *region = &_vm->_scene->_regions->_regions[i];
 				if (!region->present) continue;
 				Common::Rect r = region->rectangle;
@@ -2114,7 +2114,7 @@ bool Debugger::cmdList(int argc, const char **argv) {
 
 			debugPrintf("Listing exits: \n");
 			//list exits
-			for (int i = 0; i < 10; i++) {
+			for (int i = 0; i < 10; ++i) {
 				Regions::Region *region = &_vm->_scene->_exits->_regions[i];
 				if (!region->present) continue;
 				Common::Rect r = region->rectangle;
@@ -2125,7 +2125,7 @@ bool Debugger::cmdList(int argc, const char **argv) {
 		} else if (arg == "way") {
 			debugPrintf("Listing waypoints: \n");
 			int count = 0;
-			for (int i = 0; i < _vm->_waypoints->_count; i++) {
+			for (int i = 0; i < _vm->_waypoints->_count; ++i) {
 				Waypoints::Waypoint *waypoint = &_vm->_waypoints->_waypoints[i];
 				if (waypoint->setId != _vm->_scene->getSetId()) {
 					continue;
@@ -2136,7 +2136,7 @@ bool Debugger::cmdList(int argc, const char **argv) {
 			}
 
 			// list combat cover waypoints
-			for (int i = 0; i < (int)_vm->_combat->_coverWaypoints.size(); i++) {
+			for (int i = 0; i < (int)_vm->_combat->_coverWaypoints.size(); ++i) {
 				Combat::CoverWaypoint *cover = &_vm->_combat->_coverWaypoints[i];
 				if (cover->setId != _vm->_scene->getSetId()) {
 					continue;
@@ -2147,7 +2147,7 @@ bool Debugger::cmdList(int argc, const char **argv) {
 			}
 
 			// list combat flee waypoints
-			for (int i = 0; i < (int)_vm->_combat->_fleeWaypoints.size(); i++) {
+			for (int i = 0; i < (int)_vm->_combat->_fleeWaypoints.size(); ++i) {
 				Combat::FleeWaypoint *flee = &_vm->_combat->_fleeWaypoints[i];
 				if (flee->setId != _vm->_scene->getSetId()) {
 					continue;
@@ -2160,7 +2160,7 @@ bool Debugger::cmdList(int argc, const char **argv) {
 		} else if (arg == "walk") {
 			debugPrintf("Listing walkboxes: \n");
 			// list walkboxes
-			for (int i = 0; i < _vm->_scene->_set->_walkboxCount; i++) {
+			for (int i = 0; i < _vm->_scene->_set->_walkboxCount; ++i) {
 				Set::Walkbox *walkbox = &_vm->_scene->_set->_walkboxes[i];
 
 				debugPrintf("%2d. Walkbox %s, vertices: %d\n", i, walkbox->name.c_str(), walkbox->vertexCount);
@@ -2177,7 +2177,7 @@ bool Debugger::cmdList(int argc, const char **argv) {
 		} else if (arg == "lit") {
 			debugPrintf("Listing lights: \n");
 			// list lights
-			for (int i = 0; i < (int)_vm->_lights->_lights.size(); i++) {
+			for (int i = 0; i < (int)_vm->_lights->_lights.size(); ++i) {
 				Light *light = _vm->_lights->_lights[i];
 				debugPrintf("%2d. Light %s\n", i, light->_name.c_str());
 			}
@@ -2185,7 +2185,7 @@ bool Debugger::cmdList(int argc, const char **argv) {
 		} else if (arg == "eff") {
 			debugPrintf("Listing scene effects: \n");
 			// list scene effects
-			for (uint i = 0; i < _vm->_screenEffects->_entries.size(); i++) {
+			for (uint i = 0; i < _vm->_screenEffects->_entries.size(); ++i) {
 				ScreenEffects::Entry &entry = _vm->_screenEffects->_entries[i];
 				debugPrintf("%2d. Effect (h: %d, x: %d, y: %d, z: %d\n", i, (int)entry.height, (int)entry.x, (int)entry.y, (int)entry.z);
 			}
@@ -2262,7 +2262,7 @@ void Debugger::drawSceneObjects() {
 	//draw scene objects
 	int count = _vm->_sceneObjects->_count;
 	if (count > 0) {
-		for (int i = 0; i < count; i++) {
+		for (int i = 0; i < count; ++i) {
 			SceneObjects::SceneObject *sceneObject = &_vm->_sceneObjects->_sceneObjects[_vm->_sceneObjects->_sceneObjectsSortedByDistance[i]];
 
 			const BoundingBox &bbox = sceneObject->boundingBox;
@@ -2317,7 +2317,7 @@ void Debugger::drawSceneObjects() {
 
 void Debugger::drawLights() {
 	// draw lights
-	for (int i = 0; i < (int)_vm->_lights->_lights.size(); i++) {
+	for (int i = 0; i < (int)_vm->_lights->_lights.size(); ++i) {
 		if (_viewLights
 		    || (_specificLightsDrawn && findInDbgDrawList(debuggerObjTypeLight, i, _vm->_scene->getSetId(), _vm->_scene->getSceneId()) != -1)
 		) {
@@ -2389,7 +2389,7 @@ void Debugger::drawFogs() {
 void Debugger::drawRegions() {
 	if (_viewRegionsNormalToggle || _specificRegionNormalDrawn) {
 		//draw regions
-		for (int i = 0; i < 10; i++) {
+		for (int i = 0; i < 10; ++i) {
 			Regions::Region *region = &_vm->_scene->_regions->_regions[i];
 			if (!region->present) continue;
 			if (_viewRegionsNormalToggle
@@ -2402,7 +2402,7 @@ void Debugger::drawRegions() {
 
 	if (_viewRegionsExitsToggle || _specificRegionExitsDrawn) {
 		//draw exits
-		for (int i = 0; i < 10; i++) {
+		for (int i = 0; i < 10; ++i) {
 			Regions::Region *region = &_vm->_scene->_exits->_regions[i];
 			if (!region->present) continue;
 			if (_viewRegionsExitsToggle
@@ -2417,7 +2417,7 @@ void Debugger::drawRegions() {
 void Debugger::drawWaypoints() {
 	if (_viewWaypointsNormalToggle || _specificWaypointNormalDrawn)  {
 		//draw world waypoints
-		for (int i = 0; i < _vm->_waypoints->_count; i++) {
+		for (int i = 0; i < _vm->_waypoints->_count; ++i) {
 			Waypoints::Waypoint *waypoint = &_vm->_waypoints->_waypoints[i];
 			if (waypoint->setId != _vm->_scene->getSetId()) {
 				continue;
@@ -2438,7 +2438,7 @@ void Debugger::drawWaypoints() {
 
 	if (_viewWaypointsCoverToggle || _specificWaypointCoverDrawn) {
 		//draw combat cover waypoints
-		for (int i = 0; i < (int)_vm->_combat->_coverWaypoints.size(); i++) {
+		for (int i = 0; i < (int)_vm->_combat->_coverWaypoints.size(); ++i) {
 			Combat::CoverWaypoint *cover = &_vm->_combat->_coverWaypoints[i];
 			if (cover->setId != _vm->_scene->getSetId()) {
 				continue;
@@ -2459,7 +2459,7 @@ void Debugger::drawWaypoints() {
 
 	if (_viewWaypointsFleeToggle || _specificWaypointFleeDrawn) {
 		//draw combat flee waypoints
-		for (int i = 0; i < (int)_vm->_combat->_fleeWaypoints.size(); i++) {
+		for (int i = 0; i < (int)_vm->_combat->_fleeWaypoints.size(); ++i) {
 			Combat::FleeWaypoint *flee = &_vm->_combat->_fleeWaypoints[i];
 			if (flee->setId != _vm->_scene->getSetId()) {
 				continue;
@@ -2481,12 +2481,12 @@ void Debugger::drawWaypoints() {
 
 void Debugger::drawWalkboxes() {
 	//draw walkboxes
-	for (int i = 0; i < _vm->_scene->_set->_walkboxCount; i++) {
+	for (int i = 0; i < _vm->_scene->_set->_walkboxCount; ++i) {
 		if (_viewWalkboxes
 		    || (_specificWalkboxesDrawn && findInDbgDrawList(debuggerObjTypeWalkbox, i, _vm->_scene->getSetId(), _vm->_scene->getSceneId()) != -1)
 		) {
 			Set::Walkbox *walkbox = &_vm->_scene->_set->_walkboxes[i];
-			for (int j = 0; j < walkbox->vertexCount; j++) {
+			for (int j = 0; j < walkbox->vertexCount; ++j) {
 				Vector3 start = _vm->_view->calculateScreenPosition(walkbox->vertices[j]);
 				Vector3 end = _vm->_view->calculateScreenPosition(walkbox->vertices[(j + 1) % walkbox->vertexCount]);
 				_vm->_surfaceFront.drawLine(start.x, start.y, end.x, end.y, _vm->_surfaceFront.format.RGBToColor(255, 255, 0));
@@ -2499,14 +2499,14 @@ void Debugger::drawWalkboxes() {
 
 void Debugger::drawScreenEffects() {
 	//draw aesc
-	for (uint i = 0; i < _vm->_screenEffects->_entries.size(); i++) {
+	for (uint i = 0; i < _vm->_screenEffects->_entries.size(); ++i) {
 		if (_viewScreenEffects
 		    || (_specificEffectsDrawn && findInDbgDrawList(debuggerObjTypeEffect, i, _vm->_scene->getSetId(), _vm->_scene->getSceneId()) != -1)
 		) {
 			ScreenEffects::Entry &entry = _vm->_screenEffects->_entries[i];
 			int j = 0;
-			for (int y = 0; y < entry.height; y++) {
-				for (int x = 0; x < entry.width; x++) {
+			for (int y = 0; y < entry.height; ++y) {
+				for (int x = 0; x < entry.width; ++x) {
 					Common::Rect r((entry.x + x) * 2, (entry.y + y) * 2, (entry.x + x) * 2 + 2, (entry.y + y) * 2 + 2);
 
 					int ec = entry.data[j++];

engines/bladerunner/decompress_lcw.cpp

@@ -49,10 +49,10 @@ uint32 decompress_lcw(uint8 *inBuf, uint32 inLen, uint8 *outBuf, uint32 outLen)
 			count = MIN(count, out_remain);
 
 			if (version == 1) {
-				for (i = 0; i < count; i++)
+				for (i = 0; i < count; ++i)
 					dst[i] = outBuf[i + pos];
 			} else {
-				for (i = 0; i < count; i++)
+				for (i = 0; i < count; ++i)
 					dst[i] = *(dst + i - pos);
 			}
 		} else if (src[0] == 0xfe) { // 0b11111110
@@ -69,10 +69,10 @@ uint32 decompress_lcw(uint8 *inBuf, uint32 inLen, uint8 *outBuf, uint32 outLen)
 			count = MIN(count, out_remain);
 
 			if (version == 1) {
-				for (i = 0; i < count; i++)
+				for (i = 0; i < count; ++i)
 					dst[i] = outBuf[i + pos];
 			} else {
-				for (i = 0; i < count; i++)
+				for (i = 0; i < count; ++i)
 					dst[i] = *(dst + i - pos);
 			}
 		} else if (src[0] >= 0x80) { // 0b10??????
@@ -88,7 +88,7 @@ uint32 decompress_lcw(uint8 *inBuf, uint32 inLen, uint8 *outBuf, uint32 outLen)
 			src += 2;
 			count = MIN(count, out_remain);
 
-			for (i = 0; i < count; i++) {
+			for (i = 0; i < count; ++i) {
 				dst[i] = *(dst + i - relpos);
 			}
 		}

engines/bladerunner/decompress_lzo.cpp

@@ -26,11 +26,11 @@ namespace BladeRunner {
 
 static inline uint32 decode_count(const uint8 **pp) {
 	uint32 v = 0;
-	for (; !**pp; (*pp)++)
+	for (; !**pp; ++(*pp))
 		v += 255;
 
 	v += **pp;
-	(*pp)++;
+	++(*pp);
 
 	return v;
 }

engines/bladerunner/dialogue_menu.cpp

@@ -266,7 +266,7 @@ int DialogueMenu::queryInput() {
 			_selectedItemIndex = i;
 		} else {
 			int priority = -1;
-			for (int i = 0; i < _listSize; i++) {
+			for (int i = 0; i < _listSize; ++i) {
 				int priorityCompare = -1;
 				if (agenda == kPlayerAgendaPolite) {
 					priorityCompare = _items[i].priorityPolite;

engines/bladerunner/fog.cpp

@@ -73,7 +73,7 @@ void Fog::readAnimationData(Common::ReadStream *stream, int size) {
 
 	int floatCount = size / 4;
 	_animationData = new float[floatCount];
-	for (int i = 0; i < floatCount; i++) {
+	for (int i = 0; i < floatCount; ++i) {
 		_animationData[i] = stream->readFloatLE();
 	}
 

engines/bladerunner/font.cpp

@@ -60,7 +60,7 @@ Font* Font::load(BladeRunnerEngine *vm, const Common::String &fileName, int spac
 	}
 
 	font->_characters.resize(font->_characterCount);
-	for (uint32 i = 0; i < font->_characterCount; i++) {
+	for (uint32 i = 0; i < font->_characterCount; ++i) {
 		font->_characters[i].x = stream->readUint32LE();
 		font->_characters[i].y = stream->readUint32LE();
 		font->_characters[i].width = stream->readUint32LE();
@@ -68,7 +68,7 @@ Font* Font::load(BladeRunnerEngine *vm, const Common::String &fileName, int spac
 		font->_characters[i].dataOffset = stream->readUint32LE();
 	}
 
-	for (int i = 0; i < font->_dataSize; i++) {
+	for (int i = 0; i < font->_dataSize; ++i) {
 		font->_data[i] = stream->readUint16LE();
 	}
 
@@ -150,10 +150,10 @@ void Font::drawChar(Graphics::Surface *dst, uint32 chr, int x, int y, uint32 col
 				void *dstPtr = dst->getBasePtr(CLIP(currentX + _characters[characterIndex].x, 0, dst->w - 1), CLIP(currentY + _characters[characterIndex].y, 0, dst->h - 1));
 				drawPixel(*dst, dstPtr, outColor);
 			}
-			srcPtr++;
-			currentX++;
+			++srcPtr;
+			++currentX;
 		}
-		currentY++;
+		++currentY;
 	}
 }
 

engines/bladerunner/items.cpp

@@ -39,7 +39,7 @@ Items::~Items() {
 }
 
 void Items::reset() {
-	for (int i = _items.size() - 1; i >= 0; i--) {
+	for (int i = _items.size() - 1; i >= 0; --i) {
 		delete _items.remove_at(i);
 	}
 }
@@ -74,7 +74,7 @@ void Items::getAnimationId(int itemId, int *animationId) const {
 
 void Items::tick() {
 	int setId = _vm->_scene->getSetId();
-	for (int i = 0; i < (int)_items.size(); i++) {
+	for (int i = 0; i < (int)_items.size(); ++i) {
 		if (_items[i]->_setId != setId) {
 			continue;
 		}
@@ -110,7 +110,7 @@ bool Items::addToSet(int setId) {
 	if (itemCount == 0) {
 		return true;
 	}
-	for (int i = 0; i < itemCount; i++) {
+	for (int i = 0; i < itemCount; ++i) {
 		Item *item = _items[i];
 		if (item->_setId == setId) {
 			_vm->_sceneObjects->addItem(item->_itemId + kSceneObjectOffsetItems, item->_boundingBox, item->_screenRectangle, item->isTarget(), item->_isVisible);
@@ -246,7 +246,7 @@ int Items::findTargetUnderMouse(int mouseX, int mouseY) const {
 }
 
 int Items::findItem(int itemId) const {
-	for (int i = 0; i < (int)_items.size(); i++) {
+	for (int i = 0; i < (int)_items.size(); ++i) {
 		if (_items[i]->_itemId == itemId) {
 			return i;
 		}
@@ -270,7 +270,7 @@ void Items::save(SaveFileWriteStream &f) {
 }
 
 void Items::load(SaveFileReadStream &f) {
-	for (int i = _items.size() - 1; i >= 0; i--) {
+	for (int i = _items.size() - 1; i >= 0; --i) {
 		delete _items.remove_at(i);
 	}
 	_items.resize(f.readInt());

engines/bladerunner/light.cpp

@@ -80,7 +80,7 @@ void Light::read(Common::ReadStream *stream, int frameCount, int frame, int anim
 	}
 	int floatCount = size / 4;
 	_animationData = new float[floatCount];
-	for (int i = 0; i < floatCount; i++) {
+	for (int i = 0; i < floatCount; ++i) {
 		_animationData[i] = stream->readFloatLE();
 	}
 
@@ -121,7 +121,7 @@ void Light::readVqa(Common::ReadStream *stream, int frameCount, int frame, int a
 
 	int floatCount = size / 4;
 	_animationData = new float[floatCount];
-	for (int i = 0; i < floatCount; i++) {
+	for (int i = 0; i < floatCount; ++i) {
 		_animationData[i] = stream->readFloatLE();
 	}
 

engines/bladerunner/lights.cpp

@@ -44,7 +44,7 @@ void Lights::read(Common::ReadStream *stream, int frameCount) {
 	_ambientLightColor.b = stream->readFloatLE();
 
 	uint _lightCount = stream->readUint32LE();
-	for (uint i = 0; i < _lightCount; i++) {
+	for (uint i = 0; i < _lightCount; ++i) {
 		Light *light;
 		int type = stream->readUint32LE();
 		switch (type) {
@@ -73,7 +73,7 @@ void Lights::read(Common::ReadStream *stream, int frameCount) {
 }
 
 void Lights::removeAnimated() {
-	for (int i = (int)(_lights.size() - 1); i >= 0; i--) {
+	for (int i = (int)(_lights.size() - 1); i >= 0; --i) {
 		if (_lights[i]->_animated) {
 			delete _lights.remove_at(i);
 		}
@@ -88,7 +88,7 @@ void Lights::readVqa(Common::ReadStream *stream) {
 
 	int frameCount = stream->readUint32LE();
 	int count = stream->readUint32LE();
-	for (int i = 0; i < count; i++) {
+	for (int i = 0; i < count; ++i) {
 		int lightType = stream->readUint32LE();
 		Light *light;
 		switch (lightType) {
@@ -120,13 +120,13 @@ void Lights::setupFrame(int frame) {
 		return;
 	}
 
-	for (uint i = 0; i < _lights.size(); i++) {
+	for (uint i = 0; i < _lights.size(); ++i) {
 		_lights[i]->setupFrame(frame);
 	}
 }
 
 void Lights::reset() {
-	for (int i = (int)(_lights.size() - 1); i >= 0; i--) {
+	for (int i = (int)(_lights.size() - 1); i >= 0; --i) {
 		delete _lights.remove_at(i);
 	}
 	_lights.clear();

engines/bladerunner/mouse.cpp

@@ -242,14 +242,14 @@ void Mouse::draw(Graphics::Surface &surface, int x, int y) {
 	}
 
 	if (_randomCountdownX > 0) {
-		_randomCountdownX--;
+		--_randomCountdownX;
 		x += _randomX;
 		y += _randomY;
 
 		if (!_randomCountdownX)
 			setMouseJitterDown();
 	} else if (_randomCountdownY > 0) {
-		_randomCountdownY--;
+		--_randomCountdownY;
 		x += _randomX;
 		y += _randomY;
 	}

engines/bladerunner/movement_track.cpp

@@ -39,7 +39,7 @@ void MovementTrack::reset() {
 	_lastIndex = 0;
 	_hasNext = false;
 	_paused = false;
-	for (int i = 0; i < kSize; i++) {
+	for (int i = 0; i < kSize; ++i) {
 		_entries[i].waypointId = -1;
 		_entries[i].delay = -1;
 		_entries[i].angle = -1;
@@ -61,7 +61,7 @@ int MovementTrack::append(int waypointId, int32 delay, int angle, bool run) {
 	_entries[_lastIndex].angle = angle;
 	_entries[_lastIndex].run = run;
 
-	_lastIndex++;
+	++_lastIndex;
 	_hasNext = true;
 	_currentIndex = 0;
 	return 1;

engines/bladerunner/obstacles.cpp

@@ -61,10 +61,10 @@ Obstacles::~Obstacles() {
 }
 
 void Obstacles::clear() {
-	for (int i = 0; i < kPolygonCount; i++) {
+	for (int i = 0; i < kPolygonCount; ++i) {
 		_polygons[i].isPresent = false;
 		_polygons[i].verticeCount = 0;
-		for (int j = 0; j < kPolygonVertexCount; j++) {
+		for (int j = 0; j < kPolygonVertexCount; ++j) {
 			_polygons[i].vertices[j].x = 0.0f;
 			_polygons[i].vertices[j].y = 0.0f;
 		}
@@ -218,7 +218,7 @@ bool Obstacles::mergePolygons(Polygon &polyA, Polygon &polyB) {
 #endif
 			polyMerged.vertices[polyMerged.verticeCount] = polyLine.start;
 			polyMerged.vertexType[polyMerged.verticeCount] = polyPrimaryType;
-			polyMerged.verticeCount++;
+			++(polyMerged.verticeCount);
 		}
 
 		flagAddVertexToVertexList = true;
@@ -227,7 +227,8 @@ bool Obstacles::mergePolygons(Polygon &polyA, Polygon &polyB) {
 		if (linePolygonIntersection(polyLine, polyPrimaryType, polySecondary, &intersectionPoint, &polySecondaryIntersectionIndex, pathLengthSinceLastIntersection)) {
 			if (WITHIN_TOLERANCE(intersectionPoint.x, polyLine.start.x) && WITHIN_TOLERANCE(intersectionPoint.y, polyLine.start.y)) {
 				flagAddVertexToVertexList = false;
-				polyMerged.verticeCount--; // TODO(madmoose): How would this work?
+				// TODO(madmoose): How would this work?
+				--(polyMerged.verticeCount);
 			} else {
 				// Obstacles::nop
 			}
@@ -243,7 +244,7 @@ bool Obstacles::mergePolygons(Polygon &polyA, Polygon &polyB) {
 		} else {
 			vertIndex = (vertIndex + 1) % polyPrimary->verticeCount;
 #if USE_PATHFINDING_EXPERIMENTAL_FIX_2
-			pathLengthSinceLastIntersection++;
+			++pathLengthSinceLastIntersection;
 #endif
 			flagDidFindIntersection = false;
 		}
@@ -326,7 +327,7 @@ restart:
 }
 
 int Obstacles::findEmptyPolygon() const {
-	for (int i = 0; i < kPolygonCount; i++) {
+	for (int i = 0; i < kPolygonCount; ++i) {
 		if (!_polygons[i].isPresent) {
 			return i;
 		}

engines/bladerunner/regions.cpp

@@ -82,8 +82,8 @@ int Regions::getRegionAtXY(int x, int y) const {
 		// Common::Rect::contains is exclusive of right and bottom but
 		// Blade Runner wants inclusive, so we adjust the edges.
 		Common::Rect r = _regions[i].rectangle;
-		r.right++;
-		r.bottom++;
+		++(r.right);
+		++(r.bottom);
 
 		if (r.contains(x, y))
 			return i;

engines/bladerunner/scene.cpp

@@ -383,7 +383,7 @@ void Scene::objectSetIsObstacle(int objectId, bool isObstacle, bool sceneLoaded,
 
 void Scene::objectSetIsObstacleAll(bool isObstacle, bool sceneLoaded) {
 	int i;
-	for (i = 0; i < (int)_set->getObjectCount(); i++) {
+	for (i = 0; i < (int)_set->getObjectCount(); ++i) {
 		_set->objectSetIsObstacle(i, isObstacle);
 		if (sceneLoaded) {
 			_vm->_sceneObjects->setIsObstacle(i + kSceneObjectOffsetObjects, isObstacle);

engines/bladerunner/scene_objects.cpp

@@ -137,7 +137,7 @@ bool SceneObjects::existsOnXZ(int exceptSceneObjectId, float x, float z, bool mo
 	int count = _count;
 
 	if (count > 0) {
-		for (int i = 0; i < count; i++) {
+		for (int i = 0; i < count; ++i) {
 			const SceneObject *sceneObject = &_sceneObjects[_sceneObjectsSortedByDistance[i]];
 			bool isObstacle = false;
 			if (sceneObject->type == kSceneObjectTypeActor) {

engines/bladerunner/screen_effects.cpp

@@ -48,7 +48,7 @@ ScreenEffects::~ScreenEffects() {
 void ScreenEffects::toggleEntry(int effectId, bool skip) {
 	if (effectId >= 0 && effectId < kMaxEffectsInScene) {
 		int foundAt = -1;
-		for (int i = 0; i < (int)_skipEntries.size(); i++) {
+		for (int i = 0; i < (int)_skipEntries.size(); ++i) {
 			if (_skipEntries[i] == effectId) {
 				foundAt = i;
 				break;
@@ -58,7 +58,7 @@ void ScreenEffects::toggleEntry(int effectId, bool skip) {
 		if (skip && foundAt < 0) {
 			int newSlot = 0;
 			// keep the array sorted (from greater values to lower values)
-			for (int i = 0; i < (int)_skipEntries.size(); i++) {
+			for (int i = 0; i < (int)_skipEntries.size(); ++i) {
 				if (effectId > _skipEntries[i]) {
 					newSlot = i;
 					break;
@@ -115,13 +115,13 @@ void ScreenEffects::readVqa(Common::SeekableReadStream *stream) {
 			uint8 count = stream->readByte();
 			if (count & 0x80) { // repeat same data
 				uint8 colors = stream->readByte();
-				for (uint8 j = 0; j < (count & 0x7F) + 1; j++) {
+				for (uint8 j = 0; j < (count & 0x7F) + 1; ++j) {
 					*(dataPtr++) = colors >> 4;  // upper 4 bit
 					*(dataPtr++) = colors & 0xF; // lower 4 bit
 					pixelCount -= 2;
 				}
 			} else { // copy data
-				for (uint8 j = 0; j < count + 1; j++) {
+				for (uint8 j = 0; j < count + 1; ++j) {
 					uint8 colors = stream->readByte();
 					*(dataPtr++) = colors >> 4;  // upper 4 bit
 					*(dataPtr++) = colors & 0xF; // lower 4 bit
@@ -135,7 +135,7 @@ void ScreenEffects::readVqa(Common::SeekableReadStream *stream) {
 #if BLADERUNNER_ORIGINAL_BUGS
 #else
 	// added code to allow skipping specific effects
-	for (int i = 0; i < (int)_skipEntries.size(); i++) {
+	for (int i = 0; i < (int)_skipEntries.size(); ++i) {
 		_entries.remove_at(_skipEntries[i]);
 	}
 #endif // BLADERUNNER_ORIGINAL_BUGS
@@ -149,7 +149,7 @@ void ScreenEffects::readVqa(Common::SeekableReadStream *stream) {
 //		return false;
 //	}
 //
-//	for(int i = 0; i < _entries.size(); i++) {
+//	for(int i = 0; i < _entries.size(); ++i) {
 //		Entry &entry = _entries[i];
 //		if (entry.z < z) {
 //			if (entry.width < (width >> 1) + xx) {

engines/bladerunner/script/ai/bryant.cpp

@@ -222,7 +222,7 @@ bool AIScriptBryant::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = 806;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(806)) {
 			_animationFrame = 0;
@@ -230,7 +230,7 @@ bool AIScriptBryant::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 1:
 		*animation = 805;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(805)) {
 			_animationFrame = 0;
@@ -238,7 +238,7 @@ bool AIScriptBryant::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 2:
 		*animation = 808;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(808) - 1) {
 			_animationState = 3;

engines/bladerunner/script/ai/bullet_bob.cpp

@@ -208,7 +208,7 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
 		if (_var1 == 1) {
 			*animation = 516;
 			if (_var4) {
-				_var4--;
+				--_var4;
 			} else {
 				if (++_animationFrame == 6) {
 					_var4 = Random_Query(4, 8);
@@ -227,7 +227,7 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
 		} else if (_var1 == 0) {
 			*animation = 514;
 			if (_var4) {
-				_var4--;
+				--_var4;
 			} else {
 				_animationFrame += _var3;
 				if (_animationFrame < 0) {
@@ -249,7 +249,7 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
 
 	case 1:
 		*animation = 506;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(506)) {
 			_animationFrame = 0;
 		}
@@ -257,7 +257,7 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 513;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(513)) {
 			_animationFrame = 0;
 			_animationState = 1;
@@ -274,7 +274,7 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 510;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(510) - 1) {
 			_animationFrame = Slice_Animation_Query_Number_Of_Frames(510) - 1;
 			_animationState = 16;
@@ -287,7 +287,7 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 525;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(525)) {
 			*animation = 514;
 			_animationFrame = 0;
@@ -297,7 +297,7 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 517;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(517)) {
 			_animationFrame = 0;
 		}
@@ -305,7 +305,7 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 518;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(518)) {
 			_animationFrame = 0;
 			_animationState = 6;
@@ -315,7 +315,7 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 519;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(519)) {
 			_animationFrame = 0;
 			_animationState = 6;
@@ -325,7 +325,7 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = 520;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(520)) {
 			_animationFrame = 0;
 			_animationState = 6;
@@ -335,7 +335,7 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
 
 	case 10:
 		*animation = 521;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(521)) {
 			_animationFrame = 0;
 			_animationState = 6;
@@ -345,7 +345,7 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
 
 	case 11:
 		*animation = 522;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(522)) {
 			_animationFrame = 0;
 			_animationState = 6;
@@ -355,7 +355,7 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
 
 	case 12:
 		*animation = 523;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(523)) {
 			_animationFrame = 0;
 			_animationState = 6;
@@ -365,7 +365,7 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
 
 	case 13:
 		*animation = 524;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(524)) {
 			_animationFrame = 0;
 			_animationState = 6;
@@ -375,7 +375,7 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
 
 	case 14:
 		*animation = 512;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(512)) {
 			_animationFrame = 0;
 			_animationState = 1;

engines/bladerunner/script/ai/chew.cpp

@@ -105,9 +105,9 @@ bool AIScriptChew::UpdateAnimation(int *animation, int *frame) {
 		if (_var2 == 0) {
 			*animation = 777;
 			if (_var1) {
-				_var1--;
+				--_var1;
 			} else {
-				_animationFrame++;
+				++_animationFrame;
 				if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(777)) {
 					_animationFrame = 0;
 					_var3 = 1;
@@ -188,7 +188,7 @@ bool AIScriptChew::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 0;
 			_var2 = 0;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(780)) {
 				_animationFrame = 0;
 			}
@@ -197,7 +197,7 @@ bool AIScriptChew::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 781;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(781)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -207,7 +207,7 @@ bool AIScriptChew::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 782;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(782)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -217,7 +217,7 @@ bool AIScriptChew::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 783;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(783)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -227,7 +227,7 @@ bool AIScriptChew::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 784;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(784)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -237,7 +237,7 @@ bool AIScriptChew::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 785;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(785)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -247,7 +247,7 @@ bool AIScriptChew::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 786;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(786)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -257,7 +257,7 @@ bool AIScriptChew::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = 787;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(787)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -267,7 +267,7 @@ bool AIScriptChew::UpdateAnimation(int *animation, int *frame) {
 
 	case 10:
 		*animation = 775;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(775)) {
 			*animation = 777;
 			_animationFrame = 0;
@@ -279,13 +279,13 @@ bool AIScriptChew::UpdateAnimation(int *animation, int *frame) {
 	case 11:
 		*animation = 776;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(776) - 1) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 		break;
 
 	case 12:
 		*animation = 773;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(773)) {
 			_animationFrame = 0;
 		}
@@ -293,7 +293,7 @@ bool AIScriptChew::UpdateAnimation(int *animation, int *frame) {
 
 	case 13:
 		*animation = 774;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(774)) {
 			_animationFrame = 0;
 			_animationState = 2;

engines/bladerunner/script/ai/clovis.cpp

@@ -570,7 +570,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 		if (_var1 == 1) {
 			*animation = 227;
 			if (_var2) {
-				_var2--;
+				--_var2;
 			} else if (++_animationFrame == 7) {
 				_var2 = Random_Query(5, 15);
 			} else {
@@ -592,7 +592,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 						_var3 = 1;
 					}
 				}
-				_var2--;
+				--_var2;
 			} else {
 				_animationFrame += _var3;
 				if (_animationFrame == 13 && Random_Query(0, 1)) {
@@ -659,7 +659,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 238;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(238)) {
 			_animationFrame = 0;
 		} else {
@@ -671,7 +671,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 239;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(239)) {
 			flag = true;
 			_animationFrame = 0;
@@ -695,7 +695,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 240;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(240)) {
 			flag = true;
 			_animationFrame = 0;
@@ -719,7 +719,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 		if (!_animationFrame && _flag) {
 			_animationState = 0;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(230)) {
 				_animationFrame = 0;
 			}
@@ -728,7 +728,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 231;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(231)) {
 			_animationFrame = 0;
 			_animationState = 5;
@@ -738,7 +738,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 232;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(232)) {
 			_animationFrame = 0;
 			_animationState = 5;
@@ -748,7 +748,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 233;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(233)) {
 			_animationFrame = 0;
 			_animationState = 5;
@@ -758,7 +758,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = 234;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(234)) {
 			_animationFrame = 0;
 			_animationState = 5;
@@ -768,7 +768,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 10:
 		*animation = 235;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(235)) {
 			_animationFrame = 0;
 			_animationState = 5;
@@ -778,7 +778,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 11:
 		*animation = 236;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(236)) {
 			_animationFrame = 0;
 			_animationState = 5;
@@ -793,7 +793,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 			_animationFrame = 0;
 			Actor_Change_Animation_Mode(kActorClovis, kAnimationModeSit);
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(241)) {
 				_animationFrame = 0;
 			}
@@ -802,7 +802,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 13:
 		*animation = 208;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(208)) {
 			_animationFrame = 0;
 		} else {
@@ -814,7 +814,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 14:
 		*animation = 217;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(217)) {
 			flag = true;
 			_animationFrame = 0;
@@ -834,7 +834,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 15:
 		*animation = 218;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(218)) {
 			flag = true;
 			_animationFrame = 0;
@@ -854,7 +854,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 16:
 		*animation = 219;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 2) {
 			int snd;
 
@@ -888,7 +888,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 17:
 		*animation = 211;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(211)) {
 			flag = true;
 			_animationFrame = 0;
@@ -909,7 +909,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 18:
 		*animation = 212;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(212)) {
 			flag = true;
 			_animationFrame = 0;
@@ -930,7 +930,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 19:
 		*animation = 224;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(224)) {
 			flag = true;
 			_animationFrame = 0;
@@ -951,7 +951,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 20:
 		*animation = 225;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(225)) {
 			flag = true;
 			_animationFrame = 0;
@@ -972,7 +972,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 21:
 		*animation = 220;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(220)) {
 			_animationFrame = 0;
 		} else {
@@ -984,7 +984,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 22:
 		*animation = 221;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(221)) {
 			_animationFrame = 0;
 		} else {
@@ -996,7 +996,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 23:
 		*animation = 213;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(213)) {
 			_animationFrame = 0;
 		} else {
@@ -1008,7 +1008,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 24:
 		*animation = 217;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(217)) {
 			_animationFrame = 0;
 		} else {
@@ -1020,7 +1020,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 25:
 		*animation = 222;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(222)) {
 			_animationFrame = 0;
 		} else {
@@ -1032,7 +1032,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 26:
 		*animation = 223;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(223)) {
 			_animationFrame = 0;
 		} else {
@@ -1044,7 +1044,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 27:
 		*animation = 215;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(215)) {
 			_animationFrame = 0;
 		} else {
@@ -1056,7 +1056,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 28:
 		*animation = 216;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(216)) {
 			_animationFrame = 0;
 		} else {
@@ -1068,7 +1068,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 29:
 		*animation = 209;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(209)) {
 			flag = true;
 			_animationFrame = 0;
@@ -1089,7 +1089,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 30:
 		*animation = 210;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(210)) {
 			flag = 1;
 			_animationFrame = 0;
@@ -1110,7 +1110,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 31:
 		*animation = 242;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(242)) {
 			flag = 1;
 			_animationFrame = 0;
@@ -1131,7 +1131,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 32:
 		*animation = 243;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(243)) {
 			_animationFrame = 0;
 		} else {
@@ -1150,7 +1150,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 			_animationFrame = 0;
 			Actor_Change_Animation_Mode(kActorClovis, 54);
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(244)) {
 				_animationFrame = 0;
 			} else {
@@ -1163,7 +1163,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 34:
 		*animation = 245;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(245)) {
 			_animationState = 33;
 			_animationFrame = 0;
@@ -1173,7 +1173,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 		break;
 
 	case 35:
-		_animationFrame++;
+		++_animationFrame;
 		*animation = 247;
 		Actor_Change_Animation_Mode(kActorClovis, 54);
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(247)) {
@@ -1185,7 +1185,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 36:
 		*animation = 248;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(248)) {
 			_animationFrame = 0;
 			_animationState = 37;
@@ -1196,13 +1196,13 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 	case 37:
 		*animation = 249;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(249) - 1) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 		break;
 
 	case 38:
 		*animation = 250;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(250)) {
 			_animationFrame = 0;
 			_animationState = 39;
@@ -1212,7 +1212,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 
 	case 39:
 		*animation = 251;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(251)) {
 			_animationFrame = 0;
 		} else {
@@ -1225,13 +1225,13 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 	case 40:
 		*animation = 252;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(252) - 1) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 		break;
 
 	case 41:
 		*animation = 226;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == Slice_Animation_Query_Number_Of_Frames(226) - 1) {
 			Actor_Change_Animation_Mode(kActorClovis, 88);
 			_animationState = 42;

engines/bladerunner/script/ai/crazylegs.cpp

@@ -142,28 +142,28 @@ bool AIScriptCrazylegs::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = 454;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(454))
 			_animationFrame = 0;
 		break;
 
 	case 1:
 		*animation = 455;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(455))
 			_animationFrame = 0;
 		break;
 
 	case 2:
 		*animation = 456;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(456))
 			_animationFrame = 0;
 		break;
 
 	case 3:
 		*animation = 457;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(457)) {
 			*animation = 454;
 			_animationFrame = 0;
@@ -173,14 +173,14 @@ bool AIScriptCrazylegs::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 452;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(452))
 			_animationFrame = 0;
 		break;
 
 	case 5:
 		*animation = 453;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(453))
 			_animationFrame = 0;
 		break;
@@ -192,7 +192,7 @@ bool AIScriptCrazylegs::UpdateAnimation(int *animation, int *frame) {
 			_flag = 0;
 		} else {
 			*animation = 458;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(458))
 				_animationFrame = 0;
 		}
@@ -200,7 +200,7 @@ bool AIScriptCrazylegs::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 459;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(459)) {
 			_animationFrame = 0;
 			_animationState = 6;
@@ -210,7 +210,7 @@ bool AIScriptCrazylegs::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 460;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(460)) {
 			_animationFrame = 0;
 			_animationState = 6;
@@ -220,7 +220,7 @@ bool AIScriptCrazylegs::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = 461;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(461)) {
 			_animationFrame = 0;
 			_animationState = 6;
@@ -230,7 +230,7 @@ bool AIScriptCrazylegs::UpdateAnimation(int *animation, int *frame) {
 
 	case 10:
 		*animation = 462;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(462)) {
 			_animationFrame = 0;
 			_animationState = 6;
@@ -240,7 +240,7 @@ bool AIScriptCrazylegs::UpdateAnimation(int *animation, int *frame) {
 
 	case 11:
 		*animation = 463;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(463)) {
 			_animationFrame = 0;
 			_animationState = 6;
@@ -250,7 +250,7 @@ bool AIScriptCrazylegs::UpdateAnimation(int *animation, int *frame) {
 
 	case 12:
 		*animation = 464;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(464)) {
 			_animationFrame = 0;
 			_animationState = 6;
@@ -260,7 +260,7 @@ bool AIScriptCrazylegs::UpdateAnimation(int *animation, int *frame) {
 
 	case 13:
 		*animation = 465;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(465)) {
 			_animationFrame = 0;
 			_animationState = 6;
@@ -270,7 +270,7 @@ bool AIScriptCrazylegs::UpdateAnimation(int *animation, int *frame) {
 
 	case 14:
 		*animation = 466;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(466)) {
 			_animationFrame = 0;
 			_animationState = 6;
@@ -286,7 +286,7 @@ bool AIScriptCrazylegs::UpdateAnimation(int *animation, int *frame) {
 			*animation = 456;
 		} else {
 			*animation = 456;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(456))
 				_animationFrame = 0;
 		}
@@ -294,7 +294,7 @@ bool AIScriptCrazylegs::UpdateAnimation(int *animation, int *frame) {
 
 	case 16:
 		*animation = 467;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(467)) {
 			_animationFrame = 0;
 			_animationState = 1;
@@ -304,7 +304,7 @@ bool AIScriptCrazylegs::UpdateAnimation(int *animation, int *frame) {
 
 	case 17:
 		*animation = 468;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(468)) {
 			*animation = 454;
 			_animationFrame = 0;
@@ -314,7 +314,7 @@ bool AIScriptCrazylegs::UpdateAnimation(int *animation, int *frame) {
 
 	case 18:
 		*animation = 469;
-		_animationFrame--;
+		--_animationFrame;
 		if (_animationFrame <= Slice_Animation_Query_Number_Of_Frames(469)) { // matches original
 			_animationFrame = 0;
 			_animationState = 2;
@@ -324,7 +324,7 @@ bool AIScriptCrazylegs::UpdateAnimation(int *animation, int *frame) {
 
 	case 19:
 		*animation = 469;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(469)) {
 			*animation = 454;
 			_animationFrame = 0;

engines/bladerunner/script/ai/dektora.cpp

@@ -598,7 +598,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = kModelAnimationDektoraStandingIdle;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraStandingIdle)) {
 			_animationFrame = 0;
 		}
@@ -617,7 +617,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 			*animation = kModelAnimationDektoraStandingIdle;
 			_animationState = 0;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraStandingNodShort)) {
 				_animationFrame = 0;
 			}
@@ -626,7 +626,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = kModelAnimationDektoraStandingTalkAgreeing;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraStandingTalkAgreeing)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -636,7 +636,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = kModelAnimationDektoraStandingTalkGestureB;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraStandingTalkGestureB)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -646,7 +646,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = kModelAnimationDektoraStandingTalkGestureC;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraStandingTalkGestureC)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -657,7 +657,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 	case 6:
 		//  case 6 is identical to case 5
 		*animation = kModelAnimationDektoraStandingTalkGestureC;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraStandingTalkGestureC)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -667,7 +667,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = kModelAnimationDektoraStandingTalkGestureD;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraStandingTalkGestureD)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -678,7 +678,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 	case 8:
 		//  case 8 is identical to case 7
 		*animation = kModelAnimationDektoraStandingTalkGestureD;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraStandingTalkGestureD)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -688,7 +688,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = kModelAnimationDektoraCombatIdle;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraCombatIdle)) {
 			_animationFrame = 0;
 		}
@@ -696,7 +696,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 10:
 		*animation = kModelAnimationDektoraCombatBegin;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraCombatBegin)) {
 			_animationFrame = 0;
 			_animationState = 9;
@@ -706,7 +706,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 11:
 		*animation = kModelAnimationDektoraCombatEnd;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraCombatEnd)) {
 			*animation = kModelAnimationDektoraStandingIdle;
 			_animationFrame = 0;
@@ -716,7 +716,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 12:
 		*animation = kModelAnimationDektoraCombatWalkingA;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraCombatWalkingA)) {
 			_animationFrame = 0;
 			_animationState = 9;
@@ -727,7 +727,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 13:
 		*animation = kModelAnimationDektoraCombatWalkingB;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraCombatWalkingB)) {
 			_animationFrame = 0;
 			_animationState = 9;
@@ -738,7 +738,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 14:
 		*animation = kModelAnimationDektoraCombatGotHitRight;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraCombatGotHitRight)) {
 			_animationFrame = 0;
 			_animationState = 9;
@@ -749,7 +749,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 15:
 		*animation = kModelAnimationDektoraCombatGotHitLeft;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraCombatGotHitLeft)) {
 			_animationFrame = 0;
 			_animationState = 9;
@@ -760,7 +760,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 16:
 		*animation = kModelAnimationDektoraCombatLegAttack;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 2) {
 			int speech;
 
@@ -786,7 +786,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 17:
 		*animation = kModelAnimationDektoraCombatPunchAttack;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 6
 		 && Actor_Query_Goal_Number(kActorDektora) == kGoalDektoraNR10AttackMcCoy
 		) {
@@ -818,7 +818,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 18:
 		*animation = kModelAnimationDektoraFrontShoveMove;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraFrontShoveMove)) {
 			*animation = kModelAnimationDektoraStandingIdle;
 			_animationFrame = 0;
@@ -829,7 +829,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 19:
 		*animation = kModelAnimationDektoraBackDodgeMove;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraBackDodgeMove)) {
 			*animation = kModelAnimationDektoraStandingIdle;
 			_animationFrame = 0;
@@ -841,13 +841,13 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 	case 20:
 		*animation = kModelAnimationDektoraFallsDead;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraFallsDead) - 1) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 		break;
 
 	case 21:
 		*animation = kModelAnimationDektoraWalking;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraWalking)) {
 			_animationFrame = 0;
 		}
@@ -855,7 +855,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 22:
 		*animation = kModelAnimationDektoraRunning;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraRunning)) {
 			_animationFrame = 0;
 		}
@@ -863,7 +863,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 23:
 		*animation = kModelAnimationDektoraClimbStairsUp;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraClimbStairsUp)) {
 			_animationFrame = 0;
 		}
@@ -871,7 +871,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 24:
 		*animation = kModelAnimationDektoraClimbStairsDown;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraClimbStairsDown)) {
 			_animationFrame = 0;
 		}
@@ -879,7 +879,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 25:
 		*animation = kModelAnimationDektoraSittingIdle;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraSittingIdle)) {
 			_animationFrame = 0;
 		}
@@ -887,7 +887,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 26:
 		*animation = kModelAnimationDektoraSittingShootingGun;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraSittingShootingGun)) {
 			_animationFrame = 0;
 			_animationState = 31;
@@ -901,7 +901,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 			*animation = kModelAnimationDektoraSittingIdle;
 			_animationState = 25;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraSittingSubtleTalking)) {
 				_animationFrame = 0;
 			}
@@ -910,7 +910,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 28:
 		*animation = kModelAnimationDektoraSittingIntenseTalking;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraSittingIntenseTalking)) {
 			_animationFrame = 0;
 			_animationState = 27;
@@ -920,7 +920,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 29:
 		*animation = kModelAnimationDektoraSittingPullingGunOut;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraSittingPullingGunOut)) {
 			_animationFrame = 0;
 			_animationState = 31;
@@ -930,7 +930,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 30:
 		*animation = kModelAnimationDektoraSittingPullingGunOut;
-		_animationFrame--;
+		--_animationFrame;
 		if (_animationFrame == 0) {
 			_animationFrame = 0;
 			_animationState = 25;
@@ -940,7 +940,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 31:
 		*animation = kModelAnimationDektoraSittingHoldingGun;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraSittingHoldingGun)) {
 			_animationFrame = 0;
 		}
@@ -948,7 +948,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 32:
 		*animation = kModelAnimationDektoraInFlamesA;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraInFlamesA)) {
 			_animationFrame = 0;
 		}
@@ -956,7 +956,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 33:
 		*animation = kModelAnimationDektoraInFlamesB;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraInFlamesB)) {
 			_animationFrame = 0;
 		}
@@ -964,7 +964,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 34:
 		*animation = kModelAnimationDektoraInFlamesGotHit;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraInFlamesGotHit)) {
 			_animationFrame = 0;
 			_animationState = 32;
@@ -974,7 +974,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 35:
 		*animation = kModelAnimationDektoraInFlamesStartFalling;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 2) {
 			Game_Flag_Set(kFlagNR11BreakWindow);
 		}
@@ -990,7 +990,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 	case 36:
 		*animation = kModelAnimationDektoraInFlamesEndFalling;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraInFlamesEndFalling) - 1) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 
 		if (_animationFrame == 11) {
@@ -1019,7 +1019,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 			}
 		}
 
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraDancingA) - 1) {
 			_animationFrame = 0;
 			_animationState = 38;
@@ -1029,7 +1029,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 38:
 		*animation = kModelAnimationDektoraDancingB;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 1) {
 			switch (Random_Query(0, 2)) {
 			case 0:
@@ -1058,7 +1058,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 39:
 		*animation = kModelAnimationDektoraDancingC;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 1) {
 			switch (Random_Query(0, 2)) {
 			case 0:
@@ -1107,7 +1107,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 		}
 
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraDancingFinale) - 1) {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationDektoraDancingFinale) - 1) {
 				Actor_Set_Goal_Number(kActorDektora, kGoalDektoraNR08Leave);
 			}
@@ -1116,7 +1116,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 
 	case 41:
 		*animation = kModelAnimationDektoraStandingTalkGestureA;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 8
 		 && Actor_Query_In_Set(kActorDektora, kSetNR10)
 		) {

engines/bladerunner/script/ai/desk_clerk.cpp

@@ -171,7 +171,7 @@ bool AIScriptDeskClerk::UpdateAnimation(int *animation, int *frame) {
 	case 0:
 		if (_flag1) {
 			*animation = 662;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(662)) {
 				_animationFrame = 0;
 				_flag1 = false;
@@ -184,7 +184,7 @@ bool AIScriptDeskClerk::UpdateAnimation(int *animation, int *frame) {
 			}
 
 			*animation = 661;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(661)) {
 				_animationFrame = 0;
 
@@ -206,7 +206,7 @@ bool AIScriptDeskClerk::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 0;
 			_flag1 = false;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 				_animationFrame = 0;
 			}
@@ -215,7 +215,7 @@ bool AIScriptDeskClerk::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 664;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(664)) {
 			_animationFrame = 0;
 			_animationState = 1;
@@ -225,7 +225,7 @@ bool AIScriptDeskClerk::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 665;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(665)) {
 			_animationFrame = 0;
 			_animationState = 1;
@@ -235,7 +235,7 @@ bool AIScriptDeskClerk::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 666;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(666)) {
 			_animationFrame = 0;
 			_animationState = 1;
@@ -245,7 +245,7 @@ bool AIScriptDeskClerk::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 667;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(667)) {
 			_animationFrame = 0;
 			_animationState = 1;
@@ -255,7 +255,7 @@ bool AIScriptDeskClerk::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 668;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(668)) {
 			_animationFrame = 0;
 		}
@@ -271,7 +271,7 @@ bool AIScriptDeskClerk::UpdateAnimation(int *animation, int *frame) {
 			*animation = 668;
 			_animationState = 6;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 				_animationFrame = 0;
 			}
@@ -280,7 +280,7 @@ bool AIScriptDeskClerk::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 670;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(670) - 2) {
 			Ambient_Sounds_Play_Sound(kSfxZUBLAND1, 40, 30, 30, 99);
 			Actor_Set_Goal_Number(kActorDeskClerk, kGoalDeskClerkKnockedOut);

engines/bladerunner/script/ai/early_q.cpp

@@ -492,7 +492,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 		if (_var2 == 1) {
 			*animation = 370;
 			if (_var1) {
-				_var1--;
+				--_var1;
 			} else {
 				if (++_animationFrame == 6) {
 					_var1 = Random_Query(8, 15);
@@ -508,7 +508,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 		} else if (_var2 == 0) {
 			*animation = 369;
 			if (_var1) {
-				_var1--;
+				--_var1;
 				if (!Random_Query(0, 6)) {
 					_var3 = -_var3;
 				}
@@ -537,7 +537,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 1:
 		*animation = 381;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 18) {
 			Ambient_Sounds_Play_Sound(kSfxBARSFX4, 99, 0, 0, 20);
 		}
@@ -551,7 +551,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 382;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(382)) {
 			_animationFrame = 0;
 		}
@@ -559,7 +559,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 371;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(371)) {
 			*animation = 369;
 			_animationFrame = 0;
@@ -571,13 +571,13 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 	case 4:
 		*animation = 368;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(368) - 1) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 		break;
 
 	case 5:
 		*animation = 365;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(365)) {
 			_animationFrame = 0;
 		}
@@ -585,7 +585,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 361;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(361)) {
 			_animationFrame = 0;
 		}
@@ -593,7 +593,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 383;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(383)) {
 			_animationFrame = 0;
 			_animationState = 9;
@@ -603,7 +603,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 387;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(387)) {
 			*animation = 369;
 			_animationFrame = 0;
@@ -613,7 +613,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = 384;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(384)) {
 			_animationFrame = 0;
 		}
@@ -628,7 +628,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 			*animation = 384;
 			Actor_Change_Animation_Mode(kActorEarlyQ, 53);
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(385)) {
 				_animationFrame = 0;
 			}
@@ -638,7 +638,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 	case 11:
 		*animation = 386;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(386) - 1) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 		if (_animationFrame == 1) {
 			Ambient_Sounds_Play_Sound(kSfxMALEHURT, 59, 0, 0, 20);
@@ -656,7 +656,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 12:
 		*animation = 360;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(360)) {
 			_animationFrame = 0;
 		}
@@ -664,7 +664,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 13:
 		*animation = 362;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(362)) {
 			_animationFrame = 0;
 			_animationState = 12;
@@ -674,7 +674,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 14:
 		*animation = 363;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(363)) {
 			*animation = 369;
 			_animationFrame = 0;
@@ -684,7 +684,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 15:
 		*animation = 364;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 2) {
 			Ambient_Sounds_Play_Sound(kSfxLGCAL1, 60, 0, 0, 20);
 		}
@@ -698,7 +698,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 16:
 		*animation = 366;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(366)) {
 			*animation = 369;
 			_animationFrame = 0;
@@ -709,7 +709,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 17:
 		*animation = 367;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(367)) {
 			*animation = 369;
 			_animationFrame = 0;
@@ -720,7 +720,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 18:
 		*animation = 366;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(366)) {
 			*animation = 369;
 			_animationFrame = 0;
@@ -731,7 +731,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 19:
 		*animation = 367;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(367)) {
 			*animation = 369;
 			_animationFrame = 0;
@@ -748,7 +748,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 			_flag = 0;
 			_animationState = 0;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(372)) {
 				_animationFrame = 0;
 			}
@@ -757,7 +757,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 21:
 		*animation = 373;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(373)) {
 			_animationFrame = 0;
 			_animationState = 20;
@@ -767,7 +767,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 22:
 		*animation = 374;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(374)) {
 			_animationFrame = 0;
 			_animationState = 20;
@@ -777,7 +777,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 23:
 		*animation = 375;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(375)) {
 			_animationFrame = 0;
 			_animationState = 20;
@@ -787,7 +787,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 24:
 		*animation = 376;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(376)) {
 			_animationFrame = 0;
 			_animationState = 20;
@@ -797,7 +797,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 25:
 		*animation = 377;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(377)) {
 			_animationFrame = 0;
 			_animationState = 20;
@@ -807,7 +807,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 26:
 		*animation = 378;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(378)) {
 			_animationFrame = 0;
 			_animationState = 20;
@@ -817,7 +817,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 27:
 		*animation = 379;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(379)) {
 			_animationFrame = 0;
 			_animationState = 20;
@@ -827,7 +827,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 
 	case 28:
 		*animation = 380;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(380)) {
 			_animationFrame = 0;
 			_animationState = 20;

engines/bladerunner/script/ai/early_q_bartender.cpp

@@ -119,7 +119,7 @@ bool AIScriptEarlyQBartender::UpdateAnimation(int *animation, int *frame) {
 			}
 		} else if (_var1 == 0) {
 			*animation = 752;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(752)) {
 				_animationFrame = 0;
 
@@ -137,7 +137,7 @@ bool AIScriptEarlyQBartender::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 0;
 			_var1 = 0;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(755)) {
 				_animationFrame = 0;
 			}
@@ -146,7 +146,7 @@ bool AIScriptEarlyQBartender::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 757;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(757)) {
 			_animationFrame = 0;
 			_animationState = 1;
@@ -156,7 +156,7 @@ bool AIScriptEarlyQBartender::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 757;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(757)) {
 			_animationFrame = 0;
 			_animationState = 1;
@@ -166,7 +166,7 @@ bool AIScriptEarlyQBartender::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 754;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(754)) {
 			Actor_Change_Animation_Mode(kActorEarlyQBartender, kAnimationModeIdle);
 			*animation = 752;

engines/bladerunner/script/ai/fish_dealer.cpp

@@ -194,7 +194,7 @@ bool AIScriptFishDealer::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = 683;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(683))
 			_animationFrame = 0;
@@ -208,7 +208,7 @@ bool AIScriptFishDealer::UpdateAnimation(int *animation, int *frame) {
 			_flag = 0;
 		} else {
 			*animation = 685;
-			_animationFrame++;
+			++_animationFrame;
 
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(685))
 				_animationFrame = 0;
@@ -217,7 +217,7 @@ bool AIScriptFishDealer::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 686;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(686)) {
 			_animationFrame = 0;
@@ -227,7 +227,7 @@ bool AIScriptFishDealer::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 687;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(687)) {
 			_animationFrame = 0;
@@ -237,7 +237,7 @@ bool AIScriptFishDealer::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 684;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(684)) {
 			*animation = 683;
@@ -248,7 +248,7 @@ bool AIScriptFishDealer::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 682;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(682))
 			_animationFrame = 0;

engines/bladerunner/script/ai/free_slot_a.cpp

@@ -401,7 +401,7 @@ bool AIScriptFreeSlotA::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = 861;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(861)) {
 			_animationFrame = 0;
 		}
@@ -410,7 +410,7 @@ bool AIScriptFreeSlotA::UpdateAnimation(int *animation, int *frame) {
 	case 1:
 		*animation = 862;
 		if (_var1) {
-			_var1--;
+			--_var1;
 		} else {
 			_animationFrame += _var2;
 			if (_animationFrame < 8) {
@@ -430,7 +430,7 @@ bool AIScriptFreeSlotA::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 862;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(862) - 1) {
 			*animation = 861;
 			_animationFrame = 0;
@@ -440,7 +440,7 @@ bool AIScriptFreeSlotA::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 858;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(858)) {
 			_animationFrame = 0;
 		}
@@ -448,7 +448,7 @@ bool AIScriptFreeSlotA::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 857;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 1) {
 			int snd;
 			if (Random_Query(1, 2) == 1) {
@@ -473,7 +473,7 @@ bool AIScriptFreeSlotA::UpdateAnimation(int *animation, int *frame) {
 		// This is an animation for Maggie (exploding) but is also used for generic death states (rats, generic walkers)
 		// probably for debug purposes
 		*animation = 874;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(874) - 1) {
 			Actor_Change_Animation_Mode(kActorFreeSlotA, kAnimationModeIdle);
 		}
@@ -484,7 +484,7 @@ bool AIScriptFreeSlotA::UpdateAnimation(int *animation, int *frame) {
 			Ambient_Sounds_Play_Sound(kSfxRATTY3, 99, 0, 0, 20);
 		}
 		*animation = 860;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(860)) {
 			_animationFrame = 0;
 			_animationState = 0;
@@ -494,7 +494,7 @@ bool AIScriptFreeSlotA::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 859;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 1) {
 			Ambient_Sounds_Play_Sound(kSfxRATTY5, 99, 0, 0, 25);
 		}

engines/bladerunner/script/ai/free_slot_b.cpp

@@ -265,7 +265,7 @@ bool AIScriptFreeSlotB::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = 861;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(861)) {
 			_animationFrame = 0;
 		}
@@ -274,7 +274,7 @@ bool AIScriptFreeSlotB::UpdateAnimation(int *animation, int *frame) {
 	case 1:
 		*animation = 862;
 		if (_var1) {
-			_var1--;
+			--_var1;
 		} else {
 			_animationFrame += _var2;
 			if (_animationFrame < 8) {
@@ -294,7 +294,7 @@ bool AIScriptFreeSlotB::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 862;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(862) - 1) {
 			*animation = 861;
 			_animationFrame = 0;
@@ -304,7 +304,7 @@ bool AIScriptFreeSlotB::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 858;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(858)) {
 			_animationFrame = 0;
 		}
@@ -312,7 +312,7 @@ bool AIScriptFreeSlotB::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 857;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 3) {
 			int snd;
 			if (Random_Query(1, 2) == 1) {
@@ -336,7 +336,7 @@ bool AIScriptFreeSlotB::UpdateAnimation(int *animation, int *frame) {
 		// This is an animation for Maggie (exploding) but is also used for generic death states (rats, generic walkers)
 		// probably for debug purposes
 		*animation = 874;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(874) - 1) {
 			_animationState = 8;
 			_animationFrame = Slice_Animation_Query_Number_Of_Frames(874) - 1;
@@ -348,7 +348,7 @@ bool AIScriptFreeSlotB::UpdateAnimation(int *animation, int *frame) {
 			Ambient_Sounds_Play_Sound(kSfxRATTY3, 99, 0, 0, 20);
 		}
 		*animation = 860;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(860)) {
 			_animationFrame = 0;
 			_animationState = 0;
@@ -358,7 +358,7 @@ bool AIScriptFreeSlotB::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 859;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 1) {
 			Ambient_Sounds_Play_Sound(kSfxRATTY5, 99, 0, 0, 25);
 		}

engines/bladerunner/script/ai/gaff.cpp

@@ -334,7 +334,7 @@ bool AIScriptGaff::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = 794;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -342,7 +342,7 @@ bool AIScriptGaff::UpdateAnimation(int *animation, int *frame) {
 
 	case 1:
 		*animation = 788;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -350,7 +350,7 @@ bool AIScriptGaff::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 798;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -358,7 +358,7 @@ bool AIScriptGaff::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 799;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationState = 2;
 			_animationFrame = 0;
@@ -368,7 +368,7 @@ bool AIScriptGaff::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 800;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationState = 2;
 			_animationFrame = 0;
@@ -378,7 +378,7 @@ bool AIScriptGaff::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 801;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationState = 2;
 			_animationFrame = 0;
@@ -388,7 +388,7 @@ bool AIScriptGaff::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 800;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationState = 2;
 			_animationFrame = 0;
@@ -398,7 +398,7 @@ bool AIScriptGaff::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 801;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationState = 2;
 			_animationFrame = 0;
@@ -408,7 +408,7 @@ bool AIScriptGaff::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 802;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(35) - 1) { // Bug in the game?
 			Actor_Set_Invisible(kActorGaff, true);
 			*animation = 794;

engines/bladerunner/script/ai/general_doll.cpp

@@ -287,7 +287,7 @@ bool AIScriptGeneralDoll::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = 834;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(834)) {
 			_animationFrame = 0;
 		}
@@ -300,7 +300,7 @@ bool AIScriptGeneralDoll::UpdateAnimation(int *animation, int *frame) {
 			_animationFrame = 0;
 			_animationState = 0;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(835)) {
 				_animationFrame = 0;
 			}
@@ -309,7 +309,7 @@ bool AIScriptGeneralDoll::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 833;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(833)) {
 			_animationFrame = 0;
 		}
@@ -317,7 +317,7 @@ bool AIScriptGeneralDoll::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 837;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(837)) {
 			*animation = 834;
 			_animationFrame = 0;
@@ -328,7 +328,7 @@ bool AIScriptGeneralDoll::UpdateAnimation(int *animation, int *frame) {
 	case 4:
 		*animation = 836;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(836) - 1) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 		break;
 

engines/bladerunner/script/ai/gordo.cpp

@@ -730,7 +730,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 					_animationFrame = _frameMin;
 					_frameDelta = 1;
 				}
-				_counter++;
+				++_counter;
 			} else {
 				_animationFrame += _frameDelta;
 				_counterTarget = 0;
@@ -765,7 +765,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 			break;
 		case 1:
 			*animation = 117;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(117)) {
 				*animation = 116;
 				_animationFrame = 0;
@@ -774,7 +774,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 			break;
 		case 2:
 			*animation = 118;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(118)) {
 				*animation = 116;
 				_animationFrame = 0;
@@ -823,7 +823,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 	case 2:
 		*animation = 114;
 		if (Random_Query(0, 1)) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
@@ -832,7 +832,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 115;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(115)) {
 			*animation = 116;
 			_animationState = 0;
@@ -848,7 +848,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 			*animation = 116;
 			_animationState = 0;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 				_animationFrame = 0;
 			}
@@ -857,7 +857,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 121;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(121)) {
 			*animation = 120;
 			_animationFrame = 0;
@@ -867,7 +867,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 122;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(122)) {
 			*animation = 120;
 			_animationFrame = 0;
@@ -877,7 +877,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 123;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(123)) {
 			*animation = 120;
 			_animationFrame = 0;
@@ -887,7 +887,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 124;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(124)) {
 			*animation = 120;
 			_animationFrame = 0;
@@ -897,7 +897,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = 125;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(125)) {
 			*animation = 120;
 			_animationFrame = 0;
@@ -907,7 +907,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 10:
 		*animation = 126;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(126)) {
 			*animation = 120;
 			_animationFrame = 0;
@@ -917,7 +917,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 11:
 		*animation = 127;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(127)) {
 			*animation = 120;
 			_animationFrame = 0;
@@ -927,7 +927,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 12:
 		*animation = 127;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(127)) {
 			*animation = 120;
 			_animationFrame = 0;
@@ -937,7 +937,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 13:
 		*animation = 114;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(114)) {
 			_animationFrame = 0;
 		}
@@ -945,7 +945,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 14:
 		*animation = 103;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(103)) {
 			*animation = 93;
 			_animationFrame = 0;
@@ -955,7 +955,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 15:
 		*animation = 104;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(104)) {
 			*animation = 116;
 			_animationFrame = 0;
@@ -965,7 +965,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 16:
 		*animation = 93;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(93)) {
 			_animationFrame = 0;
 		}
@@ -976,7 +976,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 18:
 		*animation = 105;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 1) {
 			Sound_Play_Speech_Line(kActorGordo, Random_Query(0, 1) ? 9010 : 9015, 75, 0, 99);
 		}
@@ -993,7 +993,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 19:
 		*animation = 111;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(111)) {
 			*animation = 116;
 			_animationFrame = 0;
@@ -1004,7 +1004,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 20:
 		*animation = 112;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(112)) {
 			*animation = 116;
 			_animationFrame = 0;
@@ -1015,7 +1015,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 21:
 		*animation = 96;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(96)) {
 			*animation = 93;
 			_animationFrame = 0;
@@ -1026,7 +1026,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 22:
 		*animation = 97;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(97)) {
 			*animation = 93;
 			_animationFrame = 0;
@@ -1038,7 +1038,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 	case 23:
 		*animation = 113;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(113) - 1) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 		break;
 
@@ -1051,7 +1051,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 25:
 		*animation = 107;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(107)) {
 			_animationFrame = 0;
 		}
@@ -1059,7 +1059,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 26:
 		*animation = 108;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(108)) {
 			_animationFrame = 0;
 		}
@@ -1067,7 +1067,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 27:
 		*animation = 98;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(98)) {
 			_animationFrame = 0;
 		}
@@ -1075,7 +1075,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 28:
 		*animation = 99;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(99)) {
 			_animationFrame = 0;
 		}
@@ -1083,7 +1083,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 29:
 		*animation = 109;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(109)) {
 			_animationFrame = 0;
 		}
@@ -1091,7 +1091,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 30:
 		*animation = 110;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(110)) {
 			_animationFrame = 0;
 		}
@@ -1099,7 +1099,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 31:
 		*animation = 101;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(101)) {
 			_animationFrame = 0;
 		}
@@ -1107,7 +1107,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 32:
 		*animation = 102;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(102)) {
 			_animationFrame = 0;
 		}
@@ -1115,7 +1115,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 33:
 		*animation = 106;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(106)) {
 			*animation = 93;
 			_animationState = 16;
@@ -1130,7 +1130,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 34:
 		*animation = 119;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(119)) {
 			if (Game_Flag_Query(kFlagNR02GordoLeaveLighter)) {
 				Game_Flag_Reset(kFlagNR02GordoLeaveLighter);
@@ -1150,7 +1150,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 35:
 		*animation = 128;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(128)) {
 			_animationFrame = 0;
 		}
@@ -1163,7 +1163,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 35;
 		} else {
 			*animation = 129;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(129)) {
 				_animationFrame = 0;
 			}
@@ -1177,7 +1177,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 35;
 		} else {
 			*animation = 130;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(130)) {
 				_animationFrame = 0;
 			}
@@ -1186,7 +1186,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 38:
 		*animation = 131;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 7) {
 			if (Actor_Query_Goal_Number(kActorGordo) == kGoalGordoNR01HostageDie) {
 				Actor_Set_Goal_Number(kActorTaffyPatron, 255);
@@ -1204,7 +1204,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
 
 	case 39:
 		*animation = 132;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 6) {
 			Actor_Set_Goal_Number(kActorTaffyPatron, 250);
 			Actor_Change_Animation_Mode(kActorGordo, kAnimationModeCombatDie);

engines/bladerunner/script/ai/grigorian.cpp

@@ -105,9 +105,9 @@ bool AIScriptGrigorian::UpdateAnimation(int *animation, int *frame) {
 		if (var_45CA10 == 0) {
 			*animation = 478;
 			if (var_45CA14) {
-				var_45CA14--;
+				--var_45CA14;
 			} else {
-				_animationFrame++;
+				++_animationFrame;
 				if (_animationFrame == 5 || _animationFrame == 13) {
 					var_45CA14 = Random_Query(2, 4);
 				}
@@ -118,7 +118,7 @@ bool AIScriptGrigorian::UpdateAnimation(int *animation, int *frame) {
 			}
 		} else if (var_45CA10 == 1) {
 			*animation = 479;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(479)) {
 				*animation = 478;
 				_animationFrame = 0;
@@ -127,9 +127,9 @@ bool AIScriptGrigorian::UpdateAnimation(int *animation, int *frame) {
 		} else if (var_45CA10 == 2) {
 			*animation = 480;
 			if (var_45CA14) {
-				var_45CA14--;
+				--var_45CA14;
 			} else {
-				_animationFrame++;
+				++_animationFrame;
 				if (_animationFrame >= 8 && _animationFrame <= 10) {
 					var_45CA14 = Random_Query(2, 4);
 				}
@@ -143,21 +143,21 @@ bool AIScriptGrigorian::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 1:
 		*animation = 479;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(479)) {
 			_animationFrame = 0;
 		}
 		break;
 	case 2:
 		*animation = 481;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(481)) {
 			_animationFrame = 0;
 		}
 		break;
 	case 3:
 		*animation = 482;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(482)) {
 			_animationState = 2;
 			_animationFrame = 0;
@@ -166,7 +166,7 @@ bool AIScriptGrigorian::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 4:
 		*animation = 483;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(483)) {
 			_animationState = 2;
 			_animationFrame = 0;
@@ -175,7 +175,7 @@ bool AIScriptGrigorian::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 5:
 		*animation = 484;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(484)) {
 			_animationState = 2;
 			_animationFrame = 0;
@@ -184,7 +184,7 @@ bool AIScriptGrigorian::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 6:
 		*animation = 485;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(485)) {
 			_animationState = 2;
 			_animationFrame = 0;
@@ -193,7 +193,7 @@ bool AIScriptGrigorian::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 7:
 		*animation = 486;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(486)) {
 			_animationState = 2;
 			_animationFrame = 0;

engines/bladerunner/script/ai/guzza.cpp

@@ -328,7 +328,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 		switch (_state) {
 		case 0:
 			*animation = 197;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(197)) {
 				_animationFrame = 0;
 				if (Random_Query(0, 5) == 0) {
@@ -338,7 +338,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 			break;
 		case 1:
 			*animation = 198;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(198)) {
 				*animation = 197;
 				_animationFrame = 0;
@@ -347,7 +347,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 			break;
 		case 2:
 			*animation = 199;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(199)) {
 				*animation = 197;
 				_animationFrame = 0;
@@ -362,7 +362,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 		case 0:
 			*animation = 189;
 			if (_counter) {
-				_counter--;
+				--_counter;
 				if (Random_Query(0, 6) == 0) {
 					_frameDelta = -_frameDelta;
 				}
@@ -388,7 +388,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 			break;
 		case 1:
 			*animation = 190;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(190)) {
 				*animation = 189;
 				_animationFrame = 0;
@@ -397,7 +397,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 			break;
 		case 2:
 			*animation = 191;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(191)) {
 				if (Random_Query(0, 2) == 0) {
 					*animation = 189;
@@ -455,7 +455,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 185;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(185)) {
 			_animationFrame = 0;
 		}
@@ -463,7 +463,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 186;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(186)) {
 			_animationFrame = 0;
 		}
@@ -471,7 +471,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 176;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(176)) {
 			_animationFrame = 0;
 		}
@@ -479,7 +479,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 177;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(177)) {
 			_animationFrame = 0;
 		}
@@ -487,7 +487,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 181;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(181)) {
 			_animationFrame = 0;
 		}
@@ -495,7 +495,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = 187;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(187)) {
 			_animationFrame = 0;
 		}
@@ -503,7 +503,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 10:
 		*animation = 188;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(188)) {
 			_animationFrame = 0;
 		}
@@ -519,7 +519,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 			_frameDelta = 1;
 		} else {
 			*animation = 201;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(201)) {
 				_animationFrame = 0;
 			}
@@ -528,7 +528,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 12:
 		*animation = 202;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(202)) {
 			*animation = 201;
 			_animationFrame = 0;
@@ -538,7 +538,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 13:
 		*animation = 203;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(203)) {
 			*animation = 201;
 			_animationFrame = 0;
@@ -548,7 +548,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 14:
 		*animation = 204;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(204)) {
 			*animation = 201;
 			_animationFrame = 0;
@@ -558,7 +558,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 15:
 		*animation = 205;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(205)) {
 			*animation = 201;
 			_animationFrame = 0;
@@ -568,7 +568,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 16:
 		*animation = 206;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(206)) {
 			*animation = 201;
 			_animationFrame = 0;
@@ -587,7 +587,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 			_frameDelta = 1;
 		} else {
 			*animation = 192;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(192)) {
 				_animationFrame = 0;
 			}
@@ -596,7 +596,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 18:
 		*animation = 193;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(193)) {
 			*animation = 192;
 			_animationFrame = 0;
@@ -606,7 +606,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 19:
 		*animation = 194;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(194)) {
 			*animation = 192;
 			_animationState = 17;
@@ -616,7 +616,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 20:
 		*animation = 195;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(195)) {
 			*animation = 192;
 			_animationFrame = 0;
@@ -626,7 +626,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 21:
 		*animation = 196;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(196)) {
 			*animation = 192;
 			_animationFrame = 0;
@@ -645,7 +645,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 			_frameDelta = 1;
 		} else {
 			*animation = 179;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(179)) {
 				_animationFrame = 0;
 			}
@@ -663,7 +663,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 			_frameDelta = 1;
 		} else {
 			*animation = 180;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(180)) {
 				_animationFrame = 0;
 			}
@@ -679,7 +679,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 25:
 		*animation = 173;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(173)) {
 			_animationFrame = 0;
 		}
@@ -687,7 +687,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 26:
 		*animation = 174;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(174)) {
 			*animation = 172;
 			_animationFrame = 0;
@@ -698,7 +698,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 27:
 		*animation = 175;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(175)) {
 			*animation = 172;
 			_animationFrame = 0;
@@ -709,7 +709,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 29:
 		*animation = 182;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(182)) {
 			*animation = 172;
 			_animationFrame = 0;
@@ -719,7 +719,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 30:
 		*animation = 183;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(183)) {
 			*animation = 197;
 			_animationFrame = 0;
@@ -729,7 +729,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 31:
 		*animation = 184;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(184)) {
 			*animation = 172;
 			_animationFrame = 0;
@@ -740,7 +740,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 32:
 		*animation = 200;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(200)) {
 			*animation = 197;
 			_animationFrame = 0;
@@ -751,7 +751,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
 
 	case 33:
 		*animation = 207;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(207)) {
 			_animationFrame = Slice_Animation_Query_Number_Of_Frames(*animation) - 1;
 			float x, y, z;

engines/bladerunner/script/ai/hanoi.cpp

@@ -348,7 +348,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 	case 0:
 		if (_flag1) {
 			*animation = 649;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 				*animation = 648;
 				_animationFrame = 0;
@@ -359,7 +359,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 
 		*animation = 648;
 		if (_var3 != 0) {
-			_var3--;
+			--_var3;
 			if (!Random_Query(0, 6)) {
 				_var4 = -_var4;
 			}
@@ -420,7 +420,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 657;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 3;
@@ -430,7 +430,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 658;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -438,7 +438,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 659;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 3;
@@ -448,7 +448,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 657;
-		_animationFrame--;
+		--_animationFrame;
 		if (_animationFrame == 0) {
 			_animationState = 0;
 			_animationFrame = 0;
@@ -468,7 +468,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 345;  // Sadik is used in this animation, but he is well hidden
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > 26) {
 			Actor_Change_Animation_Mode(kActorHanoi, kAnimationModeIdle);
 			_animationState = 0;
@@ -481,7 +481,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 645;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -489,7 +489,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 642;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -497,7 +497,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = 643;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			Actor_Change_Animation_Mode(kActorHanoi, kAnimationModeCombatIdle);
 			_animationState = 8;
@@ -509,7 +509,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 
 	case 10:
 		*animation = 644;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame == 4) {
 			Ambient_Sounds_Play_Sound(kSfxSHOTCOK1, 77, 0, 0, 20);
@@ -534,7 +534,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 
 	case 11:
 		*animation = 660;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			*animation = 648;
 			_animationFrame = 0;
@@ -544,7 +544,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 
 	case 12:
 		*animation = 646;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			*animation = 642;
 			_animationFrame = 0;
@@ -555,7 +555,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 	case 13:
 		*animation = 647;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 		break;
 
@@ -566,7 +566,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 		) {
 			_animationState = 0;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 				_animationFrame = 0;
 			}
@@ -575,7 +575,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 
 	case 15:
 		*animation = 651;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 14;
@@ -585,7 +585,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 
 	case 16:
 		*animation = 652;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 14;
@@ -595,7 +595,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 
 	case 17:
 		*animation = 653;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 14;
@@ -605,7 +605,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 
 	case 18:
 		*animation = 654;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 14;
@@ -615,7 +615,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 
 	case 19:
 		*animation = 655;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 14;
@@ -625,7 +625,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 
 	case 20:
 		*animation = 656;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 14;

engines/bladerunner/script/ai/hasan.cpp

@@ -215,10 +215,10 @@ bool AIScriptHasan::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 
 bool AIScriptHasan::UpdateAnimation(int *animation, int *frame) {
 	if (_var4) {
-		_var4--;
+		--_var4;
 	}
 	if (_var5) {
-		_var5--;
+		--_var5;
 	}
 
 	switch (_animationState) {
@@ -226,9 +226,9 @@ bool AIScriptHasan::UpdateAnimation(int *animation, int *frame) {
 		if (_var6 == 1) {
 			*animation = kModelAnimationHasanTalkSuggest;
 			if (_var3) {
-				_var3--;
+				--_var3;
 			} else {
-				_animationFrame++;
+				++_animationFrame;
 				if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationHasanTalkSuggest)) {
 					_animationFrame = 0;
 					_var6 = 0;
@@ -244,9 +244,9 @@ bool AIScriptHasan::UpdateAnimation(int *animation, int *frame) {
 		} else if (_var6 == 2) {
 			*animation = kModelAnimationHasanTakingABiteSnakeMove;
 			if (_var3) {
-				_var3--;
+				--_var3;
 			} else {
-				_animationFrame++;
+				++_animationFrame;
 				if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationHasanTakingABiteSnakeMove)) {
 					_animationFrame = 0;
 					_var6 = 0;
@@ -265,7 +265,7 @@ bool AIScriptHasan::UpdateAnimation(int *animation, int *frame) {
 		} else if (_var6 == 0) {
 			*animation = kModelAnimationHasanIdleSlightMovement;
 			if (_var3) {
-				_var3--;
+				--_var3;
 			} else {
 				_animationFrame += _var2;
 				if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationHasanIdleSlightMovement)) {
@@ -294,7 +294,7 @@ bool AIScriptHasan::UpdateAnimation(int *animation, int *frame) {
 
 	case 1:
 		*animation = kModelAnimationHasanTalkMovingBothHands;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationHasanTalkMovingBothHands)) {
 			_animationFrame = 0;
 		}
@@ -302,7 +302,7 @@ bool AIScriptHasan::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = kModelAnimationHasanTalkLeftRightLeftGesture;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationHasanTalkLeftRightLeftGesture)) {
 			_animationFrame = 0;
 			_animationState = 1;
@@ -312,7 +312,7 @@ bool AIScriptHasan::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = kModelAnimationHasanTalkRaiseHandSnakeMove;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationHasanTalkRaiseHandSnakeMove)) {
 			_animationFrame = 0;
 			_animationState = 1;
@@ -322,7 +322,7 @@ bool AIScriptHasan::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = kModelAnimationHasanTalkMovingBothHandsAndNod;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationHasanTalkMovingBothHandsAndNod)) {
 			_animationFrame = 0;
 			_animationState = 1;
@@ -332,7 +332,7 @@ bool AIScriptHasan::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = kModelAnimationHasanTalkWipeFaceLeftHand02;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationHasanTalkWipeFaceLeftHand02)) {
 			_animationFrame = 0;
 			_animationState = 1;
@@ -342,7 +342,7 @@ bool AIScriptHasan::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = kModelAnimationHasanTalkUpset;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationHasanTalkUpset)) {
 			_animationFrame = 0;
 			_animationState = 1;

engines/bladerunner/script/ai/hawkers_barkeep.cpp

@@ -123,7 +123,7 @@ bool AIScriptHawkersBarkeep::UpdateAnimation(int *animation, int *frame) {
 			*animation = 705;
 
 			if (_var2) {
-				_var2--;
+				--_var2;
 
 				if (Random_Query(0, 6) == 0) {
 					_var3 = -_var3;
@@ -178,7 +178,7 @@ bool AIScriptHawkersBarkeep::UpdateAnimation(int *animation, int *frame) {
 			*animation = 707;
 
 			if (_var2) {
-				_var2--;
+				--_var2;
 
 				if (_var2 == 0)
 					_var3 = 2 * Random_Query(0, 1) - 1;
@@ -196,7 +196,7 @@ bool AIScriptHawkersBarkeep::UpdateAnimation(int *animation, int *frame) {
 					_var2 = Random_Query(5, 15);
 				}
 
-				_animationFrame++;
+				++_animationFrame;
 				if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(707)) {
 					*animation = 705;
 					_animationFrame = 0;
@@ -214,7 +214,7 @@ bool AIScriptHawkersBarkeep::UpdateAnimation(int *animation, int *frame) {
 			*animation = _animationNext;
 		} else if (_var1 == 1) {
 			*animation = 706;
-			_animationFrame++;
+			++_animationFrame;
 
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(706)) {
 				_animationFrame = 0;
@@ -241,7 +241,7 @@ bool AIScriptHawkersBarkeep::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 0;
 			_var1 = 0;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(710)) {
 				_animationFrame = 0;
@@ -251,7 +251,7 @@ bool AIScriptHawkersBarkeep::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 711;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(711)) {
 			_animationFrame = 0;
@@ -262,7 +262,7 @@ bool AIScriptHawkersBarkeep::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 712;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(712)) {
 			_animationFrame = 0;
@@ -273,7 +273,7 @@ bool AIScriptHawkersBarkeep::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 713;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(713)) {
 			_animationFrame = 0;
@@ -284,7 +284,7 @@ bool AIScriptHawkersBarkeep::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 714;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(714)) {
 			_animationFrame = 0;
@@ -295,7 +295,7 @@ bool AIScriptHawkersBarkeep::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 715;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(715)) {
 			_animationFrame = 0;
@@ -306,7 +306,7 @@ bool AIScriptHawkersBarkeep::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 708;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(708)) {
 			*animation = 705;
@@ -317,7 +317,7 @@ bool AIScriptHawkersBarkeep::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = 709;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(709)) {
 			*animation = 705;

engines/bladerunner/script/ai/holloway.cpp

@@ -207,7 +207,7 @@ bool AIScriptHolloway::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = 717;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(717)) {
 			_animationFrame = 0;
 		}
@@ -215,7 +215,7 @@ bool AIScriptHolloway::UpdateAnimation(int *animation, int *frame) {
 
 	case 1:
 		*animation = 719;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame == 9) {
 			Ambient_Sounds_Play_Sound(kSfxKICK1, 90, 99, 0, 0);
@@ -242,7 +242,7 @@ bool AIScriptHolloway::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 0;
 		} else {
 			*animation = 720;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(720)) {
 				_animationFrame = 0;
 			}
@@ -251,7 +251,7 @@ bool AIScriptHolloway::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 721;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(721)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -261,7 +261,7 @@ bool AIScriptHolloway::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 721;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(721)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -271,7 +271,7 @@ bool AIScriptHolloway::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 721;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(721)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -281,7 +281,7 @@ bool AIScriptHolloway::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 721;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(721)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -291,7 +291,7 @@ bool AIScriptHolloway::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 716;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(716)) {
 			_animationFrame = 0;
 		}

engines/bladerunner/script/ai/howie_lee.cpp

@@ -323,7 +323,7 @@ bool AIScriptHowieLee::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 bool AIScriptHowieLee::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
-		_animationFrame++;
+		++_animationFrame;
 		if (var_45DFB8) {
 			*animation = 673;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(673)) {
@@ -344,7 +344,7 @@ bool AIScriptHowieLee::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 1:
 		*animation = 674;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(674)) {
 			_animationFrame = 0;
 			if (_animationState < 3 || _animationState > 8) {
@@ -359,7 +359,7 @@ bool AIScriptHowieLee::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 2:
 		*animation = 672;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(672)) {
 			_animationFrame = 0;
 		}
@@ -372,7 +372,7 @@ bool AIScriptHowieLee::UpdateAnimation(int *animation, int *frame) {
 			var_45DFB8 = Random_Query(0, 1);
 			*animation = 671;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(676)) {
 				_animationFrame = 0;
 			}
@@ -381,7 +381,7 @@ bool AIScriptHowieLee::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 4:
 		*animation = 677;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(677)) {
 			_animationState = 3;
 			_animationFrame = 0;
@@ -390,7 +390,7 @@ bool AIScriptHowieLee::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 5:
 		*animation = 678;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(678)) {
 			_animationState = 3;
 			_animationFrame = 0;
@@ -399,7 +399,7 @@ bool AIScriptHowieLee::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 6:
 		*animation = 679;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(679)) {
 			_animationState = 3;
 			_animationFrame = 0;
@@ -408,7 +408,7 @@ bool AIScriptHowieLee::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 7:
 		*animation = 680;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(680)) {
 			_animationState = 3;
 			_animationFrame = 0;
@@ -417,7 +417,7 @@ bool AIScriptHowieLee::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 8:
 		*animation = 681;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(681)) {
 			_animationState = 3;
 			_animationFrame = 0;

engines/bladerunner/script/ai/insect_dealer.cpp

@@ -134,7 +134,7 @@ bool AIScriptInsectDealer::UpdateAnimation(int *animation, int *frame) {
 		case 0:
 			*animation = 545;
 			if (_counter) {
-				_counter--;
+				--_counter;
 				if (Random_Query(0, 6) == 0) {
 					_frameDelta = -_frameDelta;
 				}
@@ -158,7 +158,7 @@ bool AIScriptInsectDealer::UpdateAnimation(int *animation, int *frame) {
 			break;
 		case 1:
 			*animation = 546;
-			_animationFrame++;
+			++_animationFrame;
 
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(546)) {
 				*animation = 545;
@@ -179,7 +179,7 @@ bool AIScriptInsectDealer::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 0;
 		} else {
 			*animation = 548;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(548)) {
 				_animationFrame = 0;
 				_animationState = 0;
@@ -188,7 +188,7 @@ bool AIScriptInsectDealer::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 2:
 		*animation = 549;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(549)) {
 			*animation = 548;
 			_animationFrame = 0;
@@ -197,7 +197,7 @@ bool AIScriptInsectDealer::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 3:
 		*animation = 550;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(550)) {
 			*animation = 548;
 			_animationFrame = 0;
@@ -206,7 +206,7 @@ bool AIScriptInsectDealer::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 4:
 		*animation = 551;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(551)) {
 			*animation = 548;
 			_animationFrame = 0;
@@ -215,7 +215,7 @@ bool AIScriptInsectDealer::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 5:
 		*animation = 552;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(552)) {
 			*animation = 548;
 			_animationFrame = 0;
@@ -224,7 +224,7 @@ bool AIScriptInsectDealer::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 6:
 		*animation = 553;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(553)) {
 			*animation = 548;
 			_animationFrame = 0;
@@ -233,7 +233,7 @@ bool AIScriptInsectDealer::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 7:
 		*animation = 554;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(554)) {
 			*animation = 548;
 			_animationFrame = 0;
@@ -242,7 +242,7 @@ bool AIScriptInsectDealer::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 8:
 		*animation = 547;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(547)) {
 			*animation = 545;
 			_animationFrame = 0;

engines/bladerunner/script/ai/isabella.cpp

@@ -106,7 +106,7 @@ bool AIScriptIsabella::UpdateAnimation(int *animation, int *frame) {
 	case 0:
 		if (_var3 == 1) {
 			*animation = 839;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(839) - 1) {
 				_animationFrame = 0;
 			}
@@ -120,7 +120,7 @@ bool AIScriptIsabella::UpdateAnimation(int *animation, int *frame) {
 		} else if (_var3 == 0) {
 			*animation = 838;
 			if (_var2) {
-				_var2--;
+				--_var2;
 				if (_var2 == 0) {
 					_var4 = 2 * Random_Query(0, 1) - 1;
 				}
@@ -158,7 +158,7 @@ bool AIScriptIsabella::UpdateAnimation(int *animation, int *frame) {
 
 	case 1:
 		*animation = 840;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(840) - 1) {
 			flag = true;
 			_animationFrame = 0;
@@ -182,7 +182,7 @@ bool AIScriptIsabella::UpdateAnimation(int *animation, int *frame) {
 			_animationFrame = 0;
 			_animationState = 0;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(841) - 1) {
 				_animationFrame = 0;
 			} else {
@@ -202,7 +202,7 @@ bool AIScriptIsabella::UpdateAnimation(int *animation, int *frame) {
 			_animationFrame = 0;
 			_animationState = 0;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(842) - 1) {
 				_animationFrame = 0;
 			} else {
@@ -219,7 +219,7 @@ bool AIScriptIsabella::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 843;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(843) - 1) {
 			flag = true;
 			_animationFrame = 0;
@@ -239,7 +239,7 @@ bool AIScriptIsabella::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 844;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(844) - 1) {
 			flag = true;
 			_animationFrame = 0;
@@ -259,7 +259,7 @@ bool AIScriptIsabella::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 845;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(845) - 1) {
 			flag = true;
 			_animationFrame = 0;
@@ -279,7 +279,7 @@ bool AIScriptIsabella::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 845;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(845) - 1) {
 			flag = true;
 			_animationFrame = 0;
@@ -299,7 +299,7 @@ bool AIScriptIsabella::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 844;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(844) - 1) {
 			flag = true;
 			_animationFrame = 0;

engines/bladerunner/script/ai/izo.cpp

@@ -525,7 +525,7 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
 	case 0:
 		if (_var4 == 1) {
 			*animation = 298;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(298)) {
 				_animationFrame = 0;
 				_var4 = 0;
@@ -533,7 +533,7 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
 		} else if (_var4 == 0) {
 			*animation = 297;
 			if (_var3) {
-				_var3--;
+				--_var3;
 			} else {
 				_animationFrame += _var2;
 				if (_animationFrame < 0) {
@@ -564,7 +564,7 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
 			_flag = 0;
 		} else {
 			*animation = 299;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(299)) {
 				_animationFrame = 0;
 			}
@@ -578,7 +578,7 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
 	case 6:
 	case 7:
 		*animation = _animationState + 298;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 1;
@@ -588,7 +588,7 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 277;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(277)) {
 			_animationFrame = 0;
 		}
@@ -596,7 +596,7 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = 287;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(287)) {
 			_animationFrame = 0;
 			_animationState = 8;
@@ -606,7 +606,7 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
 
 	case 10:
 		*animation = 288;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(288)) {
 			*animation = 297;
 			_animationFrame = 0;
@@ -617,7 +617,7 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
 
 	case 11:
 		*animation = 289;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 6) {
 			int snd;
 			if (Random_Query(1, 2) == 1) {
@@ -660,7 +660,7 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
 		if (_animationState == 17) {
 			*animation = 281;
 		}
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 8;
@@ -672,7 +672,7 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
 	case 14:
 	case 15:
 		*animation = _animationFrame + 280;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= 2
 		 && (Actor_Query_Goal_Number(kActorIzo) == kGoalIzoRC03Walk
 		  || Actor_Query_Goal_Number(kActorIzo) == kGoalIzoRC03Run
@@ -703,7 +703,7 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
 		if (_animationState == 19) {
 			*animation = 296;
 		}
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			_animationFrame = Slice_Animation_Query_Number_Of_Frames(*animation) - 1;
 			_animationState = 30;
@@ -750,7 +750,7 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
 		if (_animationState == 28) {
 			*animation = 306;
 		}
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -763,7 +763,7 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
 
 	case 31:
 		*animation = 308;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(308)) {
 			_animationFrame = 0;
 		}
@@ -771,7 +771,7 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
 
 	case 32:
 		*animation = 309;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(309)) {
 			_animationFrame = 0;
 			_animationState = 31;
@@ -782,7 +782,7 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
 	case 33:
 		*animation = 310;
 		if (_animationFrame || !_flag) {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(310)) {
 				_animationFrame = 0;
 			}
@@ -795,7 +795,7 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
 
 	case 34:
 		*animation = 311;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 6) {
 			Scene_Loop_Set_Default(0); // // HC01 - MainLoop
 			Scene_Loop_Start_Special(kSceneLoopModeOnce, 2, true); // HC01 - IzoFlashLoop

engines/bladerunner/script/ai/klein.cpp

@@ -355,7 +355,7 @@ bool AIScriptKlein::UpdateAnimation(int *animation, int *frame) {
 		    || Actor_Query_Goal_Number(kActorKlein) == kGoalKleinMovingInLab02
 		) {
 			*animation = kModelAnimationKleinWorkingOnInstruments;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationKleinWorkingOnInstruments)) {
 				_animationFrame = 0;
 			}
@@ -363,7 +363,7 @@ bool AIScriptKlein::UpdateAnimation(int *animation, int *frame) {
 		           && Actor_Query_Goal_Number(kActorKlein) == kGoalKleinGotoLabSpeaker
 		) {
 			*animation = kModelAnimationKleinStandingIdle;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationKleinStandingIdle)) {
 				_animationFrame = 0;
 				if (Random_Query(1, 10) == 1) {
@@ -374,7 +374,7 @@ bool AIScriptKlein::UpdateAnimation(int *animation, int *frame) {
 			if (Game_Flag_Query(kFlagKleinAnimation3)
 			    && Actor_Query_Goal_Number(kActorKlein) == kGoalKleinGotoLabSpeaker
 			) {
-				_animationFrame--;
+				--_animationFrame;
 				if (_animationFrame < 0) {
 					_animationFrame = 0;
 				}
@@ -407,21 +407,21 @@ bool AIScriptKlein::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 1:
 		*animation = kModelAnimationKleinWalking;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationKleinWalking)) {
 			_animationFrame = 0;
 		}
 		break;
 	case 2:
 		*animation = kModelAnimationKleinTalkSmallLeftHandMove;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationKleinTalkSmallLeftHandMove)) {
 			_animationFrame = 0;
 		}
 		break;
 	case 3:
 		*animation = kModelAnimationKleinTalkRightHandTouchFace;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationKleinTalkRightHandTouchFace)) {
 			_animationState = 2;
 			_animationFrame = 0;
@@ -430,7 +430,7 @@ bool AIScriptKlein::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 4:
 		*animation = kModelAnimationKleinTalkWideHandMotion;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationKleinTalkWideHandMotion)) {
 			_animationState = 2;
 			_animationFrame = 0;
@@ -439,7 +439,7 @@ bool AIScriptKlein::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 5:
 		*animation = kModelAnimationKleinTalkSuggestOrAsk;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationKleinTalkSuggestOrAsk)) {
 			_animationState = 2;
 			_animationFrame = 0;
@@ -448,7 +448,7 @@ bool AIScriptKlein::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 6:
 		*animation = kModelAnimationKleinTalkDismissive;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationKleinTalkDismissive)) {
 			_animationState = 2;
 			_animationFrame = 0;
@@ -457,7 +457,7 @@ bool AIScriptKlein::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 7:
 		*animation = kModelAnimationKleinTalkRaisingBothHands;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame>= Slice_Animation_Query_Number_Of_Frames(kModelAnimationKleinTalkRaisingBothHands)) {
 			_animationState = 2;
 			_animationFrame = 0;

engines/bladerunner/script/ai/leon.cpp

@@ -272,7 +272,7 @@ bool AIScriptLeon::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = 847;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(847)) {
 			_animationFrame = 0;
 		}
@@ -280,7 +280,7 @@ bool AIScriptLeon::UpdateAnimation(int *animation, int *frame) {
 
 	case 1:
 		*animation = 846;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(846)) {
 			_animationFrame = 0;
 		}
@@ -294,7 +294,7 @@ bool AIScriptLeon::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 0;
 		} else {
 			*animation = 850;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(850)) {
 				_animationFrame = 0;
 			}
@@ -303,7 +303,7 @@ bool AIScriptLeon::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 851;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(851)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -313,7 +313,7 @@ bool AIScriptLeon::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 852;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(852)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -323,7 +323,7 @@ bool AIScriptLeon::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 853;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(853)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -339,7 +339,7 @@ bool AIScriptLeon::UpdateAnimation(int *animation, int *frame) {
 			*animation = 848;
 		} else {
 			*animation = 854;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(854)) {
 				_animationFrame = 0;
 			}
@@ -348,7 +348,7 @@ bool AIScriptLeon::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 855;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(855)) {
 			_animationFrame = 0;
 			_animationState = 6;
@@ -358,7 +358,7 @@ bool AIScriptLeon::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 854;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(854)) {
 			_animationFrame = 0;
 		}
@@ -366,7 +366,7 @@ bool AIScriptLeon::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = 849;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(849)) {
 			Actor_Change_Animation_Mode(kActorLeon, kAnimationModeIdle);
 			*animation = 847;
@@ -380,7 +380,7 @@ bool AIScriptLeon::UpdateAnimation(int *animation, int *frame) {
 
 	case 10:
 		*animation = 856;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 6) {
 			Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeDie);
 			Actor_Retired_Here(kActorMcCoy, 12, 12, true, -1);

engines/bladerunner/script/ai/lucy.cpp

@@ -543,7 +543,7 @@ bool AIScriptLucy::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = 260;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(260)) {
 			_animationFrame = 0;
 		}
@@ -565,7 +565,7 @@ bool AIScriptLucy::UpdateAnimation(int *animation, int *frame) {
 		if (_animationState == 4) {
 			*animation = 256;
 		}
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -579,7 +579,7 @@ bool AIScriptLucy::UpdateAnimation(int *animation, int *frame) {
 		if (_animationState == 6) {
 			*animation = 258;
 		}
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			*animation = 260;
 			_animationFrame = 0;
@@ -602,7 +602,7 @@ bool AIScriptLucy::UpdateAnimation(int *animation, int *frame) {
 			_flag = 0;
 		} else {
 			*animation = 263;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(263)) {
 				_animationFrame = 0;
 			}
@@ -641,7 +641,7 @@ bool AIScriptLucy::UpdateAnimation(int *animation, int *frame) {
 		if (_animationState == 16) {
 			*animation = 271;
 		}
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 8;
@@ -651,7 +651,7 @@ bool AIScriptLucy::UpdateAnimation(int *animation, int *frame) {
 
 	case 17:
 		*animation = 272;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(272)) {
 			_animationFrame = 0;
 		}
@@ -664,7 +664,7 @@ bool AIScriptLucy::UpdateAnimation(int *animation, int *frame) {
 			*animation = 272;
 		} else {
 			*animation = 273;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(273)) {
 				_animationFrame = 0;
 			}
@@ -673,7 +673,7 @@ bool AIScriptLucy::UpdateAnimation(int *animation, int *frame) {
 
 	case 19:
 		*animation = 274;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(274)) {
 			*animation = 260;
 			_animationFrame = 0;
@@ -683,7 +683,7 @@ bool AIScriptLucy::UpdateAnimation(int *animation, int *frame) {
 
 	case 20:
 		*animation = 275;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(275)) {
 			_animationFrame = 0;
 		}
@@ -691,7 +691,7 @@ bool AIScriptLucy::UpdateAnimation(int *animation, int *frame) {
 
 	case 21:
 		*animation = 276;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(276)) {
 			_animationFrame = 0;
 		}

engines/bladerunner/script/ai/luther.cpp

@@ -247,7 +247,7 @@ bool AIScriptLuther::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = 346;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -255,7 +255,7 @@ bool AIScriptLuther::UpdateAnimation(int *animation, int *frame) {
 
 	case 1:
 		*animation = 348;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			*animation = 346;
 			_animationFrame = 0;
@@ -272,7 +272,7 @@ bool AIScriptLuther::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 0;
 		} else {
 			*animation = 349;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 				_animationFrame = 0;
 			}
@@ -281,7 +281,7 @@ bool AIScriptLuther::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 350;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -291,7 +291,7 @@ bool AIScriptLuther::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 351;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -301,7 +301,7 @@ bool AIScriptLuther::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 352;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -311,7 +311,7 @@ bool AIScriptLuther::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 353;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -321,7 +321,7 @@ bool AIScriptLuther::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 354;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -331,7 +331,7 @@ bool AIScriptLuther::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 355;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -341,7 +341,7 @@ bool AIScriptLuther::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = 356;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			*animation = 346;
 			_animationFrame = 0;
@@ -352,7 +352,7 @@ bool AIScriptLuther::UpdateAnimation(int *animation, int *frame) {
 
 	case 10:
 		*animation = 357;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			Actor_Change_Animation_Mode(kActorLuther, 50);
 			*animation = 358;
@@ -363,7 +363,7 @@ bool AIScriptLuther::UpdateAnimation(int *animation, int *frame) {
 	case 11:
 		*animation = 358;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 		break;
 
@@ -373,7 +373,7 @@ bool AIScriptLuther::UpdateAnimation(int *animation, int *frame) {
 			Ambient_Sounds_Play_Sound(kSfxHEADHIT2, 59, 0, 0, 20);
 		}
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 		break;
 

engines/bladerunner/script/ai/maggie.cpp

@@ -409,7 +409,7 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
 
 	case kMaggieStateExploding:
 		*animation = 874;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(874) - 1) {
 			_animationState = kMaggieStateDeadExploded;
 			_animationFrame = Slice_Animation_Query_Number_Of_Frames(*animation) - 1;
@@ -420,7 +420,7 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
 
 	case kMaggieStateBombJumping:
 		*animation = 873;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(873)) {
 			_animationState = kMaggieStateBombIdle;
 			_animationFrame = 0;
@@ -431,7 +431,7 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
 
 	case kMaggieStateBombWalk:
 		*animation = 872;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(872)) {
 			_animationFrame = 0;
 		}
@@ -439,7 +439,7 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
 
 	case kMaggieStateBombIdle:
 		*animation = 875;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(875)) {
 			_animationFrame = 0;
 		}
@@ -447,7 +447,7 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
 
 	case kMaggieStateWakingUp:
 		*animation = 876;
-		_animationFrame--;
+		--_animationFrame;
 		if (_animationFrame > 0) {
 			break;
 		}
@@ -474,7 +474,7 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
 
 	case kMaggieStateGoingToSleep:
 		*animation = 876;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(876) - 1) {
 			_animationState = kMaggieStateSleeping;
 			Actor_Set_Goal_Number(kActorMaggie, kGoalMaggieMA02Sleep);
@@ -483,7 +483,7 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
 
 	case kMaggieStateStandingUp:
 		*animation = 868;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(868)) {
 			*animation = 864;
 			_animationState = kMaggieStateIdle;
@@ -499,7 +499,7 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
 
 	case kMaggieStateLayingIdle:
 		*animation = 867;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(867)) {
 			_animationFrame = 0;
 		}
@@ -507,7 +507,7 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
 
 	case kMaggieStateLayingDown:
 		*animation = 866;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(866)) {
 			_animationState = kMaggieStateLayingIdle;
 			_animationFrame = 0;
@@ -520,10 +520,10 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
 
 	case kMaggieStateHappyB:
 		*animation = 865;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(865)) {
 			_animationFrame = 0;
-			var_45F3F8--;
+			--var_45F3F8;
 			if (var_45F3F8 <= 0) {
 				Actor_Change_Animation_Mode(kActorMaggie, kAnimationModeIdle);
 				*animation = 864;
@@ -537,9 +537,9 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
 			// one of kSfxDOGBARK1, kSfxDOGBARK3
 			Sound_Play(Random_Query(kSfxDOGBARK1, kSfxDOGBARK3), 50, 0, 0, 50);
 		}
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
-			var_45F3FC--;
+			--var_45F3FC;
 			if (var_45F3FC <= 0) {
 				Actor_Change_Animation_Mode(kActorMaggie, kAnimationModeIdle);
 				*animation = 864;
@@ -551,7 +551,7 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
 
 	case kMaggieStateJumping:
 		*animation = 869;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(869)) {
 			Actor_Change_Animation_Mode(kActorMaggie, kAnimationModeIdle);
 			*animation = 864;
@@ -562,7 +562,7 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
 
 	case kMaggieStateWalking:
 		*animation = 863;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(863)) {
 			_animationFrame = 0;
 		}
@@ -570,7 +570,7 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
 
 	case kMaggieStateIdle:
 		*animation = 864;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(864)) {
 			_animationFrame = 0;
 		}

engines/bladerunner/script/ai/mccoy.cpp

@@ -589,7 +589,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 				_animationFrame = _animationLoopFrameMin;
 				_animationLoopDirection = 1;
 			}
-			_animationLoopCounter++;
+			++_animationLoopCounter;
 		} else {
 			_animationFrame += _animationLoopDirection;
 			_animationLoopLength = 0;
@@ -639,7 +639,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 0;
 		} else {
 			*animation = kModelAnimationMcCoyProtestingTalk;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 				_animationFrame = 0;
 			}
@@ -648,7 +648,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = kModelAnimationMcCoyScratchHeadTalk;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 3;
@@ -658,7 +658,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = kModelAnimationMcCoyScratchEarLongerTalk;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 3;
@@ -668,7 +668,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = kModelAnimationMcCoyPointingTalk;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 3;
@@ -678,7 +678,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = kModelAnimationMcCoyUpsetTalk;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 3;
@@ -688,7 +688,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = kModelAnimationMcCoyDismissiveTalk;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 3;
@@ -698,7 +698,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 10:
 		*animation = kModelAnimationMcCoyScratchEarTalk;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 3;
@@ -708,7 +708,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 11:
 		*animation = kModelAnimationMcCoyHandsOnWaistTalk;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 3;
@@ -718,7 +718,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 12:
 		*animation = kModelAnimationMcCoyScratchEarLongerTalk;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 3;
@@ -747,7 +747,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 14:
 		*animation = kModelAnimationMcCoyWithGunIdle;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationState = 14;
 			_animationFrame = 0;
@@ -756,7 +756,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 15:
 		*animation = kModelAnimationMcCoyWithGunUnholsterGun;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 14;
@@ -766,7 +766,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 16:
 		*animation = kModelAnimationMcCoyWithGunHolsterGun;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			*animation = kModelAnimationMcCoyIdle;
 			_animationFrame = 0;
@@ -788,7 +788,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 18:
 		*animation = kModelAnimationMcCoyWithGunAiming;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 17;
@@ -798,7 +798,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 19:
 		*animation = kModelAnimationMcCoyWithGunStopAimResumeIdle;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= 12) {
 			_animationFrame = 0;
 			_animationState = 14;
@@ -808,7 +808,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 21:
 		*animation = kModelAnimationMcCoyWithGunShooting;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 1
 		 && Actor_Query_Goal_Number(kActorMcCoy) == kGoalMcCoyNR11Shoot
 		 && _NR10SteeleShooting
@@ -842,7 +842,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 23:
 		*animation = kModelAnimationMcCoyWithGunGotHitRight;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 14;
@@ -853,7 +853,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 24:
 		*animation = kModelAnimationMcCoyWithGunGotHitRight;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 14;
@@ -864,7 +864,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 25:
 		*animation = kModelAnimationMcCoyGotHitRight;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			*animation = kModelAnimationMcCoyIdle;
 			_animationFrame = 0;
@@ -875,7 +875,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 26:
 		*animation = kModelAnimationMcCoyGotHitRight;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			*animation = kModelAnimationMcCoyIdle;
 			_animationFrame = 0;
@@ -886,7 +886,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 27:
 		*animation = kModelAnimationMcCoyFallsOnHisBack;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = Slice_Animation_Query_Number_Of_Frames(*animation) - 1;
 			_animationState = 50;
@@ -899,7 +899,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 28:
 		*animation = kModelAnimationMcCoyWithGunShotDead;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = Slice_Animation_Query_Number_Of_Frames(*animation) - 1;
 			_animationState = 50;
@@ -923,7 +923,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 30:
 		*animation = kModelAnimationMcCoyWalking;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -936,7 +936,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 31:
 		*animation = kModelAnimationMcCoyRunning;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -955,7 +955,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 36:
 		*animation = kModelAnimationMcCoyWithGunWalking;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -969,7 +969,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 37:
 		*animation = kModelAnimationMcCoyWithGunRunning;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -983,7 +983,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 38:
 		*animation = kModelAnimationMcCoyClimbStairsUp;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -999,7 +999,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 39:
 		*animation = kModelAnimationMcCoyClimbStairsDown;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -1015,7 +1015,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 40:
 		*animation = kModelAnimationMcCoyWithGunClimbStairsUp;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -1031,7 +1031,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 41:
 		*animation = kModelAnimationMcCoyWithGunClimbStairsDown;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -1047,7 +1047,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 42:
 		*animation = kModelAnimationMcCoyClimbsLadderUp;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) { //why -1?
 			_animationFrame = 0;
 		}
@@ -1066,7 +1066,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 43:
 		*animation = kModelAnimationMcCoyClimbsLadderDown;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) { //why -1?
 			_animationFrame = 0;
 		}
@@ -1085,7 +1085,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 44:
 		*animation = kModelAnimationMcCoyThrowsBeggarInTrash;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 127) {
 			Game_Flag_Set(kFlagCT04BodyDumped);
 		}
@@ -1100,7 +1100,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 45:
 		*animation = kModelAnimationMcCoyEntersSpinner;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			Actor_Set_Invisible(kActorMcCoy, true);
 			*animation = kModelAnimationMcCoyIdle;
@@ -1112,7 +1112,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 	case 46:
 		Actor_Set_Invisible(kActorMcCoy, false);
 		*animation = kModelAnimationMcCoyExitsSpinner;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			*animation = kModelAnimationMcCoyIdle;
 			_animationFrame = 0;
@@ -1124,7 +1124,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 47:
 		*animation = kModelAnimationMcCoyLeaningOver;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 48;
@@ -1134,7 +1134,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 48:
 		*animation = kModelAnimationMcCoyLeaningOverSearching;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 49;
@@ -1144,7 +1144,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 49:
 		*animation = kModelAnimationMcCoyLeaningOverResumeIdle;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			Actor_Set_Goal_Number(kActorMcCoy, kGoalMcCoyDefault);
 			*animation = kModelAnimationMcCoyIdle;
@@ -1160,7 +1160,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 51:
 		*animation = kModelAnimationMcCoyDodgeAndDrawGun;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			Player_Set_Combat_Mode(true);
 			ChangeAnimationMode(kAnimationModeCombatIdle);
@@ -1172,7 +1172,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 52:
 		*animation = kModelAnimationMcCoyDiesInAgony;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = Slice_Animation_Query_Number_Of_Frames(*animation) - 1;
 			_animationState = 50;
@@ -1181,7 +1181,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 53:
 		*animation = kModelAnimationMcCoyFallsOnHisBack;
-		_animationFrame--;
+		--_animationFrame;
 		if (_animationFrame <= 0) {
 			Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeIdle);
 			*animation = kModelAnimationMcCoyIdle;
@@ -1198,7 +1198,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 55:
 		*animation = kModelAnimationMcCoyGivesFromPocket;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 7) {
 			Actor_Change_Animation_Mode(kActorMaggie, kAnimationModeFeeding);
 		}
@@ -1210,7 +1210,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 56:
 		*animation = kModelAnimationMcCoyStartled;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			if (Actor_Query_Which_Set_In(kActorMcCoy) == kSetUG15) {
@@ -1225,7 +1225,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 57:
 		*animation = kModelAnimationMcCoyTiedInChairIdle;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -1238,7 +1238,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 58:
 		*animation = kModelAnimationMcCoyTiedInChairMoving;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 6) {
 			// Play one of kSfxCHARMTL7, kSfxCHARMTL8, kSfxCHARMTL9
 			Ambient_Sounds_Play_Sound(Random_Query(kSfxCHARMTL7, kSfxCHARMTL9), 39, 0, 0, 99);
@@ -1250,7 +1250,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 59:
 		*animation = kModelAnimationMcCoyTiedInChairFreed;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			*animation = kModelAnimationMcCoyIdle;
 			_animationFrame = 0;
@@ -1264,13 +1264,13 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 	case 60:
 		*animation = kModelAnimationMcCoySittingToUseConsole;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 		break;
 
 	case 61:
 		*animation = kModelAnimationMcCoySittingToUseConsole;
-		_animationFrame--;
+		--_animationFrame;
 		if (_animationFrame <= 0) {
 			*animation = kModelAnimationMcCoyIdle;
 			_animationFrame = 0;
@@ -1283,7 +1283,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 62:
 		*animation = kModelAnimationMcCoyWithGunGrabbedByArm0;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 63;
@@ -1293,7 +1293,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 63:
 		*animation = kModelAnimationMcCoyWithGunGrabbedByArm1;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -1301,7 +1301,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 64:
 		*animation = kModelAnimationMcCoyWithGunGrabbedByArmHurt;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 63;
@@ -1311,7 +1311,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 65:
 		*animation = kModelAnimationMcCoyWithGunGrabbedByArmFreed;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 14;
@@ -1322,7 +1322,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 66:
 		*animation = kModelAnimationMcCoyGiveMovement;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeIdle);
 			*animation = kModelAnimationMcCoyIdle;
@@ -1333,7 +1333,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 67:
 		*animation = kModelAnimationMcCoyDrinkingBooze;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeIdle);
 			*animation = kModelAnimationMcCoyIdle;
@@ -1349,9 +1349,9 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		*animation = kModelAnimationMcCoyFallsOnHisBack;
 		v7 = Slice_Animation_Query_Number_Of_Frames(*animation) - 1 - Global_Variable_Query(kVariableNR01GetUpCounter);
 		if (_animationFrame < v7) {
-			_animationFrame++;
+			++_animationFrame;
 		} else if (_animationFrame > v7) {
-			_animationFrame--;
+			--_animationFrame;
 		}
 		if (_animationFrame <= 0) {
 			Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeIdle);
@@ -1367,7 +1367,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 69:
 		*animation = kModelAnimationMcCoyCrouchingDown;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeSit);
 			*animation = kModelAnimationMcCoyCrouchedIdle;
@@ -1376,7 +1376,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 70:
 		*animation = kModelAnimationMcCoyCrouchedIdle;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -1384,7 +1384,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 
 	case 71:
 		*animation = kModelAnimationMcCoyCrouchedGetsUp;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeIdle);
 			*animation = kModelAnimationMcCoyIdle;

engines/bladerunner/script/ai/mia.cpp

@@ -111,7 +111,7 @@ bool AIScriptMia::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = 566;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(566))
 			_animationFrame = 0;
@@ -120,7 +120,7 @@ bool AIScriptMia::UpdateAnimation(int *animation, int *frame) {
 
 	case 1:
 		*animation = 567;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(567)) {
 			*animation = 566;
@@ -137,7 +137,7 @@ bool AIScriptMia::UpdateAnimation(int *animation, int *frame) {
 			_animationFrame = 0;
 			_animationState = 0;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 				_animationFrame = 0;
@@ -147,7 +147,7 @@ bool AIScriptMia::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 569;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(569)) {
 			*animation = 568;
@@ -158,7 +158,7 @@ bool AIScriptMia::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 570;
-		_animationFrame++;
+		++_animationFrame;
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(570)) {
 			*animation = 568;

engines/bladerunner/script/ai/moraji.cpp

@@ -238,7 +238,7 @@ bool AIScriptMoraji::UpdateAnimation(int *animation, int *frame) {
 	case 0:
 		*animation = 733;
 		if (_var2) {
-			_var2--;
+			--_var2;
 		} else {
 			_animationFrame += _var1;
 			if (Random_Query(0, 10) == 0) {
@@ -262,14 +262,14 @@ bool AIScriptMoraji::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 290;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(290))
 			_animationFrame = 0;
 		break;
 
 	case 3:
 		*animation = 732;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(732))
 			_animationFrame = 0;
 		break;
@@ -279,7 +279,7 @@ bool AIScriptMoraji::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 734;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(734)) {
 			_animationFrame = 0;
 			_animationState = Random_Query(0, 2) + 5;
@@ -288,7 +288,7 @@ bool AIScriptMoraji::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 735;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(735)) {
 			_animationFrame = 0;
 			_animationState = 5;
@@ -298,7 +298,7 @@ bool AIScriptMoraji::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 736;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(736)) {
 			_animationFrame = 0;
 			_animationState = 5;
@@ -308,7 +308,7 @@ bool AIScriptMoraji::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 737;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(737)) {
 			_animationFrame = 0;
 			_animationState = 0;
@@ -322,7 +322,7 @@ bool AIScriptMoraji::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = 742;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(742)) {
 			_animationFrame = 0;
 			_animationState = 3;
@@ -340,7 +340,7 @@ bool AIScriptMoraji::UpdateAnimation(int *animation, int *frame) {
 
 	case 11:
 		*animation = 739;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(739)) {
 			Actor_Set_Goal_Number(kActorMoraji, kGoalMorajiLayDown);
 			_animationFrame = 0;
@@ -352,7 +352,7 @@ bool AIScriptMoraji::UpdateAnimation(int *animation, int *frame) {
 	case 12:
 		*animation = 740;
 		if (_var2) {
-			_var2--;
+			--_var2;
 		} else {
 			_animationFrame += _var1;
 			if (!Random_Query(0, 5)) {
@@ -370,7 +370,7 @@ bool AIScriptMoraji::UpdateAnimation(int *animation, int *frame) {
 
 	case 13:
 		*animation = 741;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(741) - 1) {
 			_animationFrame = Slice_Animation_Query_Number_Of_Frames(*animation) - 1;
 			Actor_Set_Goal_Number(kActorMoraji, kGoalMorajiDead);

engines/bladerunner/script/ai/murray.cpp

@@ -124,7 +124,7 @@ bool AIScriptMurray::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = 698;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(698))
 			_animationFrame = 0;
 		break;
@@ -134,7 +134,7 @@ bool AIScriptMurray::UpdateAnimation(int *animation, int *frame) {
 		if (!_animationFrame && _flag) {
 			_animationState = 0;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(700))
 				_animationFrame = 0;
 		}
@@ -142,7 +142,7 @@ bool AIScriptMurray::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 701;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(701)) {
 			_animationFrame = 0;
 			_animationState = 1;
@@ -152,7 +152,7 @@ bool AIScriptMurray::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 702;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(702)) {
 			_animationFrame = 0;
 			_animationState = 1;
@@ -162,7 +162,7 @@ bool AIScriptMurray::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 703;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(703)) {
 			_animationFrame = 0;
 			_animationState = 1;
@@ -172,7 +172,7 @@ bool AIScriptMurray::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 704;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(704)) {
 			_animationFrame = 0;
 			_animationState = 1;
@@ -182,7 +182,7 @@ bool AIScriptMurray::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 699;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(699)) {
 			*animation = 698;
 			_animationFrame = 0;

engines/bladerunner/script/ai/mutant1.cpp

@@ -401,7 +401,7 @@ bool AIScriptMutant1::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = 894;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(894)) {
 			_animationFrame = 0;
 		}
@@ -410,7 +410,7 @@ bool AIScriptMutant1::UpdateAnimation(int *animation, int *frame) {
 	case 1:
 	case 2:
 		*animation = 893;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(893)) {
 			_animationFrame = 0;
 		}
@@ -422,7 +422,7 @@ bool AIScriptMutant1::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 0;
 		} else {
 			*animation = 896;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(896)) {
 				_animationFrame = 0;
 			}
@@ -431,7 +431,7 @@ bool AIScriptMutant1::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 896;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(896)) {
 			_animationFrame = 0;
 			_animationState = 3;
@@ -441,7 +441,7 @@ bool AIScriptMutant1::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 897;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(897)) {
 			_animationFrame = 0;
 			_animationState = 3;
@@ -451,7 +451,7 @@ bool AIScriptMutant1::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 898;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 5) {
 			int snd;
 
@@ -472,7 +472,7 @@ bool AIScriptMutant1::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 899;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 1) {
 			Ambient_Sounds_Play_Sound(kSfxHURT1M1, 99, 0, 0, 25);
 		}
@@ -483,7 +483,7 @@ bool AIScriptMutant1::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 900;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 1) {
 			Sound_Play(kSfxYELL1M1, 100, 0, 0, 50);
 		}
@@ -499,7 +499,7 @@ bool AIScriptMutant1::UpdateAnimation(int *animation, int *frame) {
 
 	case 10:
 		*animation = 899;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 9) {
 			Sound_Play(kSfxHURT1M1, 100, 0, 0, 50);
 		}

engines/bladerunner/script/ai/mutant2.cpp

@@ -367,7 +367,7 @@ bool AIScriptMutant2::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = 903;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(903)) {
 			_animationFrame = 0;
 		}
@@ -375,7 +375,7 @@ bool AIScriptMutant2::UpdateAnimation(int *animation, int *frame) {
 
 	case 1:
 		*animation = 901;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(901)) {
 			_animationFrame = 0;
 		}
@@ -383,7 +383,7 @@ bool AIScriptMutant2::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 902;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(902)) {
 			_animationFrame = 0;
 		}
@@ -395,7 +395,7 @@ bool AIScriptMutant2::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 0;
 		} else {
 			*animation = 905;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(905)) {
 				_animationFrame = 0;
 			}
@@ -404,7 +404,7 @@ bool AIScriptMutant2::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 905;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(905)) {
 			_animationFrame = 0;
 			_animationState = 3;
@@ -414,7 +414,7 @@ bool AIScriptMutant2::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 906;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 7) {
 			int snd;
 			if (Random_Query(1, 2) == 1) {
@@ -434,7 +434,7 @@ bool AIScriptMutant2::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 907;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 1) {
 			Sound_Play(kSfxYELL1M2, 100, 0, 0, 50);
 		}

engines/bladerunner/script/ai/mutant3.cpp

@@ -381,7 +381,7 @@ bool AIScriptMutant3::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = 910;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(910)) {
 			_animationFrame = 0;
 		}
@@ -389,7 +389,7 @@ bool AIScriptMutant3::UpdateAnimation(int *animation, int *frame) {
 
 	case 1:
 		*animation = 908;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(908)) {
 			_animationFrame = 0;
 		}
@@ -397,7 +397,7 @@ bool AIScriptMutant3::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 909;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(909)) {
 			_animationFrame = 0;
 		}
@@ -409,7 +409,7 @@ bool AIScriptMutant3::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 0;
 		} else {
 			*animation = 912;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(912)) {
 				_animationFrame = 0;
 			}
@@ -418,7 +418,7 @@ bool AIScriptMutant3::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 912;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(912)) {
 			_animationFrame = 0;
 			_animationState = 3;
@@ -428,7 +428,7 @@ bool AIScriptMutant3::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 913;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 9) {
 			int snd;
 			if (Random_Query(1, 2) == 1) {
@@ -448,7 +448,7 @@ bool AIScriptMutant3::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 917;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(917)) {
 			Actor_Change_Animation_Mode(kActorMutant3, 88);
 		}
@@ -461,7 +461,7 @@ bool AIScriptMutant3::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 914;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(914)) {
 			_animationFrame = 0;
 		}
@@ -469,7 +469,7 @@ bool AIScriptMutant3::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = 916;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(916)) {
 			_animationFrame = 0;
 			_animationState = 8;
@@ -479,7 +479,7 @@ bool AIScriptMutant3::UpdateAnimation(int *animation, int *frame) {
 
 	case 10:
 		*animation = 915;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(915)) {
 			*animation = 910;
 			_animationFrame = 0;

engines/bladerunner/script/ai/officer_grayford.cpp

@@ -928,7 +928,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 		if (_var1 == 2) {
 			*animation = 627;
 		}
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_var1 = 0;
@@ -940,7 +940,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 1:
 		*animation = 618;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(618)) {
 			_animationFrame = 0;
 		}
@@ -948,7 +948,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 619;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(619)) {
 			_animationFrame = 0;
 		}
@@ -956,7 +956,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 611;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(611)) {
 			_animationFrame = 0;
 		}
@@ -964,7 +964,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 610;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(610)) {
 			_animationFrame = 0;
 		}
@@ -978,7 +978,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 			_var2 = 0;
 		} else {
 			*animation = 629;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(629)) {
 				_animationFrame = 0;
 				_animationState = Random_Query(9, 11);
@@ -988,7 +988,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 10:
 		*animation = 630;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(630)) {
 			_animationFrame = 0;
 			_animationState = 9;
@@ -998,7 +998,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 11:
 		*animation = 631;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(631)) {
 			_animationFrame = 0;
 			_animationState = 9;
@@ -1008,7 +1008,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 12:
 		*animation = 632;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(632)) {
 			_animationFrame = 0;
 			_animationState = 9;
@@ -1018,7 +1018,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 13:
 		*animation = 633;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(633)) {
 			_animationFrame = 0;
 			_animationState = 9;
@@ -1028,7 +1028,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 14:
 		*animation = 634;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(634)) {
 			_animationFrame = 0;
 			_animationState = 9;
@@ -1038,7 +1038,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 15:
 		*animation = 635;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(635)) {
 			_animationFrame = 0;
 			_animationState = 9;
@@ -1048,7 +1048,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 16:
 		*animation = 636;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(636)) {
 			_animationFrame = 0;
 			_animationState = 9;
@@ -1058,7 +1058,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 17:
 		*animation = 637;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(637)) {
 			_animationFrame = 0;
 			_animationState = 9;
@@ -1069,7 +1069,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 	case 18:
 	case 19:
 		*animation = 605;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(605)) {
 			_animationFrame = 0;
 		}
@@ -1077,7 +1077,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 20:
 		*animation = 615;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(615)) {
 			_animationFrame = 0;
 			_animationState = 19;
@@ -1086,7 +1086,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 21:
 		*animation = 616;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 11) {
 			Ambient_Sounds_Play_Sound(kSfxHOLSTER1, 25, 0, 0, 25);
 		}
@@ -1103,7 +1103,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 22:
 		*animation = 617;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 3) {
 			int snd;
 			if (Random_Query(1, 2) == 1) {
@@ -1126,13 +1126,13 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 	case 23:
 		*animation = 617;
 		if (_animationFrame < 2) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 		break;
 
 	case 24:
 		*animation = 617;
-		_animationFrame--;
+		--_animationFrame;
 		if (_animationFrame < 0) {
 			_animationFrame = 0;
 			_animationState = 21;
@@ -1142,7 +1142,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 27:
 		*animation = 608;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(608) - 1) {
 			_animationFrame = 0;
 			_animationState = 19;
@@ -1153,7 +1153,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 28:
 		*animation = 609;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(609) - 1) {
 			_animationFrame = 0;
 			_animationState = 19;
@@ -1164,7 +1164,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 29:
 		*animation = 622;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(622) - 1) {
 			*animation = 605;
 			_animationFrame = 0;
@@ -1175,7 +1175,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 30:
 		*animation = 623;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(623) - 1) {
 			*animation = 605;
 			_animationFrame = 0;
@@ -1187,23 +1187,23 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 	case 31:
 		*animation = 612;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(612) - 1) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 		break;
 
 	case 32:
 		*animation = 624;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(624) - 1) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 		break;
 
 	case 34:
 		*animation = 639;
 		if (_var3) {
-			_var3--;
+			--_var3;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(639)) {
 				if (Random_Query(0, 1)) {
 					*animation = 641;
@@ -1224,9 +1224,9 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 	case 35:
 		*animation = 638;
 		if (_var3) {
-			_var3--;
+			--_var3;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(638)) {
 				if (Random_Query(0, 1)) {
 					*animation = 641;
@@ -1246,7 +1246,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 36:
 		*animation = 640;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(640)) {
 			_animationFrame = 0;
 			_animationState = 34;
@@ -1256,7 +1256,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 
 	case 37:
 		*animation = 641;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(641)) {
 			*animation = 625;
 			_animationState = 0;

engines/bladerunner/script/ai/officer_leary.cpp

@@ -675,7 +675,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 32:
 		*animation = 603;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(603)) {
 			*animation = 589;
 			_animationState = 0;
@@ -686,7 +686,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 31:
 		*animation = 604;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(604)) {
 			*animation = 601;
 			_animationState = 1;
@@ -696,7 +696,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 30:
 		*animation = 587;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(587)) {
 			*animation = 589;
 			_animationState = 0;
@@ -707,7 +707,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 29:
 		*animation = 586;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(586)) {
 			*animation = 589;
 			_animationState = 0;
@@ -732,7 +732,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 26:
 		*animation = 573;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(573)) {
 			_animationState = 21;
 			_animationFrame = 0;
@@ -743,7 +743,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 25:
 		*animation = 572;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(572)) {
 			_animationState = 21;
 			_animationFrame = 0;
@@ -754,7 +754,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 24:
 		*animation = 581;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 4) {
 			if (Random_Query(1, 2) == 1) {
 				Sound_Play_Speech_Line(kActorOfficerLeary, 9010, 75, 0, 99);
@@ -775,7 +775,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 23:
 		*animation = 580;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(580)) {
 			*animation = 589;
 			_animationState = 0;
@@ -785,7 +785,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 22:
 		*animation = 579;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(579)) {
 			_animationState = 21;
 			_animationFrame = 0;
@@ -795,7 +795,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 21:
 		*animation = 571;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(571)) {
 			_animationFrame = 0;
 		}
@@ -803,7 +803,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 20:
 		*animation = 571;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(571) - 1) {
 			_animationFrame = 0;
 		}
@@ -811,7 +811,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 19:
 		*animation = 600;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(600)) {
 			_animationState = 11;
 			_animationFrame = 0;
@@ -821,7 +821,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 18:
 		*animation = 599;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(599)) {
 			_animationState = 11;
 			_animationFrame = 0;
@@ -831,7 +831,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 17:
 		*animation = 598;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(598)) {
 			_animationState = 11;
 			_animationFrame = 0;
@@ -841,7 +841,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 16:
 		*animation = 597;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(597)) {
 			_animationState = 11;
 			_animationFrame = 0;
@@ -851,7 +851,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 15:
 		*animation = 596;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(596)) {
 			_animationState = 11;
 			_animationFrame = 0;
@@ -861,7 +861,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 14:
 		*animation = 595;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(595)) {
 			_animationState = 11;
 			_animationFrame = 0;
@@ -871,7 +871,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 13:
 		*animation = 594;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(594)) {
 			_animationState = 11;
 			_animationFrame = 0;
@@ -881,7 +881,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 12:
 		*animation = 593;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(593)) {
 			_animationState = 11;
 			_animationFrame = 0;
@@ -901,7 +901,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		}
 
 		*animation = 592;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(592)) {
 			_animationFrame = 0;
 			if (var_45D5BC) {
@@ -919,7 +919,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 10:
 		*animation = 578;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(578)) {
 			_animationFrame = 0;
 		}
@@ -927,7 +927,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 9:
 		*animation = 577;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(577)) {
 			_animationFrame = 0;
 		}
@@ -935,7 +935,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 8:
 		*animation = 575;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(575)) {
 			_animationFrame = 0;
 		}
@@ -943,7 +943,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 7:
 		*animation = 574;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(574)) {
 			_animationFrame = 0;
 		}
@@ -951,7 +951,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 6:
 		*animation = 585;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(585)) {
 			_animationFrame = 0;
 		}
@@ -959,7 +959,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 5:
 		*animation = 584;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(584)) {
 			_animationFrame = 0;
 		}
@@ -967,7 +967,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 4:
 		*animation = 583;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(583)) {
 			_animationFrame = 0;
 		}
@@ -975,7 +975,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 3:
 		*animation = 582;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(582)) {
 			_animationFrame = 0;
 		}
@@ -984,7 +984,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 	case 2:
 		if (Game_Flag_Query(kFlagOfficerLearyTakingNotes)) {
 			*animation = 603;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(603)) {
 				Game_Flag_Reset(kFlagOfficerLearyTakingNotes);
 				_animationFrame = 0;
@@ -1021,7 +1021,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 		return true;
 	case 1:
 		*animation = 601;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(601)) {
 			_animationFrame = 0;
 		}
@@ -1040,21 +1040,21 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 			*animation = 604;
 		} else if (var_45D5B8 == 1) {
 			*animation = 590;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(590)) {
 				var_45D5B8 = Random_Query(0, 2);
 				_animationFrame = 0;
 			}
 		} else if (var_45D5B8 == 2) {
 			*animation = 591;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(591)) {
 				var_45D5B8 = Random_Query(0, 2);
 				_animationFrame = 0;
 			}
 		} else if (var_45D5B8 == 0) {
 			*animation = 589;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(589)) {
 				var_45D5B8 = Random_Query(0, 2);
 				_animationFrame = 0;

engines/bladerunner/script/ai/photographer.cpp

@@ -200,7 +200,7 @@ bool AIScriptPhotographer::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = 745;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(745)) {
 			_animationFrame = 0;
 		}
@@ -208,7 +208,7 @@ bool AIScriptPhotographer::UpdateAnimation(int *animation, int *frame) {
 
 	case 1:
 		*animation = 744;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(744)) {
 			_animationFrame = 0;
 		}
@@ -224,7 +224,7 @@ bool AIScriptPhotographer::UpdateAnimation(int *animation, int *frame) {
 			_var2 = 0;
 			_flag = false;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(747)) {
 				_animationFrame = 0;
 			}
@@ -233,7 +233,7 @@ bool AIScriptPhotographer::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 749;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(749)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -243,7 +243,7 @@ bool AIScriptPhotographer::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 749;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(749)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -253,7 +253,7 @@ bool AIScriptPhotographer::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 750;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(750)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -269,7 +269,7 @@ bool AIScriptPhotographer::UpdateAnimation(int *animation, int *frame) {
 		if (_var1) {
 			--_var1;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame == 10) {
 				_var1 = 5;
 			}

engines/bladerunner/script/ai/rachael.cpp

@@ -200,7 +200,7 @@ bool AIScriptRachael::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = kModelAnimationRachaelIdle;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(kModelAnimationRachaelIdle) - 1) {
 			_animationFrame = 0;
 		}
@@ -208,7 +208,7 @@ bool AIScriptRachael::UpdateAnimation(int *animation, int *frame) {
 
 	case 1:
 		*animation = kModelAnimationRachaelWalking;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(kModelAnimationRachaelWalking) - 1) {
 			_animationFrame = 0;
 		}
@@ -220,7 +220,7 @@ bool AIScriptRachael::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 0;
 		} else {
 			*animation = kModelAnimationRachaelTalkSoftNod;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(kModelAnimationRachaelTalkSoftNod) - 1) {
 				_animationFrame = 0;
 			}
@@ -229,7 +229,7 @@ bool AIScriptRachael::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = kModelAnimationRachaelTalkNodToLeft;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(kModelAnimationRachaelTalkNodToLeft) - 1) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -239,7 +239,7 @@ bool AIScriptRachael::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = kModelAnimationRachaelTalkSuggestWithNodToLeft;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(kModelAnimationRachaelTalkSuggestWithNodToLeft) - 1) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -249,7 +249,7 @@ bool AIScriptRachael::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = kModelAnimationRachaelTalkIndiffWithNodToLeft;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(kModelAnimationRachaelTalkIndiffWithNodToLeft) - 1) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -259,7 +259,7 @@ bool AIScriptRachael::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = kModelAnimationRachaelTalkOfferPointing;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(kModelAnimationRachaelTalkOfferPointing) - 1) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -269,7 +269,7 @@ bool AIScriptRachael::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = kModelAnimationRachaelTalkHaltMovement;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(kModelAnimationRachaelTalkHaltMovement) - 1) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -279,7 +279,7 @@ bool AIScriptRachael::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = kModelAnimationRachaelTalkHandOnChest;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(kModelAnimationRachaelTalkHandOnChest) - 1) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -289,7 +289,7 @@ bool AIScriptRachael::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = kModelAnimationRachaelTalkHandWaveToRight;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(kModelAnimationRachaelTalkHandWaveToRight) - 1) {
 			_animationFrame = 0;
 			_animationState = 2;

engines/bladerunner/script/ai/rajif.cpp

@@ -114,13 +114,13 @@ bool AIScriptRajif::UpdateAnimation(int *animation, int *frame) {
 	if (_animationState <= 1) {
 		if (_animationState) {
 			*animation = 751;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(751)) {
 				_animationFrame = 0;
 			}
 		} else { // bug in original. Both branches are equal
 			*animation = 751;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(751)) {
 				_animationFrame = 0;
 			}

engines/bladerunner/script/ai/runciter.cpp

@@ -227,7 +227,7 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
 		if (var_45CD78 == 0) {
 			*animation = 529;
 			if (var_45CD84) {
-				var_45CD84--;
+				--var_45CD84;
 			} else {
 				_animationFrame += var_45CD80;
 				if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(529)) {
@@ -252,7 +252,7 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
 			}
 		} else if (var_45CD78 == 1) {
 			*animation = 530;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(530)) {
 				_animationFrame = 0;
 				var_45CD78 = 0;
@@ -263,7 +263,7 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
 		} else if (var_45CD78 == 2) {
 			*animation = 531;
 			if (var_45CD84) {
-				var_45CD84--;
+				--var_45CD84;
 			} else {
 				_animationFrame += var_45CD80;
 				if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
@@ -284,7 +284,7 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
 
 	case kRunciterStateWalking:
 		*animation = 526;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(526)) {
 			_animationFrame = 0;
 		}
@@ -293,7 +293,7 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 533;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(533)) {
 			_animationFrame = 0;
 			if (var_45CD88) {
@@ -309,7 +309,7 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 534;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(534)) {
 			_animationFrame = 0;
 			if (var_45CD88) {
@@ -326,7 +326,7 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 535;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(535)) {
 			_animationFrame = 0;
 			if (var_45CD88) {
@@ -343,7 +343,7 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 536;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(536)) {
 			_animationFrame = 0;
 			if (var_45CD88) {
@@ -360,7 +360,7 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 537;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(537)) {
 			_animationFrame = 0;
 			if (var_45CD88) {
@@ -377,7 +377,7 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 538;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(538)) {
 			_animationFrame = 0;
 			if (var_45CD88) {
@@ -394,7 +394,7 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = 539;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(539)) {
 			_animationFrame = 0;
 			if (var_45CD88) {
@@ -410,7 +410,7 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 10:
 		*animation = 540;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(540)) {
 			_animationFrame = 0;
 			if (var_45CD88) {
@@ -443,7 +443,7 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
 
 	case 12:
 		*animation = 532;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(532)) {
 			*animation = 529;
 			_animationState = 0;
@@ -481,7 +481,7 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
 
 	case kRunciterStateDying:
 		*animation = 528;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(528) - 1) {
 			*animation = 528;
 			_animationState = kRunciterStateDead;

engines/bladerunner/script/ai/sadik.cpp

@@ -495,7 +495,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 	case 0:
 		if (_var2 == 1) {
 			*animation = 329;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(329)) {
 				*animation = 328;
 				_animationFrame = 0;
@@ -504,7 +504,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 		} else if (_var2 == 0) {
 			*animation = 328;
 			if (_var3) {
-				_var3--;
+				--_var3;
 				if (!Random_Query(0, 6)) {
 					_var4 = -_var4;
 				}
@@ -559,7 +559,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 			*animation = 339;
 			break;
 		}
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -567,7 +567,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 312;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(312)) {
 			_animationFrame = 0;
 		}
@@ -575,7 +575,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 313;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(313)) {
 			_animationFrame = 0;
 			_animationState = 7;
@@ -586,7 +586,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = 314;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(314)) {
 			_animationFrame = 0;
 			_animationState = 7;
@@ -597,7 +597,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 
 	case 10:
 		*animation = 325;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(325)) {
 			*animation = 328;
 			_animationFrame = 0;
@@ -608,7 +608,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 
 	case 11:
 		*animation = 326;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(326)) {
 			*animation = 328;
 			_animationFrame = 0;
@@ -619,7 +619,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 
 	case 12:
 		*animation = 315;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(315)) {
 			_animationFrame = 0;
 			_animationState = 7;
@@ -630,7 +630,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 
 	case 13:
 		*animation = 316;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(316)) {
 			_animationFrame = 0;
 			_animationState = 7;
@@ -642,20 +642,20 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 	case 14:
 		*animation = 327;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(327) - 1) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 		break;
 
 	case 15:
 		*animation = 327;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(327) - 1) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 		break;
 
 	case 16:
 		*animation = 320;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(320)) {
 			_animationFrame = 0;
 			_animationState = 7;
@@ -665,7 +665,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 
 	case 17:
 		*animation = 321;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(321)) {
 			*animation = 328;
 			_animationFrame = 0;
@@ -675,7 +675,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 
 	case 18:
 		*animation = 322;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 5) {
 			int snd;
 			if (Random_Query(1, 2) == 1) {
@@ -703,7 +703,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 0;
 			_flag = 0;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(331)) {
 				_animationFrame = 0;
 			}
@@ -740,7 +740,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 			*animation = 338;
 			break;
 		}
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 19;
@@ -750,7 +750,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 
 	case 27:
 		*animation = 330;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(330)) {
 			*animation = 328;
 			_animationFrame = 0;
@@ -761,7 +761,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 
 	case 28:
 		*animation = 341;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(341)) {
 			*animation = 328;
 			_animationFrame = 0;
@@ -771,7 +771,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 
 	case 29:
 		*animation = 342;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(342)) {
 			*animation = 328;
 			_animationFrame = 0;
@@ -781,7 +781,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 
 	case 30:
 		*animation = 343;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(343)) {
 			*animation = 328;
 			_animationFrame = 0;
@@ -792,7 +792,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 
 	case 31:
 		*animation = 344;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(344)) {
 			*animation = 328;
 			_animationFrame = 0;
@@ -803,7 +803,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 
 	case 32:
 		*animation = 345;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 23) {
 			_nextSoundId = kSfxMTLDOOR2;
 		}
@@ -817,7 +817,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 
 	case 33:
 		*animation = 344;
-		_animationFrame++;
+		++_animationFrame;
 		if (Actor_Query_Goal_Number(kActorSadik) == kGoalSadikBB11KnockOutMcCoy) {
 			if (_animationFrame == 4) {
 				_nextSoundId = kSfxPUNCH1;
@@ -840,7 +840,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 
 	case 34:
 		*animation = 343;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 4) {
 			if (Actor_Query_Goal_Number(kActorSadik) == kGoalSadikBB11KnockOutMcCoy) {
 				Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeDie);

engines/bladerunner/script/ai/sebastian.cpp

@@ -147,7 +147,7 @@ bool AIScriptSebastian::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = 811;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(811) - 1) {
 			_animationFrame = 0;
 		}
@@ -155,7 +155,7 @@ bool AIScriptSebastian::UpdateAnimation(int *animation, int *frame) {
 
 	case 1:
 		*animation = 809;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(809) - 1) {
 			_animationFrame = 0;
 		}
@@ -163,7 +163,7 @@ bool AIScriptSebastian::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 810;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(810) - 1) {
 			Actor_Change_Animation_Mode(kActorSebastian, kAnimationModeIdle);
 			*animation = 811;
@@ -175,7 +175,7 @@ bool AIScriptSebastian::UpdateAnimation(int *animation, int *frame) {
 	case 3:
 		*animation = 821;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(821) - 1) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 		break;
 
@@ -187,7 +187,7 @@ bool AIScriptSebastian::UpdateAnimation(int *animation, int *frame) {
 			_animationFrame = 0;
 		} else {
 			*animation = 813;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(813) - 1) {
 				_animationFrame = 0;
 			}
@@ -196,7 +196,7 @@ bool AIScriptSebastian::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 814;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(814) - 1) {
 			_animationFrame = 0;
 			_animationState = 4;
@@ -206,7 +206,7 @@ bool AIScriptSebastian::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 815;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(815) - 1) {
 			_animationFrame = 0;
 			_animationState = 4;
@@ -216,7 +216,7 @@ bool AIScriptSebastian::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 816;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(816) - 1) {
 			_animationFrame = 0;
 			_animationState = 4;
@@ -226,7 +226,7 @@ bool AIScriptSebastian::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 817;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(817) - 1) {
 			_animationFrame = 0;
 			_animationState = 4;
@@ -236,7 +236,7 @@ bool AIScriptSebastian::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = 818;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(818) - 1) {
 			_animationFrame = 0;
 			_animationState = 4;
@@ -246,7 +246,7 @@ bool AIScriptSebastian::UpdateAnimation(int *animation, int *frame) {
 
 	case 10:
 		*animation = 819;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(819) - 1) {
 			_animationFrame = 0;
 			_animationState = 4;
@@ -256,7 +256,7 @@ bool AIScriptSebastian::UpdateAnimation(int *animation, int *frame) {
 
 	case 11:
 		*animation = 820;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(820) - 1) {
 			_animationFrame = 0;
 			_animationState = 4;

engines/bladerunner/script/ai/sergeant_walls.cpp

@@ -98,7 +98,7 @@ bool AIScriptSergeantWalls::GoalChanged(int currentGoalNumber, int newGoalNumber
 bool AIScriptSergeantWalls::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
-		_animationFrame++;
+		++_animationFrame;
 		if ( Game_Flag_Query(kFlagSergeantWallsBuzzInRequest)
 		 && !Game_Flag_Query(kFlagSergeantWallsBuzzInDone)
 		) {
@@ -116,14 +116,14 @@ bool AIScriptSergeantWalls::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 1:
 		*animation = 725;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(725)) {
 			_animationFrame = 0;
 		}
 		break;
 	case 3:
 		*animation = 726;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(726)) {
 			_animationState = 1;
 			_animationFrame = 0;
@@ -132,7 +132,7 @@ bool AIScriptSergeantWalls::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 4:
 		*animation = 727;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(727)) {
 			_animationState = 1;
 			_animationFrame = 0;
@@ -141,7 +141,7 @@ bool AIScriptSergeantWalls::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 5:
 		*animation = 728;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(728)) {
 			_animationState = 1;
 			_animationFrame = 0;
@@ -150,7 +150,7 @@ bool AIScriptSergeantWalls::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 6:
 		*animation = 729;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(729)) {
 			_animationState = 1;
 			_animationFrame = 0;
@@ -159,7 +159,7 @@ bool AIScriptSergeantWalls::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 7:
 		*animation = 730;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(730)) {
 			_animationState = 1;
 			_animationFrame = 0;
@@ -168,7 +168,7 @@ bool AIScriptSergeantWalls::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 8:
 		*animation = 731;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(731)) {
 			_animationState = 1;
 			_animationFrame = 0;
@@ -177,7 +177,7 @@ bool AIScriptSergeantWalls::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 9:
 		*animation = 724;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(724)) {
 			_animationState = 9;
 			_animationFrame = 0;

engines/bladerunner/script/ai/steele.cpp

@@ -1503,7 +1503,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 		switch (_var1) {
 		case 0:
 			*animation = 74;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(74)) {
 				_animationFrame = 0;
 				if (Game_Flag_Query(kFlagSteeleSmoking)) {
@@ -1523,7 +1523,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 		case 3:
 			*animation = 88;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(88)) {
 				_animationFrame = 0;
 			}
@@ -1539,7 +1539,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 67;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -1547,7 +1547,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 68;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -1555,7 +1555,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 59;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -1563,7 +1563,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 60;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -1571,7 +1571,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 69;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -1579,7 +1579,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 70;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -1587,7 +1587,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 62;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -1595,7 +1595,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = 63;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -1603,7 +1603,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 10:
 		*animation = 83;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			Actor_Change_Animation_Mode(kActorSteele, kAnimationModeIdle);
 			*animation = 74;
@@ -1617,7 +1617,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 11:
 		*animation = 84;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -1625,7 +1625,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 12:
 		*animation = 85;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -1633,7 +1633,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 13:
 		*animation = 86;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 0;
@@ -1650,7 +1650,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 0;
 			_flag = 0;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 				_animationFrame = 0;
 			}
@@ -1659,7 +1659,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 15:
 		*animation = 78;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			_animationFrame = 0;
 			_animationState = 14;
@@ -1669,7 +1669,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 16:
 		*animation = 79;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			_animationFrame = 0;
 			_animationState = 14;
@@ -1679,7 +1679,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 17:
 		*animation = 80;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			_animationFrame = 0;
 			_animationState = 14;
@@ -1689,7 +1689,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 18:
 		*animation = 81;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			_animationFrame = 0;
 			_animationState = 14;
@@ -1699,7 +1699,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 19:
 		*animation = 81;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			_animationFrame = 0;
 			_animationState = 14;
@@ -1718,7 +1718,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 			Actor_Change_Animation_Mode(kActorSteele, kAnimationModeCombatIdle);
 			_flag = 0;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 				_animationFrame = 0;
 			}
@@ -1727,7 +1727,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 21:
 		*animation = 82;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			_animationFrame = 0;
 			_animationState = 20;
@@ -1737,7 +1737,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 22:
 		*animation = 82;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			_animationFrame = 0;
 			_animationState = 20;
@@ -1747,7 +1747,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 23:
 		*animation = 54;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			_animationFrame = 0;
 		}
@@ -1755,7 +1755,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 24:
 		*animation = 65;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			*animation = 74;
 			_animationFrame = 0;
@@ -1765,7 +1765,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 25:
 		*animation = 64;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			_animationFrame = 0;
 			_animationState = 23;
@@ -1775,7 +1775,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 26:
 		*animation = 66;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 3) {
 			int snd;
 			if (Random_Query(1, 2) == 1) {
@@ -1806,7 +1806,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 27:
 		*animation = 55;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			_animationFrame = 0;
 			_animationState = 23;
@@ -1817,7 +1817,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 28:
 		*animation = 56;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			_animationFrame = 0;
 			_animationState = 23;
@@ -1828,7 +1828,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 29:
 		*animation = 57;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			_animationFrame = 0;
 			_animationState = 23;
@@ -1839,7 +1839,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 30:
 		*animation = 58;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			_animationFrame = 0;
 			_animationState = 23;
@@ -1850,7 +1850,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 31:
 		*animation = 71;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			*animation = 74;
 			_animationFrame = 0;
@@ -1861,7 +1861,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 32:
 		*animation = 72;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			*animation = 74;
 			_animationFrame = 0;
@@ -1873,24 +1873,24 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 	case 33:
 		*animation = 61;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(*animation) - 1)
-			_animationFrame++;
+			++_animationFrame;
 		break;
 
 	case 34:
 		*animation = 73;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(*animation) - 1)
-			_animationFrame++;
+			++_animationFrame;
 		break;
 
 	case 35:
 		*animation = 61;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(*animation) - 1)
-			_animationFrame++;
+			++_animationFrame;
 		break;
 
 	case 36:
 		*animation = 88;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			_animationFrame = 0;
 		}
@@ -1907,7 +1907,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 			*animation = 89;
 		} else {
 			*animation = 89;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 				_animationFrame = 0;
 			}
@@ -1916,7 +1916,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 38:
 		*animation = 90;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > 5) {
 			Actor_Change_Animation_Mode(kActorSteele, kAnimationModeIdle);
 			_animationState = 0;
@@ -1928,7 +1928,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 39:
 		*animation = 92;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			_animationFrame = 0;
 			_animationState = 36;
@@ -1938,7 +1938,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 	case 40:
 		*animation = 91;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			*animation = 74;
 			_animationFrame = 0;
@@ -1951,7 +1951,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 		switch (_var1) {
 		case 0:
 			*animation = 74;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(74)) {
 				_animationFrame = 0;
 				if (!Game_Flag_Query(kFlagSteeleSmoking)) {
@@ -1965,9 +1965,9 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 		case 1:
 			*animation = 75;
 			if (_var2 != 0) {
-				_var2--;
+				--_var2;
 			} else {
-				_animationFrame++;
+				++_animationFrame;
 				if (_animationFrame >= 6
 				 && _animationFrame <= 9
 				) {
@@ -1988,7 +1988,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 
 		case 3:
 			*animation = 76;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 				_animationState = 0;
 				_animationFrame = 0;

engines/bladerunner/script/ai/taffy_patron.cpp

@@ -121,7 +121,7 @@ bool AIScriptTaffyPatron::UpdateAnimation(int *animation, int *frame) {
 
 	case 1:
 		*animation = 918;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(918) - 1) {
 			_animationFrame = 0;
 		}
@@ -130,7 +130,7 @@ bool AIScriptTaffyPatron::UpdateAnimation(int *animation, int *frame) {
 	case 2:
 		*animation = 919;
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(919) - 1) {
-			_animationFrame++;
+			++_animationFrame;
 		}
 		break;
 

engines/bladerunner/script/ai/transient.cpp

@@ -226,7 +226,7 @@ bool AIScriptTransient::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = 499;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(499)) {
 			_animationFrame = 0;
 		} else {
@@ -238,21 +238,21 @@ bool AIScriptTransient::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 1:
 		*animation = 487;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(487)) {
 			_animationFrame = 0;
 		}
 		break;
 	case 2:
 		*animation = 500;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(500)) {
 			_animationFrame = 0;
 		}
 		break;
 	case 3:
 		*animation = 501;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(501)) {
 			*animation = 500;
 			_animationState = 2;
@@ -261,7 +261,7 @@ bool AIScriptTransient::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 4:
 		*animation = 502;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(502)) {
 			*animation = 500;
 			_animationState = 2;
@@ -270,7 +270,7 @@ bool AIScriptTransient::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 5:
 		*animation = 503;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(503)) {
 			*animation = 500;
 			_animationState = 2;
@@ -279,14 +279,14 @@ bool AIScriptTransient::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 6:
 		*animation = 491;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(491)) {
 			_animationFrame = 0;
 		}
 		break;
 	case 7:
 		*animation = 492;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(492)) {
 			_animationState = 6;
 			_animationFrame = 0;
@@ -294,7 +294,7 @@ bool AIScriptTransient::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 8:
 		*animation = 493;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(493)) {
 			_animationState = 6;
 			_animationFrame = 0;
@@ -302,7 +302,7 @@ bool AIScriptTransient::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 9:
 		*animation = 494;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(494)) {
 			_animationState = 6;
 			_animationFrame = 0;
@@ -310,7 +310,7 @@ bool AIScriptTransient::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 10:
 		*animation = 496;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(496)) {
 			_animationState = 6;
 			_animationFrame = 0;
@@ -318,7 +318,7 @@ bool AIScriptTransient::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 11:
 		*animation = 495;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(495)) {
 			Actor_Set_Frame_Rate_FPS(kActorTransient, 8);
 			_animationState = 12;
@@ -331,7 +331,7 @@ bool AIScriptTransient::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 14:
 		*animation = 489;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(489)) {
 			Actor_Set_Goal_Number(kActorTransient, 3);
 			_animationState = 15;
@@ -346,14 +346,14 @@ bool AIScriptTransient::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 16:
 		*animation = 504;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(504) - 1) {
 			_animationFrame = 0;
 		}
 		break;
 	case 17:
 		*animation = 505;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(505) - 1) {
 			*animation = 497;
 			_animationFrame = 0;
@@ -367,14 +367,14 @@ bool AIScriptTransient::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 18:
 		*animation = 491;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame - 1 == 4) {
 			_animationState = 19;
 		}
 		break;
 	case 19:
 		*animation = 491;
-		_animationFrame--;
+		--_animationFrame;
 		if (_animationFrame + 1 == 4) {
 			_animationState = 18;
 		}

engines/bladerunner/script/ai/tyrell.cpp

@@ -110,7 +110,7 @@ bool AIScriptTyrell::UpdateAnimation(int *animation, int *frame) {
 	case 0:
 		if (_var == 1) {
 			*animation = 767;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(767)) {
 				*animation = 766;
 				_animationFrame = 0;
@@ -118,7 +118,7 @@ bool AIScriptTyrell::UpdateAnimation(int *animation, int *frame) {
 			}
 		} else if (_var == 0) {
 			*animation = 766;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(766)) {
 				_animationFrame = 0;
 				if (!Random_Query(0, 3)) {
@@ -130,7 +130,7 @@ bool AIScriptTyrell::UpdateAnimation(int *animation, int *frame) {
 
 	case 1:
 		*animation = 765;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(765)) {
 			_animationFrame = 0;
 		}
@@ -142,7 +142,7 @@ bool AIScriptTyrell::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 0;
 		} else {
 			*animation = 768;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(768)) {
 				_animationFrame = 0;
 			}
@@ -151,7 +151,7 @@ bool AIScriptTyrell::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 769;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(769)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -161,7 +161,7 @@ bool AIScriptTyrell::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 770;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(770)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -171,7 +171,7 @@ bool AIScriptTyrell::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 771;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(771)) {
 			_animationFrame = 0;
 			_animationState = 2;
@@ -181,7 +181,7 @@ bool AIScriptTyrell::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 772;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(772)) {
 			_animationFrame = 0;
 			_animationState = 2;

engines/bladerunner/script/ai/tyrell_guard.cpp

@@ -149,7 +149,7 @@ bool AIScriptTyrellGuard::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
 		*animation = 555;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(555)) {
 			_animationFrame = 0;
 		}
@@ -167,7 +167,7 @@ bool AIScriptTyrellGuard::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 564;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(564)) {
 			_animationFrame = 0;
 			_animationState = 0;
@@ -182,7 +182,7 @@ bool AIScriptTyrellGuard::UpdateAnimation(int *animation, int *frame) {
 			*animation = 555;
 			_animationState = 0;
 		} else {
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 				_animationFrame = 0;
 			}
@@ -191,7 +191,7 @@ bool AIScriptTyrellGuard::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 559;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(559)) {
 			*animation = 558;
 			_animationFrame = 0;
@@ -201,7 +201,7 @@ bool AIScriptTyrellGuard::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 560;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(560)) {
 			*animation = 558;
 			_animationFrame = 0;
@@ -211,7 +211,7 @@ bool AIScriptTyrellGuard::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 561;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(561)) {
 			*animation = 558;
 			_animationFrame = 0;
@@ -221,7 +221,7 @@ bool AIScriptTyrellGuard::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 562;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(562)) {
 			*animation = 558;
 			_animationFrame = 0;
@@ -230,7 +230,7 @@ bool AIScriptTyrellGuard::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 8:
 		*animation = 557;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(557)) {
 			*animation = 555;
 			_animationFrame = 0;
@@ -239,7 +239,7 @@ bool AIScriptTyrellGuard::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 9:
 		*animation = 563;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(563)) {
 			*animation = 555;
 			_animationFrame = 0;
@@ -249,7 +249,7 @@ bool AIScriptTyrellGuard::UpdateAnimation(int *animation, int *frame) {
 
 	case 10:
 		*animation = 564;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(564)) {
 			*animation = 555;
 			_animationFrame = 0;
@@ -259,7 +259,7 @@ bool AIScriptTyrellGuard::UpdateAnimation(int *animation, int *frame) {
 
 	case 11:
 		*animation = 565;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(565)) {
 			*animation = 555;
 			_animationFrame = 0;

engines/bladerunner/script/ai/zuben.cpp

@@ -656,7 +656,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 					_animationFrame = _animationLoopFrameMin;
 					_animationLoopDirection = 1;
 				}
-				_animationLoopCounter++;
+				++_animationLoopCounter;
 			} else {
 				_animationFrame += _animationLoopDirection;
 				_animationLoopLength = 0;
@@ -695,7 +695,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 			}
 		} else {
 			*animation = 418;
-			_animationFrame++;
+			++_animationFrame;
 			if (_animationFrame >= 24) {
 				_animationFrame = 5;
 			}
@@ -705,7 +705,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 1:
 		*animation = 399;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -713,7 +713,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 2:
 		*animation = 391;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -721,7 +721,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 3:
 		*animation = 400;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -729,7 +729,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		*animation = 392;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -737,7 +737,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 5:
 		*animation = 396;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT02PotDodgeCheck) {
@@ -750,7 +750,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		*animation = 397;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 0;
@@ -759,7 +759,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 7:
 		*animation = 388;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -767,7 +767,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 8:
 		*animation = 398;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 8) {
 			int sentenceId;
 			if (Random_Query(1, 2) == 1) {
@@ -798,7 +798,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 9:
 		*animation = 403;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			if (Actor_Query_Goal_Number(kActorZuben) == 99) {
 				_animationFrame = 0;
@@ -816,7 +816,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 10:
 		*animation = 404;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			if (Actor_Query_Goal_Number(kActorZuben) == 99) {
 				_animationFrame = 0;
@@ -834,7 +834,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 11:
 		*animation = 389;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			if (Actor_Query_Goal_Number(kActorZuben) == 99) {
 				_animationFrame = 0;
@@ -852,7 +852,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 12:
 		*animation = 390;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			if (Actor_Query_Goal_Number(kActorZuben) == 99) {
 				_animationFrame = 0;
@@ -870,7 +870,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 13:
 		*animation = 405;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 7) {
 			Sound_Play(kSfxZUBDEAD1, 30, 0, 0, 50);
 		}
@@ -886,7 +886,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 14:
 		*animation = 393;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 7) {
 			Sound_Play(kSfxZUBDEAD1, 30, 0, 0, 50);
 		}
@@ -917,7 +917,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 17:
 		*animation = 409;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 		}
@@ -925,7 +925,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 18:
 		*animation = 410;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 17;
@@ -935,7 +935,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 19:
 		*animation = 411;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 17;
@@ -945,7 +945,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 20:
 		*animation = 412;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 17;
@@ -955,7 +955,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 21:
 		*animation = 413;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 17;
@@ -965,7 +965,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 22:
 		*animation = 414;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 17;
@@ -975,7 +975,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 23:
 		*animation = 415;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 17;
@@ -985,7 +985,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 24:
 		*animation = 416;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 17;
@@ -995,7 +995,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 25:
 		*animation = 417;
-		 _animationFrame++;
+		 ++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
 			_animationState = 17;
@@ -1006,7 +1006,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 	case 26:
 		Actor_Set_Frame_Rate_FPS(kActorZuben, -1);
 		*animation = 419;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			// Time for McCoy to react and avoid tipping pot
 			Actor_Set_Frame_Rate_FPS(kActorZuben, -2);
@@ -1019,7 +1019,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 	case 27:  // Opening the door
 		Actor_Set_Frame_Rate_FPS(kActorZuben, -1);
 		*animation = 420;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 5) {
 			Overlay_Play("ct02over", 1, false, true, 0);
 		}
@@ -1036,7 +1036,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 
 	case 28:
 		*animation = 421;
-		_animationFrame++;
+		++_animationFrame;
 		if (_animationFrame == 1) {
 			Sound_Play(kSfxZUBLAND1, 80, 0, 0, 50);
 		}

engines/bladerunner/script/ai_script.cpp

@@ -153,11 +153,11 @@ void AIScripts::timerExpired(int actor, int timer) {
 		return;
 	}
 
-	_inScriptCounter++;
+	++_inScriptCounter;
 	if (_AIScripts[actor]) {
 		_AIScripts[actor]->TimerExpired(timer);
 	}
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 void AIScripts::completedMovementTrack(int actor) {
@@ -166,11 +166,11 @@ void AIScripts::completedMovementTrack(int actor) {
 	}
 
 	if (!_vm->_actors[actor]->inCombat()) {
-		_inScriptCounter++;
+		++_inScriptCounter;
 		if (_AIScripts[actor]) {
 			_AIScripts[actor]->CompletedMovementTrack();
 		}
-		_inScriptCounter--;
+		--_inScriptCounter;
 	}
 }
 
@@ -179,11 +179,11 @@ void AIScripts::receivedClue(int actor, int clueId, int fromActorId) {
 		return;
 	}
 
-	_inScriptCounter++;
+	++_inScriptCounter;
 	if (_AIScripts[actor]) {
 		_AIScripts[actor]->ReceivedClue(clueId, fromActorId);
 	}
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 void AIScripts::clickedByPlayer(int actor) {
@@ -196,11 +196,11 @@ void AIScripts::clickedByPlayer(int actor) {
 		return;
 	}
 
-	_inScriptCounter++;
+	++_inScriptCounter;
 	if (_AIScripts[actor]) {
 		_AIScripts[actor]->ClickedByPlayer();
 	}
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 void AIScripts::enteredScene(int actor, int setId) {
@@ -208,11 +208,11 @@ void AIScripts::enteredScene(int actor, int setId) {
 		return;
 	}
 
-	_inScriptCounter++;
+	++_inScriptCounter;
 	if (_AIScripts[actor]) {
 		_AIScripts[actor]->EnteredScene(setId);
 	}
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 void AIScripts::otherAgentEnteredThisScene(int actor, int otherActorId) {
@@ -220,11 +220,11 @@ void AIScripts::otherAgentEnteredThisScene(int actor, int otherActorId) {
 		return;
 	}
 
-	_inScriptCounter++;
+	++_inScriptCounter;
 	if (_AIScripts[actor]) {
 		_AIScripts[actor]->OtherAgentEnteredThisScene(otherActorId);
 	}
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 void AIScripts::otherAgentExitedThisScene(int actor, int otherActorId) {
@@ -232,39 +232,39 @@ void AIScripts::otherAgentExitedThisScene(int actor, int otherActorId) {
 		return;
 	}
 
-	_inScriptCounter++;
+	++_inScriptCounter;
 	if (_AIScripts[actor]) {
 		_AIScripts[actor]->OtherAgentExitedThisScene(otherActorId);
 	}
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 void AIScripts::otherAgentEnteredCombatMode(int actorId, int otherActorId, int combatMode) {
 	assert(actorId < _actorCount);
-	_inScriptCounter++;
+	++_inScriptCounter;
 	if (_AIScripts[actorId]) {
 		_AIScripts[actorId]->OtherAgentEnteredCombatMode(otherActorId, combatMode);
 	}
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 void AIScripts::shotAtAndMissed(int actorId) {
 	assert(actorId < _actorCount);
-	_inScriptCounter++;
+	++_inScriptCounter;
 	if (_AIScripts[actorId]) {
 		_AIScripts[actorId]->ShotAtAndMissed();
 	}
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 bool AIScripts::shotAtAndHit(int actorId) {
 	assert(actorId < _actorCount);
 	bool result = true;
-	_inScriptCounter++;
+	++_inScriptCounter;
 	if (_AIScripts[actorId]) {
 		result = _AIScripts[actorId]->ShotAtAndHit();
 	}
-	_inScriptCounter--;
+	--_inScriptCounter;
 	return result;
 }
 
@@ -273,11 +273,11 @@ void AIScripts::retired(int actor, int retiredByActorId) {
 		return;
 	}
 
-	_inScriptCounter++;
+	++_inScriptCounter;
 	if (_AIScripts[actor]) {
 		_AIScripts[actor]->Retired(retiredByActorId);
 	}
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 void AIScripts::goalChanged(int actor, int currentGoalNumber, int newGoalNumber) {
@@ -285,11 +285,11 @@ void AIScripts::goalChanged(int actor, int currentGoalNumber, int newGoalNumber)
 		return;
 	}
 
-	_inScriptCounter++;
+	++_inScriptCounter;
 	if (_AIScripts[actor]) {
 		_AIScripts[actor]->GoalChanged(currentGoalNumber, newGoalNumber);
 	}
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 bool AIScripts::reachedMovementTrackWaypoint(int actor, int waypointId) {
@@ -299,11 +299,11 @@ bool AIScripts::reachedMovementTrackWaypoint(int actor, int waypointId) {
 
 	bool result = false;
 	if (!_vm->_actors[actor]->inCombat()) {
-		_inScriptCounter++;
+		++_inScriptCounter;
 		if (_AIScripts[actor]) {
 			result = _AIScripts[actor]->ReachedMovementTrackWaypoint(waypointId);
 		}
-		_inScriptCounter--;
+		--_inScriptCounter;
 	}
 	return result;
 }
@@ -313,11 +313,11 @@ void AIScripts::updateAnimation(int actor, int *animation, int *frame) {
 		return;
 	}
 
-	_inScriptCounter++;
+	++_inScriptCounter;
 	if (_AIScripts[actor]) {
 		_AIScripts[actor]->UpdateAnimation(animation, frame);
 	}
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 void AIScripts::changeAnimationMode(int actor, int mode) {
@@ -325,11 +325,11 @@ void AIScripts::changeAnimationMode(int actor, int mode) {
 		return;
 	}
 
-	_inScriptCounter++;
+	++_inScriptCounter;
 	if (_AIScripts[actor]) {
 		_AIScripts[actor]->ChangeAnimationMode(mode);
 	}
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 void AIScripts::fledCombat(int actor) {
@@ -337,11 +337,11 @@ void AIScripts::fledCombat(int actor) {
 		return;
 	}
 
-	_inScriptCounter++;
+	++_inScriptCounter;
 	if (_AIScripts[actor]) {
 		_AIScripts[actor]->FledCombat();
 	}
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 void AIScripts::setAnimationState(int actor, int animationState, int animationFrame, int animationStateNext, int animationNext) {
@@ -349,11 +349,11 @@ void AIScripts::setAnimationState(int actor, int animationState, int animationFr
 		return;
 	}
 
-	_inScriptCounter++;
+	++_inScriptCounter;
 	if (_AIScripts[actor]) {
 		_AIScripts[actor]->SetAnimationState(animationState, animationFrame, animationStateNext, animationNext);
 	}
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 
@@ -362,11 +362,11 @@ void AIScripts::queryAnimationState(int actor, int *animationState, int *animati
 		return;
 	}
 
-	_inScriptCounter++;
+	++_inScriptCounter;
 	if (_AIScripts[actor]) {
 		_AIScripts[actor]->QueryAnimationState(animationState, animationFrame, animationStateNext, animationNext);
 	}
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 

engines/bladerunner/script/police_maze.cpp

@@ -91,20 +91,20 @@ PoliceMaze::PoliceMaze(BladeRunnerEngine *vm) : ScriptBase(vm) {
 	_pm_var1 = 0;
 	_pm_var2 = 0;
 
-	for (int i = 0; i < kNumMazeTracks; i++) {
+	for (int i = 0; i < kNumMazeTracks; ++i) {
 		_tracks[i] = new PoliceMazeTargetTrack(vm);
 	}
 }
 
 PoliceMaze::~PoliceMaze() {
-	for (int i = 0; i < kNumMazeTracks; i++) {
+	for (int i = 0; i < kNumMazeTracks; ++i) {
 		delete _tracks[i];
 		_tracks[i] = nullptr;
 	}
 }
 
 void PoliceMaze::clear(bool isLoadingGame) {
-	for (int i = 0; i < kNumMazeTracks; i++) {
+	for (int i = 0; i < kNumMazeTracks; ++i) {
 		if (_tracks[i]->isPresent()) {
 			_tracks[i]->clear(isLoadingGame);
 		}
@@ -122,7 +122,7 @@ void PoliceMaze::setPauseState(bool state) {
 
 	uint32 timeNow = _vm->_time->current();
 
-	for (int i = 0; i < kNumMazeTracks; i++) {
+	for (int i = 0; i < kNumMazeTracks; ++i) {
 		_tracks[i]->setTime(timeNow);
 	}
 }
@@ -141,12 +141,12 @@ void PoliceMaze::tick() {
 		return;
 	}
 
-	for (int i = 0; i < kNumMazeTracks; i++) {
+	for (int i = 0; i < kNumMazeTracks; ++i) {
 		_tracks[i]->tick();
 	}
 
 	bool notFound = true;
-	for (int i = 0; i < kNumMazeTracks; i++) {
+	for (int i = 0; i < kNumMazeTracks; ++i) {
 		if (!_tracks[i]->isPaused()) {
 			notFound = false;
 			break;
@@ -234,7 +234,7 @@ void PoliceMazeTargetTrack::add(int trackId, float startX, float startY, float s
 		double coefY = (endY - startY) * coef;
 		double coefZ = (endZ - startZ) * coef;
 
-		for (int i = 0; i < steps - 1; i++) {
+		for (int i = 0; i < steps - 1; ++i) {
 			_points[i].x = i * coefX + startX;
 			_points[i].y = i * coefY + startY;
 			_points[i].z = i * coefZ + startZ;
@@ -326,10 +326,10 @@ bool PoliceMazeTargetTrack::tick() {
 
 	if (_isMoving) {
 		if (_pointIndex < _pointTarget) {
-			_pointIndex++;
+			++_pointIndex;
 			advancePoint = true;
 		} else if (_pointIndex > _pointTarget) {
-			_pointIndex--;
+			--_pointIndex;
 			advancePoint = true;
 		} else {
 			_isMoving = 0;
@@ -346,7 +346,7 @@ bool PoliceMazeTargetTrack::tick() {
 	bool cont = true;
 
 	while (cont) {
-		_dataIndex++;
+		++_dataIndex;
 
 		switch (_data[_dataIndex - 1]) {
 		case kPMTIActivate:
@@ -379,7 +379,7 @@ bool PoliceMazeTargetTrack::tick() {
 		case kPMTIShoot:
 			{
 				int soundId = _data[_dataIndex++];
-				_dataIndex++; // second argument is not used
+				++_dataIndex; // second argument is not used
 #if BLADERUNNER_DEBUG_CONSOLE
 				debug("ItemId: %3i, Shoot, SoundId: %i", _itemId, soundId);
 #endif

engines/bladerunner/script/scene/nr02.cpp

@@ -251,7 +251,7 @@ void SceneScriptNR02::playNextMusic() {
 	} else if (track == 2) {
 		Music_Play(kMusicTaffy4, 41, 0, 2, -1, 0, 0);
 	}
-	track++;
+	++track;
 	if (track > 2) {
 		track = 0;
 	}

engines/bladerunner/script/scene/nr03.cpp

@@ -392,7 +392,7 @@ void SceneScriptNR03::playNextMusic() {
 		} else if (track == 2) {
 			Music_Play(kMusicGothic3, 51, 0, 2, -1, 0, 0);
 		}
-		track++;
+		++track;
 		if (track > 2) {
 			track = 0;
 		}

engines/bladerunner/script/scene/nr04.cpp

@@ -401,7 +401,7 @@ void SceneScriptNR04::playNextMusic() {
 	} else if (track == 2) {
 		Music_Play(kMusicGothic3, 11, 80, 2, -1, 0, 0);
 	}
-	track++;
+	++track;
 	if (track > 2) {
 		track = 0;
 	}

engines/bladerunner/script/scene/nr05.cpp

@@ -411,7 +411,7 @@ void SceneScriptNR05::playNextMusic() {
 		} else if (track == 2) {
 			Music_Play(kMusicArkDnce1, 41, -80, 2, -1, 0, 0);
 		}
-		track++;
+		++track;
 		if (track > 2) {
 			track = 0;
 		}

engines/bladerunner/script/scene/nr06.cpp

@@ -154,7 +154,7 @@ void SceneScriptNR06::playNextMusic() {
 		} else if (track == 2) {
 			Music_Play(kMusicArkDnce1, 41, -80, 2, -1, 0, 0);
 		}
-		track++;
+		++track;
 		if (track > 2) {
 			track = 0;
 		}

engines/bladerunner/script/scene/nr08.cpp

@@ -263,7 +263,7 @@ void SceneScriptNR08::playNextMusic() {
 		} else if (track == 2) {
 			Music_Play(kMusicArkDnce1, 41, -80, 2, -1, 0, 0);
 		}
-		track++;
+		++track;
 		if (track > 2) {
 			track = 0;
 		}

engines/bladerunner/script/scene/nr09.cpp

@@ -137,7 +137,7 @@ void SceneScriptNR09::playNextMusic() {
 		} else if (track == 2) {
 			Music_Play(kMusicArkDnce1, 41, -80, 2, -1, 0, 0);
 		}
-		track++;
+		++track;
 		if (track > 2) {
 			track = 0;
 		}

engines/bladerunner/script/scene_script.cpp

@@ -162,24 +162,24 @@ bool SceneScript::open(const Common::String &name) {
 }
 
 void SceneScript::initializeScene() {
-	_inScriptCounter++;
+	++_inScriptCounter;
 	_currentScript->InitializeScene();
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 void SceneScript::sceneLoaded() {
 	_vm->_sceneIsLoading = true;
-	_inScriptCounter++;
+	++_inScriptCounter;
 	_currentScript->SceneLoaded();
 	_vm->_sceneIsLoading = false;
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 bool SceneScript::mouseClick(int x, int y) {
 	if (_inScriptCounter > 0)
 		return true;
 
-	_inScriptCounter++;
+	++_inScriptCounter;
 	_mouseX = x;
 	_mouseY = y;
 	bool result = false;
@@ -187,7 +187,7 @@ bool SceneScript::mouseClick(int x, int y) {
 		result = _currentScript->MouseClick(x, y);
 	}
 	_vm->_runningActorId = -1;
-	_inScriptCounter--;
+	--_inScriptCounter;
 	_mouseX = -1;
 	_mouseY = -1;
 	return result;
@@ -198,10 +198,10 @@ bool SceneScript::clickedOn3DObject(const char *objectName, bool combatMode) {
 		return true;
 	}
 
-	_inScriptCounter++;
+	++_inScriptCounter;
 	bool result = _currentScript->ClickedOn3DObject(objectName, combatMode);
 	_vm->_runningActorId = -1;
-	_inScriptCounter--;
+	--_inScriptCounter;
 	return result;
 }
 
@@ -210,10 +210,10 @@ bool SceneScript::clickedOnActor(int actorId) {
 		return true;
 	}
 
-	_inScriptCounter++;
+	++_inScriptCounter;
 	bool result = _currentScript->ClickedOnActor(actorId);
 	_vm->_runningActorId = -1;
-	_inScriptCounter--;
+	--_inScriptCounter;
 	return result;
 }
 
@@ -229,10 +229,10 @@ bool SceneScript::clickedOnItem(int itemId, bool combatMode) {
 	}
 #endif // BLADERUNNER_ORIGINAL_BUGS
 
-	_inScriptCounter++;
+	++_inScriptCounter;
 	bool result = _currentScript->ClickedOnItem(itemId, combatMode);
 	_vm->_runningActorId = -1;
-	_inScriptCounter--;
+	--_inScriptCounter;
 	return result;
 }
 
@@ -241,10 +241,10 @@ bool SceneScript::clickedOnExit(int exitId) {
 		return true;
 	}
 
-	_inScriptCounter++;
+	++_inScriptCounter;
 	bool result = _currentScript->ClickedOnExit(exitId);
 	_vm->_runningActorId = -1;
-	_inScriptCounter--;
+	--_inScriptCounter;
 	return result;
 }
 
@@ -253,42 +253,42 @@ bool SceneScript::clickedOn2DRegion(int region) {
 		return true;
 	}
 
-	_inScriptCounter++;
+	++_inScriptCounter;
 	bool result = _currentScript->ClickedOn2DRegion(region);
 	_vm->_runningActorId = -1;
-	_inScriptCounter--;
+	--_inScriptCounter;
 	return result;
 }
 
 void SceneScript::sceneFrameAdvanced(int frame) {
-	_inScriptCounter++;
+	++_inScriptCounter;
 	_currentScript->SceneFrameAdvanced(frame);
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 void SceneScript::actorChangedGoal(int actorId, int newGoal, int oldGoal, bool currentSet) {
-	_inScriptCounter++;
+	++_inScriptCounter;
 	if (_currentScript)
 		_currentScript->ActorChangedGoal(actorId, newGoal, oldGoal, currentSet);
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 void SceneScript::playerWalkedIn() {
-	_inScriptCounter++;
+	++_inScriptCounter;
 	_currentScript->PlayerWalkedIn();
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 void SceneScript::playerWalkedOut() {
-	_inScriptCounter++;
+	++_inScriptCounter;
 	_currentScript->PlayerWalkedOut();
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 void SceneScript::dialogueQueueFlushed(int a1) {
-	_inScriptCounter++;
+	++_inScriptCounter;
 	_currentScript->DialogueQueueFlushed(a1);
-	_inScriptCounter--;
+	--_inScriptCounter;
 }
 
 } // End of namespace BladeRunner

engines/bladerunner/set.cpp

@@ -134,7 +134,7 @@ bool Set::open(const Common::String &name) {
 }
 
 void Set::addObjectsToScene(SceneObjects *sceneObjects) const {
-	for (int i = 0; i < _objectCount; i++) {
+	for (int i = 0; i < _objectCount; ++i) {
 #if BLADERUNNER_ORIGINAL_BUGS
 #else
 		overrideSceneObjectInfo(i); // For bugfixes with respect to clickable/targetable box positioning/bounding box
@@ -168,14 +168,14 @@ bool Set::isXZInWalkbox(float x, float z, const Walkbox &walkbox) {
 
 	float lastX = walkbox.vertices[walkbox.vertexCount - 1].x;
 	float lastZ = walkbox.vertices[walkbox.vertexCount - 1].z;
-	for (int i = 0; i < walkbox.vertexCount; i++) {
+	for (int i = 0; i < walkbox.vertexCount; ++i) {
 		float currentX = walkbox.vertices[i].x;
 		float currentZ = walkbox.vertices[i].z;
 
 		if ((currentZ > z && z >= lastZ) || (currentZ <= z && z < lastZ)) {
 			float lineX = (lastX - currentX) / (lastZ - currentZ) * (z - currentZ) + currentX;
 			if (x < lineX)
-				found++;
+				++found;
 		}
 		lastX = currentX;
 		lastZ = currentZ;
@@ -561,7 +561,7 @@ void Set::setupNewObjectInSet(Common::String objName, BoundingBox objBbox) {
 	_objects[objectId].isHotMouse  = 0;
 	_objects[objectId].unknown1    = 0;
 	_objects[objectId].isTarget    = 0; // init as false - Can be changed in Scene script eg. SceneLoaded() with (Un_)Combat_Target_Object
-	_objectCount++;
+	++_objectCount;
 }
 /**
 * Used for adding objects in a Set mainly to fix a few "McCoy walking to places he should not" issues

engines/bladerunner/set_effects.cpp

@@ -53,7 +53,7 @@ void SetEffects::read(Common::ReadStream *stream, int frameCount) {
 
 	_fogCount = stream->readUint32LE();
 	int i;
-	for (i = 0; i < _fogCount; i++) {
+	for (i = 0; i < _fogCount; ++i) {
 		int type = stream->readUint32LE();
 		Fog *fog = nullptr;
 		switch (type) {

engines/bladerunner/slice_renderer.cpp

@@ -38,7 +38,8 @@ SliceRenderer::SliceRenderer(BladeRunnerEngine *vm) {
 	_vm = vm;
 	_pixelFormat = screenPixelFormat();
 
-	for (int i = 0; i < ARRAYSIZE(_animationsShadowEnabled); i++) { // original game ss going just yp to 942 and not 997
+	// original game is going just up to 942 and not 997
+	for (int i = 0; i < ARRAYSIZE(_animationsShadowEnabled); ++i) {
 		_animationsShadowEnabled[i] = true;
 	}
 	_animation = -1;
@@ -356,7 +357,7 @@ void SliceLineIterator::advance() {
 	_currentZ     += _stepZ;
 	_currentSlice += _stepSlice;
 	_currentX     += _stepX;
-	_currentY     += 1;
+	++_currentY;
 
 	_sliceMatrix._m[0][2] += _stepX * 65536.0f;
 	_sliceMatrix._m[1][2] += _field_38 * 64.0f;
@@ -472,7 +473,7 @@ void SliceRenderer::drawInWorld(int animationId, int animationFrame, Vector3 pos
 		}
 
 		sliceLineIterator.advance();
-		frameY += 1;
+		++frameY;
 		zBufferLinePtr += 640;
 	}
 }
@@ -532,7 +533,7 @@ void SliceRenderer::drawOnScreen(int animationId, int animationFrame, int screen
 			memset(lineZbuffer, 0xFF, 640 * 2);
 			drawSlice(currentSlice, false, currentY, surface, lineZbuffer);
 			currentSlice += sliceStep;
-			currentY--;
+			--currentY;
 		}
 	}
 }
@@ -763,7 +764,7 @@ SliceRendererLights::SliceRendererLights(Lights *lights) {
 
 	_lights = lights;
 
-	for (int i = 0; i < 20; i++) {
+	for (int i = 0; i < 20; ++i) {
 		_cacheColor[i].r = 0.0f;
 		_cacheColor[i].g = 0.0f;
 		_cacheColor[i].b = 0.0f;
@@ -778,7 +779,7 @@ void SliceRendererLights::calculateColorBase(Vector3 position1, Vector3 position
 	_finalColor.b = 0.0f;
 	_cacheRecalculation = 0;
 	if (_lights) {
-		for (uint i = 0; i < _lights->_lights.size(); i++) {
+		for (uint i = 0; i < _lights->_lights.size(); ++i) {
 			Light *light = _lights->_lights[i];
 			if (i < 20) {
 				float cacheCoeficient = light->calculate(position1, position2/*, height*/);
@@ -812,7 +813,7 @@ void SliceRendererLights::calculateColorSlice(Vector3 position) {
 	_finalColor.b = 0.0f;
 
 	if (_lights) {
-		for (uint i = 0; i < _lights->_lights.size(); i++) {
+		for (uint i = 0; i < _lights->_lights.size(); ++i) {
 			Light *light = _lights->_lights[i];
 			if (i < 20) {
 				_cacheCounter[i] -= 1.0f;
@@ -821,7 +822,7 @@ void SliceRendererLights::calculateColorSlice(Vector3 position) {
 						_cacheCounter[i] = _cacheCounter[i] + _cacheStart[i];
 					} while (_cacheCounter[i] <= 0.0f);
 					light->calculateColor(&_cacheColor[i], position);
-					_cacheRecalculation++;
+					++_cacheRecalculation;
 				}
 				_finalColor.r += _cacheColor[i].r;
 				_finalColor.g += _cacheColor[i].g;
@@ -829,7 +830,7 @@ void SliceRendererLights::calculateColorSlice(Vector3 position) {
 			} else {
 				Color color;
 				light->calculateColor(&color, position);
-				_cacheRecalculation++;
+				++_cacheRecalculation;
 				_finalColor.r += color.r;
 				_finalColor.g += color.g;
 				_finalColor.b += color.b;

engines/bladerunner/subtitles.cpp

@@ -180,7 +180,7 @@ void Subtitles::init(void) {
 
 	//
 	// Loading text resources
-	for (int i = 0; i < kMaxTextResourceEntries; i++) {
+	for (int i = 0; i < kMaxTextResourceEntries; ++i) {
 		_vqaSubsTextResourceEntries[i] = new TextResource(_vm);
 		Common::String tmpConstructedFileName = "";
 		bool localizedResource = true;
@@ -373,7 +373,7 @@ void Subtitles::draw(Graphics::Surface &s) {
 
 	int y = s.h - (kMarginBottom + MAX(kPreferedLine, lines.size()) * _font->getFontHeight());
 
-	for (uint i = 0; i < lines.size(); i++, y += _font->getFontHeight()) {
+	for (uint i = 0; i < lines.size(); ++i, y += _font->getFontHeight()) {
 		switch (_subtitlesInfo.fontType) {
 			case Subtitles::kSubtitlesFontTypeInternal:
 				// shadow/outline is part of the font color data

engines/bladerunner/suspects_database.cpp

@@ -100,7 +100,7 @@ bool SuspectDatabaseEntry::addPhotoClue(int shapeId, int clueId) {
 	_photoClues[_photoClueCount].shapeId = shapeId;
 	_photoClues[_photoClueCount].notUsed = -1;
 
-	_photoClueCount++;
+	++_photoClueCount;
 	return true;
 }
 
@@ -236,7 +236,7 @@ SuspectsDatabase::SuspectsDatabase(BladeRunnerEngine *vm, int size) {
 }
 
 SuspectsDatabase::~SuspectsDatabase() {
-	for (int i = _suspects.size() - 1; i >= 0; i--) {
+	for (int i = _suspects.size() - 1; i >= 0; --i) {
 		delete _suspects.remove_at(i);
 	}
 	_suspects.clear();

engines/bladerunner/ui/end_credits.cpp

@@ -66,7 +66,7 @@ void EndCredits::show() {
 	int y = 452;
 	bool small = false;
 
-	for (int i = 0; i < textCount; i++) {
+	for (int i = 0; i < textCount; ++i) {
 		Common::String s = textResource->getText(i);
 		if (s.hasPrefix("^")) {
 			if (!small) {
@@ -113,7 +113,7 @@ void EndCredits::show() {
 
 		_vm->_surfaceFront.fillRect(Common::Rect(640, 480), 0);
 
-		for (int i = 0; i < textCount; i++) {
+		for (int i = 0; i < textCount; ++i) {
 			Common::String s = textResource->getText(i);
 			Font *font;
 			int height;

engines/bladerunner/ui/esper.cpp

@@ -1329,7 +1329,7 @@ void ESPER::copyImageBlur(Graphics::Surface &src, Common::Rect srcRect, Graphics
 						srcXCounter += srcRect.width();
 						if (srcXCounter >= dstRect.width()) {
 							srcXCounter -= dstRect.width();
-							srcX += 1; // bug in original game? Is using 1 instead of skipX as for Y
+							++srcX; // bug in original game? Advancing by 1 instead of skipX as for Y
 						}
 
 						srcX = CLIP(srcX, 0, src.w - 1);

engines/bladerunner/ui/kia_section_crimes.cpp

@@ -405,7 +405,7 @@ void KIASectionCrimes::updateSuspectPhoto() {
 	_suspectPhotoNotUsed = -1;
 	int photoCluesCount = suspect->getPhotoCount();
 	if (photoCluesCount > 0) {
-		for (int i = 0 ; i < photoCluesCount; i++) {
+		for (int i = 0 ; i < photoCluesCount; ++i) {
 			//TODO: weird stuff going on here... original game is using internal clue index instead id
 			if (_clues->isAcquired(suspect->getPhotoClueId(i))) {
 				_suspectPhotoShapeId = suspect->getPhotoShapeId(i);

engines/bladerunner/ui/kia_section_suspects.cpp

@@ -468,7 +468,7 @@ void KIASectionSuspects::updateSuspectPhoto() {
 	_suspectPhotoNotUsed = -1;
 	int photoCluesCount = suspect->getPhotoCount();
 	if (photoCluesCount > 0) {
-		for (int i = 0 ; i < photoCluesCount; i++) {
+		for (int i = 0 ; i < photoCluesCount; ++i) {
 			//TODO: weird stuff going on here... original game is using internal clue index instead id
 			if (_clues->isAcquired(suspect->getPhotoClueId(i))) {
 				_suspectPhotoShapeId = suspect->getPhotoShapeId(i);

engines/bladerunner/ui/scores.cpp

@@ -144,7 +144,7 @@ void Scores::tick() {
 
 	int y = 140;
 
-	for (int i = 0; i < 7; i++) {
+	for (int i = 0; i < 7; ++i) {
 		_font->drawString(&_vm->_surfaceFront, _txtScorers->getText(_scorers[i]), 220, y, _vm->_surfaceFront.w, 0);
 		_font->drawString(&_vm->_surfaceFront, Common::String::format("%d", _scores[_scorers[i]]), 360, y, _vm->_surfaceFront.w, 0);
 
@@ -159,7 +159,7 @@ void Scores::tick() {
 }
 
 void Scores::fill() {
-	for (int i = 0; i < 7; i++) {
+	for (int i = 0; i < 7; ++i) {
 		_scorers[i] = i;
 	}
 
@@ -187,7 +187,7 @@ void Scores::reset() {
 	_isLoaded = false;
 	_vqaPlayer = nullptr;
 
-	for (int i = 0; i < 7; i++) {
+	for (int i = 0; i < 7; ++i) {
 		_scores[i] = -80;
 		_scorers[i] = 0;
 	}
@@ -197,7 +197,7 @@ void Scores::reset() {
 }
 
 void Scores::save(SaveFileWriteStream &f) {
-	for (int i = 0; i < 7; i++) {
+	for (int i = 0; i < 7; ++i) {
 		f.writeInt(_scores[i]);
 	}
 
@@ -206,7 +206,7 @@ void Scores::save(SaveFileWriteStream &f) {
 }
 
 void Scores::load(SaveFileReadStream &f) {
-	for (int i = 0; i < 7; i++) {
+	for (int i = 0; i < 7; ++i) {
 		_scores[i] = f.readInt();
 	}
 

engines/bladerunner/ui/ui_image_picker.cpp

@@ -49,7 +49,7 @@ UIImagePicker::~UIImagePicker() {
 }
 
 void UIImagePicker::resetImages() {
-	for (int i = 0; i != _imageCount; i++) {
+	for (int i = 0; i != _imageCount; ++i) {
 		resetImage(i);
 	}
 }
@@ -63,8 +63,8 @@ bool UIImagePicker::defineImage(int i, Common::Rect rect, const Shape *shapeUp,
 
 	img.rect = rect;
 	// for rect to be inclusive
-	img.rect.right += 1;
-	img.rect.bottom += 1;
+	++(img.rect.right);
+	++(img.rect.bottom);
 	img.shapeUp = shapeUp;
 	img.shapeHovered = shapeHovered;
 	img.shapeDown = shapeDown;

engines/bladerunner/ui/ui_slider.cpp

@@ -104,7 +104,7 @@ void UISlider::draw(Graphics::Surface &surface) {
 
 	if (_rect.left + 1 < _rect.right - 1) {
 		int striding = _rect.left + sliderX;
-		for (int x = _rect.left + 1; x < _rect.right - 1; x++) {
+		for (int x = _rect.left + 1; x < _rect.right - 1; ++x) {
 			int colorIndex =  15 - (abs(sliderX - x) >> 2);
 
 			if (!_isEnabled) {

engines/bladerunner/vqa_player.cpp

@@ -115,7 +115,7 @@ int VQAPlayer::update(bool forceDraw, bool advanceFrame, bool useTime, Graphics:
 
 		if (loopEndQueued == -1) {
 			if (_repeatsCount != -1) {
-				_repeatsCount--;
+				--_repeatsCount;
 			}
 			//callback for repeat, it is not used in the blade runner
 		} else {
@@ -142,7 +142,7 @@ int VQAPlayer::update(bool forceDraw, bool advanceFrame, bool useTime, Graphics:
 		if (_hasAudio) {
 			int audioPreloadFrames = 14;
 			if (!_audioStarted) {
-				for (int i = 0; i < audioPreloadFrames; i++) {
+				for (int i = 0; i < audioPreloadFrames; ++i) {
 					if (_frameNext + i < _frameEnd) {
 						_decoder.readFrame(_frameNext + i, kVQAReadAudio);
 						queueAudioFrame(_decoder.decodeAudioFrame());
@@ -169,7 +169,7 @@ int VQAPlayer::update(bool forceDraw, bool advanceFrame, bool useTime, Graphics:
 				_frameNextTime = now + 60000 / 15;
 			}
 		}
-		_frameNext++;
+		++_frameNext;
 		result = _frame;
 	}