working on Windows now, looks good

Author: hmaon

src/Engine/Surface.cpp

@@ -25,6 +25,7 @@
 #include "Exception.h"
 #include "ShaderMove.h"
 
+
 namespace OpenXcom
 {
 
@@ -42,12 +43,22 @@ namespace OpenXcom
 Surface::Surface(int width, int height, int x, int y) : _x(x), _y(y), _visible(true), _hidden(false), _redraw(false), _originalColors(0), _misalignedPixelBuffer(0), _alignedBuffer(0)
 {
 	//_surface = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, 8, 0, 0, 0, 0);
-	int rc;
 	int pitch = ((width+15)& ~0xF);
+
+#ifndef _WIN32
+	int rc;
 	if ((rc = posix_memalign(&_alignedBuffer, 16, pitch * height)))
 	{
 		throw Exception(strerror(rc));
 	}
+#else
+	// of course Windows has to be difficult about this!
+	_alignedBuffer = _aligned_malloc(pitch*height, 16);
+	if (!_alignedBuffer)
+	{
+		throw Exception("Where's the memory, Lebowski?");
+	}
+#endif
 
 	memset(_alignedBuffer, 0, pitch * height);
 
@@ -93,7 +104,11 @@ Surface::Surface(const Surface& other)
 Surface::~Surface()
 {
 	//if (_misalignedPixelBuffer) _surface->pixels = _misalignedPixelBuffer;
+#ifdef _WIN32
+	if (_alignedBuffer) _aligned_free(_alignedBuffer);
+#else
 	if (_alignedBuffer) free(_alignedBuffer);
+#endif
 	SDL_FreeSurface(_surface);
 }
 
@@ -143,7 +158,11 @@ void Surface::loadScr(const std::string &filename)
 void Surface::loadImage(const std::string &filename)
 {
 	// Destroy current surface (will be replaced)
+#ifdef _WIN32
+	if (_alignedBuffer) _aligned_free(_alignedBuffer);
+#else
 	if (_alignedBuffer) free(_alignedBuffer); 
+#endif
 	_alignedBuffer = 0;
 	SDL_FreeSurface(_surface);
 	_surface = 0;
@@ -218,7 +237,8 @@ void Surface::clear()
 	square.y = 0;
 	square.w = getWidth();
 	square.h = getHeight();
-	SDL_FillRect(_surface, &square, 0);
+	if (_surface->flags & SDL_SWSURFACE) memset(_surface->pixels, 0, _surface->h*_surface->pitch);
+	else SDL_FillRect(_surface, &square, 0);
 }
 
 /**

src/Engine/Zoom.cpp

@@ -30,9 +30,12 @@
 #include <intrin.h>
 #endif
 
+#ifdef __GNUC__
+#include <cpuid.h>
+#endif
+
 #ifdef __SSE2__
 #include <emmintrin.h> // for SSE2 intrinsics; see http://msdn.microsoft.com/en-us/library/has3d153%28v=vs.71%29.aspx
-#include <cpuid.h>
 #endif
 
 
@@ -567,7 +570,7 @@ static int zoomSurface2X_SSE2(SDL_Surface *src, SDL_Surface *dst)
 
 static bool haveSSE2()
 {
-	unsigned int CPUInfo[4];
+	int CPUInfo[4];
 
 #ifdef __GNUC__
 	__get_cpuid(1, CPUInfo, CPUInfo+1, CPUInfo+2, CPUInfo+3);