Merge remote-tracking branch 'upstream/master' into master

Northfear · Oct 10, 2020 · 0ffd8b6 · 0ffd8b6
2 parents 1c6661e + 97a51b7
commit 0ffd8b6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,10 +30,17 @@ addons:
     - libvorbis-dev
     - openssh-client
     - python-dev
+  homebrew:
+    packages:
+    - sdl
+    - openal-soft
+    - sdl_mixer
+    - libpng
+    - libvorbis
+    update: true
   ssh_known_hosts: frs.sourceforge.net
 
 before_install:
-  - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install sdl openal-soft sdl_mixer libpng libvorbis; fi
   - touch id_travissfbot
   - if [[ $TRAVIS_SECURE_ENV_VARS == "true" ]]; then openssl aes-256-cbc -K $encrypted_d3cf1349d561_key -iv $encrypted_d3cf1349d561_iv -in testing/id_travissfbot.enc -out id_travissfbot -d; fi
   - chmod 0600 id_travissfbot

diff --git a/gemrb/core/DialogHandler.cpp b/gemrb/core/DialogHandler.cpp
@@ -224,11 +224,11 @@ void DialogHandler::EndDialog(bool try_to_break)
 	originalTargetID = 0;
 
 	if (tmp) {
-		tmp->LeaveDialog();
+		tmp->LeftDialog();
 	}
 	if (tmp2 && tmp2->Type == ST_ACTOR) {
 		tmp = (Actor *)tmp2;
-		tmp->LeaveDialog();
+		tmp->LeftDialog();
 		tmp->SetCircleSize();
 	}
 	ds = NULL;
@@ -363,6 +363,7 @@ bool DialogHandler::DialogChoose(unsigned int choose)
 		//follow external linkage, if required
 		if (tr->Dialog[0] && strnicmp( tr->Dialog, dlg->ResRef, 8 )) {
 			//target should be recalculated!
+			target->LeftDialog();
 			tgt = NULL;
 			tgta = NULL;
 			if (originalTargetID) {

diff --git a/gemrb/core/Scriptable/Scriptable.cpp b/gemrb/core/Scriptable/Scriptable.cpp
@@ -626,7 +626,7 @@ unsigned long Scriptable::GetWait() const
 	return WaitCounter;
 }
 
-void Scriptable::LeaveDialog()
+void Scriptable::LeftDialog()
 {
 	AddTrigger(TriggerEntry(trigger_wasindialog));
 }

diff --git a/gemrb/core/Scriptable/Scriptable.h b/gemrb/core/Scriptable/Scriptable.h
@@ -306,7 +306,7 @@ class GEM_EXPORT Scriptable {
 	void SetSpellResRef(ieResRef resref);
 	void SetWait(unsigned long time);
 	unsigned long GetWait() const;
-	void LeaveDialog();
+	void LeftDialog();
 	void Interrupt();
 	void NoInterrupt();
 	void Hide();

diff --git a/gemrb/plugins/AREImporter/AREImporter.cpp b/gemrb/plugins/AREImporter/AREImporter.cpp
@@ -1226,6 +1226,8 @@ Map* AREImporter::GetMap(const char *ResRef, bool day_or_night)
 			anim->startFrameRange = 0; //this will never get resaved (iirc)
 			str->Read( &anim->skipcycle,1 ); //how many cycles are skipped	(100% skippage)
 			str->ReadResRef( anim->PaletteRef );
+			// TODO: EE: word with anim width for PVRZ/WBM resources (if flag bits are set, see A_ANI_ defines)
+			// 0x4a holds the height
 			str->ReadDword( &anim->unknown48 );
 
 			if (pst) {