From a3dff1423d145f7d59aaa55798d303a219fd0116 Mon Sep 17 00:00:00 2001
From: mathusummut <mathusum.mut@gmail.com>
Date: Mon, 14 May 2018 21:38:59 +0200
Subject: [PATCH] Fixed travis issue+added git pull to setup.bat

---
 mk/windows/pull.bat                       | 127 ++++++++++++++++++++++
 mk/windows/setup.bat                      |   1 +
 source/glest_game/game/script_manager.cpp |   2 +-
 3 files changed, 129 insertions(+), 1 deletion(-)
 create mode 100644 mk/windows/pull.bat

diff --git a/mk/windows/pull.bat b/mk/windows/pull.bat
new file mode 100644
index 000000000..c698233a7
--- /dev/null
+++ b/mk/windows/pull.bat
@@ -0,0 +1,127 @@
+@echo off
+setlocal
+echo This will update all changes from the corresponding GitHub repositories.
+SET /P AREYOUSURE=Are you sure you want to do this? ([y]/n) 
+IF /I "%AREYOUSURE%"=="n" GOTO END
+IF /I "%AREYOUSURE%"=="N" GOTO END
+
+cd dependencies\src
+
+echo Updating curl...
+cd curl
+git pull
+cd ..
+Echo.
+
+echo Updating freetype...
+cd freetype
+git pull
+cd ..
+Echo.
+
+echo Updating fribidi...
+cd fribidi
+git pull
+cd ..
+Echo.
+
+echo Updating ftgl...
+cd ftgl
+git pull
+cd ..
+Echo.
+
+echo Updating glew...
+cd glew
+git pull
+cd ..
+Echo.
+
+echo Updating glut...
+cd glut
+git pull
+cd ..
+Echo.
+
+echo Updating irc...
+cd irc
+git pull
+cd ..
+Echo.
+
+echo Updating jpeg...
+cd jpeg
+git pull
+cd ..
+Echo.
+
+echo Updating lua...
+cd lua
+git pull
+cd ..
+Echo.
+
+echo Updating ogg...
+cd ogg
+git pull
+cd ..
+Echo.
+
+echo Updating openal...
+cd openal
+git pull
+cd ..
+Echo.
+
+echo Updating png...
+cd png
+git pull
+cd ..
+Echo.
+
+echo Updating sdl2...
+cd sdl2
+git pull
+cd ..
+Echo.
+
+echo Updating vorbis...
+cd vorbis
+git pull
+cd ..
+Echo.
+
+echo Updating wxwidgets...
+cd wxwidgets
+git pull
+cd ..
+Echo.
+
+echo Updating xerces...
+cd xerces
+git pull
+cd ..
+Echo.
+
+echo Updating zlib...
+cd zlib
+git pull
+cd ..
+Echo.
+
+echo Updating zetaglest-code...
+cd ..\..
+cd ..\..
+git pull
+Echo.
+
+echo Updating zetaglest-data...
+cd data
+git pull
+cd ..\
+Echo.
+
+cd mk\windows
+
+:END
+endlocal
\ No newline at end of file
diff --git a/mk/windows/setup.bat b/mk/windows/setup.bat
index 3b834414f..645e82b71 100644
--- a/mk/windows/setup.bat
+++ b/mk/windows/setup.bat
@@ -1,3 +1,4 @@
 @echo off
 call .\clone-deps.bat
+call .\pull.bat
 call .\build-zg.bat
\ No newline at end of file
diff --git a/source/glest_game/game/script_manager.cpp b/source/glest_game/game/script_manager.cpp
index 7970007bf..c91bc03ff 100644
--- a/source/glest_game/game/script_manager.cpp
+++ b/source/glest_game/game/script_manager.cpp
@@ -3115,7 +3115,7 @@ namespace
 						result = true;
 						break;
 					case utet_FieldChanged:
-						unit->setCurrField(value == 1 ? Field::fAir : Field::fLand);
+						unit->setCurrField(value == 1 ? Glest::Game::Field::fAir : Glest::Game::Field::fLand);
 						result = true;
 						break;
 				}