Merge branch 'master' of https://github.com/tcsullivan/gamedev

2 files changed, 8 insertions, 9 deletions

diff --git a/assets/antree.png b/assets/antree.png
new file mode 100644
index 0000000..c3d9146
--- /dev/null
+++ b/assets/antree.png
diff --git a/main.cpp b/main.cpp
index 589d9df..1ca4c45 100644
--- a/main.cpp
+++ b/main.cpp
@@ -49,8 +49,7 @@ SDL_GLContext  mainGLContext = NULL;
  * 
 */
 
-static GLuint  bgImage;
-static GLuint  bgFar;
+static GLuint  bgImage, bgTreesFirst;
 
 /*
  *	gameRunning
@@ -368,7 +367,7 @@ int main(int argc, char *argv[]){
 	*/
 	
 	bgImage=Texture::loadTexture("assets/bg.png");
-	bgFar =	Texture::loadTexture("assets/bgfarMountains.png");
+	bgTreesFirst =	Texture::loadTexture("assets/antree.png");
 	
 	/*
 	 *	Load sprites used in the inventory menu. See src/inventory.cpp
@@ -556,13 +555,13 @@ void render(){
 		glTexCoord2i(0,0);glVertex2i(-SCREEN_WIDTH*2,SCREEN_HEIGHT);
 	glEnd();
 
-	glBindTexture(GL_TEXTURE_2D, bgFar);
-	glColor4ub(255,255,255,155);
+	glBindTexture(GL_TEXTURE_2D, bgTreesFirst);
+	glColor4ub(255,255,255,200);
 	glBegin(GL_QUADS);
-		glTexCoord2i(0,1);glVertex2i(-SCREEN_WIDTH,0);
-		glTexCoord2i(1,1);glVertex2i( SCREEN_WIDTH,0);
-		glTexCoord2i(1,0);glVertex2i( SCREEN_WIDTH,391);
-		glTexCoord2i(0,0);glVertex2i(-SCREEN_WIDTH,391);
+		glTexCoord2i(0,1);glVertex2i(0   	+player->loc.x*.25,	100);
+		glTexCoord2i(1,1);glVertex2i(7680	+player->loc.x*.25,	100);
+		glTexCoord2i(1,0);glVertex2i(7680	+player->loc.x*.25,	2260);
+		glTexCoord2i(0,0);glVertex2i(0   	+player->loc.x*.25,	2260);
 	glEnd();
 	glDisable(GL_TEXTURE_2D);