From fa341a962e351de9efba3cd6d3dccb582b625721 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Sun, 22 Jan 2017 12:03:22 -0500
Subject: windows

---
 src/common.cpp     | 5 ++---
 src/components.cpp | 2 +-
 src/player.cpp     | 4 ++--
 src/texture.cpp    | 1 +
 src/ui.cpp         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/common.cpp b/src/common.cpp
index 37f5c78..8c63800 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -8,17 +8,16 @@
 #include <iostream>
 #include <list>
 #include <sstream>
+#include <vector>
 
 #include <error.hpp>
+#include <texture.hpp>
 
 #ifndef __WIN32__
 
 #include <sys/types.h>
 #include <dirent.h>
 #include <errno.h>
-#include <vector>
-
-#include <texture.hpp>
 
 #endif // __WIN32__
 
diff --git a/src/components.cpp b/src/components.cpp
index d8321f4..7cb533c 100644
--- a/src/components.cpp
+++ b/src/components.cpp
@@ -297,7 +297,7 @@ std::vector<Frame> developFrame(XMLElement* xml)
 	std::vector<Frame> tmp;
 	SpriteData* sd;	
 
-	uint limb = 0;
+	unsigned int limb = 0;
 
 	vec2 foffset;
 	vec2 fsize;
diff --git a/src/player.cpp b/src/player.cpp
index 78c0b8e..da71914 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -91,9 +91,9 @@ void PlayerSystem::create(void)
 	auto entan = player.assign<Animate>();
 	auto animx = xmld.FirstChildElement()->FirstChildElement();
 	
-	uint limbid 		= 0;
+	unsigned int limbid 		= 0;
 	float limbupdate 	= 0;
-	uint limbupdatetype = 0;
+	unsigned int limbupdatetype = 0;
 	
 	while (animx) {	
 		std::string animType = animx->Name();
diff --git a/src/texture.cpp b/src/texture.cpp
index ad06967..5723bd8 100644
--- a/src/texture.cpp
+++ b/src/texture.cpp
@@ -2,6 +2,7 @@
 
 #include <algorithm>
 #include <string>
+#include <stdexcept>
 
 #include <SDL2/SDL_image.h>
 
diff --git a/src/ui.cpp b/src/ui.cpp
index 7a81bd5..b14ea2c 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -1107,7 +1107,7 @@ namespace ui {
 
 		std::vector<GLubyte> bgr (SCREEN_WIDTH * SCREEN_HEIGHT * 3, 0);
 
-		for(uint x = 0; x < SCREEN_WIDTH*SCREEN_HEIGHT*3; x+=3) {
+		for(unsigned int x = 0; x < SCREEN_WIDTH*SCREEN_HEIGHT*3; x+=3) {
 			bgr[x] = pixels[x+2];
 			bgr[x+1] = pixels[x+1];
 			bgr[x+2] = pixels[x];
-- 
cgit v1.2.3