Merge branch 'master' of github.com:Wargus/stratagus

appveyor.yml

@@ -1,4 +1,4 @@
-os: Visual Studio 2015
+# os: Visual Studio 2015
 shallow_clone: true
 configuration:
   - Release
@@ -9,7 +9,7 @@ before_build:
   - 7z x dependencies.zip
   - appveyor DownloadFile https://github.com/jimpark/unsis/releases/download/2.50.0/nsis-2.50.0-Unicode-setup.exe
   - nsis-2.50.0-Unicode-setup.exe /S /D=C:\Program Files (x86)\NSIS
-  - cmake -G "Visual Studio 14 2015" -T v140_xp -DCMAKE_PREFIX_PATH="%cd%\\dependencies" -DENABLE_NSIS=ON -DENABLE_STDIO_REDIRECT=ON ..
+  - cmake -G "Visual Studio 14 2015" -DCMAKE_PREFIX_PATH="%cd%\\dependencies" -DENABLE_NSIS=ON -DENABLE_STDIO_REDIRECT=ON ..
   - cd ..
 after_build:
   - 7z a compiled-binaries.zip %cd%\build\stratagus.exe %cd%\build\dependencies\bin\*.dll

doc/index.html

@@ -57,7 +57,7 @@
     <ul>
     <li>Wargus - Warcraft II - <a href="https://launchpad.net/wargus">https://launchpad.net/wargus</a>
     <li>Doom Wars  - <a href="http://stratagus.com/games/doom-wars">http://stratagus.com/games/doom-wars</a>
-    <li>Wyrmsun  - <a href="ttps://github.com/andrettin/wyrmsun">ttps://github.com/andrettin/wyrmsun</a><br>
+    <li>Wyrmsun  - <a href="https://github.com/andrettin/wyrmsun">https://github.com/andrettin/wyrmsun</a><br>
 	(uses modified engine version : <a href="https://github.com/Andrettin/Wyrmgus">https://github.com/Andrettin/Wyrmgus</a>)</li>
     <li>War1gus - Warcraft I - <a href="https://launchpad.net/war1gus">https://launchpad.net/war1gus</a>
     <li>Stargus - Starcraft I - <a href="https://launchpad.net/stargus">https://launchpad.net/stargus</a>

src/video/png.cpp

@@ -353,7 +353,7 @@ void SaveScreenshotPNG(const char *name)
 			// switch back to framebuffer
 			glBindFramebuffer(GL_FRAMEBUFFER_EXT, fullscreenFramebuffer);
 		}
-		for (int i = 0; i < Video.Height; ++i) {
+		for (int i = 0; i < Video.ViewportHeight; ++i) {
 			png_write_row(png_ptr, &pixels[(Video.ViewportHeight - 1 - i) * Video.ViewportWidth * 3]);
 		}
 		delete []pixels;