[Scummvm-git-logs] scummvm master -> b705a5e90e1ca92bdff9bd6fd3b64da2a7e23214

[dreammaster]

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

Summary:
1426864aa1 DISTS: Disable bidi for Visual Studio builds
b705a5e90e NUVIE: Fix crash whilst resting


Commit: 1426864aa15e19dc89c1eca16255a8a67b1f2657
    https://github.com/scummvm/scummvm/commit/1426864aa15e19dc89c1eca16255a8a67b1f2657
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-08-02T11:47:39-07:00

Commit Message:
DISTS: Disable bidi for Visual Studio builds

As with fluidsynth, it'll be easier on developers if we keep
the new library disabled until such time as someone can
build the library and include in the VS libraries zip file.

Changed paths:
    dists/msvc/create_msvc.bat


diff --git a/dists/msvc/create_msvc.bat b/dists/msvc/create_msvc.bat
index 6746a98f88..6e13025fbc 100644
--- a/dists/msvc/create_msvc.bat
+++ b/dists/msvc/create_msvc.bat
@@ -55,14 +55,14 @@ goto done
 echo.
 echo Creating project files with all engines enabled (stable and unstable)
 echo.
-create_project ..\.. --enable-all-engines --disable-fluidsynth --msvc
+create_project ..\.. --enable-all-engines --disable-fluidsynth --disable-fribidi --msvc
 goto done
 
 :stable
 echo.
 echo Creating normal project files, with only the stable engines enabled
 echo.
-create_project ..\.. --disable-fluidsynth --msvc
+create_project ..\.. --disable-fluidsynth --disable-fribidi --msvc
 goto done
 
 :tools


Commit: b705a5e90e1ca92bdff9bd6fd3b64da2a7e23214
    https://github.com/scummvm/scummvm/commit/b705a5e90e1ca92bdff9bd6fd3b64da2a7e23214
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-08-02T11:57:18-07:00

Commit Message:
NUVIE: Fix crash whilst resting

Changed paths:
    engines/ultima/shared/std/containers.h


diff --git a/engines/ultima/shared/std/containers.h b/engines/ultima/shared/std/containers.h
index f1dafb2fe6..e0b5e13a07 100644
--- a/engines/ultima/shared/std/containers.h
+++ b/engines/ultima/shared/std/containers.h
@@ -103,7 +103,7 @@ public:
 
 	vector() : Common::Array<T>() {}
 	vector(size_t newSize) : Common::Array<T>() {
-		Common::Array<T>::reserve(newSize);
+		Common::Array<T>::resize(newSize);
 	}
 	vector(size_t newSize, const T elem) {
 		resize(newSize, elem);