diff --git a/Data/Media/Images/Tiles/GreyBrickWallCenter.png b/Data/Media/Images/Tiles/GreyBrickWallCenter.png
new file mode 100644
index 0000000..b914ca0
Binary files /dev/null and b/Data/Media/Images/Tiles/GreyBrickWallCenter.png differ
diff --git a/Data/Media/Images/Tiles/GreyBrickWallDiagonaLeftBottom.png b/Data/Media/Images/Tiles/GreyBrickWallDiagonaLeftBottom.png
new file mode 100644
index 0000000..1984150
Binary files /dev/null and b/Data/Media/Images/Tiles/GreyBrickWallDiagonaLeftBottom.png differ
diff --git a/Data/Media/Images/Tiles/GreyBrickWallDiagonalLeftCenter.png b/Data/Media/Images/Tiles/GreyBrickWallDiagonalLeftCenter.png
new file mode 100644
index 0000000..566c3ba
Binary files /dev/null and b/Data/Media/Images/Tiles/GreyBrickWallDiagonalLeftCenter.png differ
diff --git a/Data/Media/Images/Tiles/GreyBrickWallDiagonalLeftTop.png b/Data/Media/Images/Tiles/GreyBrickWallDiagonalLeftTop.png
new file mode 100644
index 0000000..9fb60ab
Binary files /dev/null and b/Data/Media/Images/Tiles/GreyBrickWallDiagonalLeftTop.png differ
diff --git a/Data/Media/Images/Tiles/GreyBrickWallDiagonalRightBottom.png b/Data/Media/Images/Tiles/GreyBrickWallDiagonalRightBottom.png
new file mode 100644
index 0000000..dc2eeb3
Binary files /dev/null and b/Data/Media/Images/Tiles/GreyBrickWallDiagonalRightBottom.png differ
diff --git a/Data/Media/Images/Tiles/GreyBrickWallDiagonalRightCenter.png b/Data/Media/Images/Tiles/GreyBrickWallDiagonalRightCenter.png
new file mode 100644
index 0000000..110c66c
Binary files /dev/null and b/Data/Media/Images/Tiles/GreyBrickWallDiagonalRightCenter.png differ
diff --git a/Data/Media/Images/Tiles/GreyBrickWallDiagonalRightTop.png b/Data/Media/Images/Tiles/GreyBrickWallDiagonalRightTop.png
new file mode 100644
index 0000000..be679f6
Binary files /dev/null and b/Data/Media/Images/Tiles/GreyBrickWallDiagonalRightTop.png differ
diff --git a/Data/Media/Images/Tiles/GreyBrickWallLeft.png b/Data/Media/Images/Tiles/GreyBrickWallLeft.png
new file mode 100644
index 0000000..c2d9e0d
Binary files /dev/null and b/Data/Media/Images/Tiles/GreyBrickWallLeft.png differ
diff --git a/Data/Media/Images/Tiles/GreyBrickWallRight.png b/Data/Media/Images/Tiles/GreyBrickWallRight.png
new file mode 100644
index 0000000..07f1b92
Binary files /dev/null and b/Data/Media/Images/Tiles/GreyBrickWallRight.png differ
diff --git a/Data/Media/Images/Tiles/MessyBrickWall.png b/Data/Media/Images/Tiles/MessyBrickWall.png
new file mode 100644
index 0000000..5acd236
Binary files /dev/null and b/Data/Media/Images/Tiles/MessyBrickWall.png differ
diff --git a/Data/Media/Images/Tiles/SlateBrickWall.png b/Data/Media/Images/Tiles/SlateBrickWall.png
new file mode 100644
index 0000000..82693b3
Binary files /dev/null and b/Data/Media/Images/Tiles/SlateBrickWall.png differ
diff --git a/Data/Media/Images/Tiles/grass.png b/Data/Media/Images/Tiles/grass.png
index 7984135..b506b25 100644
Binary files a/Data/Media/Images/Tiles/grass.png and b/Data/Media/Images/Tiles/grass.png differ
diff --git a/Data/Media/Maps/map b/Data/Media/Maps/map
index 78cc7d6..0e5b0cf 100644
--- a/Data/Media/Maps/map
+++ b/Data/Media/Maps/map
@@ -1,1141 +1,4078 @@
\ No newline at end of file
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+ grass
+ false
+
+ null
+ false
+
+ 100
+
+ null
+ 0
+ 0
+
+
+
+
diff --git a/Unuk-QT/Makefile b/Unuk-QT/Makefile
index ddad5f6..61cc84b 100644
--- a/Unuk-QT/Makefile
+++ b/Unuk-QT/Makefile
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: Unuk-QT
-# Generated by qmake (2.01a) (Qt 4.7.3) on: Mon Dec 19 22:05:17 2011
+# Generated by qmake (2.01a) (Qt 4.7.3) on: Wed Dec 21 23:06:49 2011
# Project: Unuk-QT.pro
# Template: app
# Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
diff --git a/Unuk-QT/Unuk-QT.pro b/Unuk-QT/Unuk-QT.pro
index 490e7fe..8fff901 100644
--- a/Unuk-QT/Unuk-QT.pro
+++ b/Unuk-QT/Unuk-QT.pro
@@ -6,7 +6,8 @@ LIBS += -lGL \
-ltinyxml \
-lGLU
RESOURCES +=
-OTHER_FILES += ../src/libUnuk/Debug.o
+OTHER_FILES += ../src/libUnuk/Debug.o \
+ ../Data/Media/Maps/map
HEADERS += ../src/libUnuk/Debug.h \
../src/Libs/wglext.h \
../src/Libs/glxext.h \
diff --git a/maptest.png b/maptest.png
new file mode 100644
index 0000000..06caeed
Binary files /dev/null and b/maptest.png differ
diff --git a/src/libUnuk/MainMenu.cpp b/src/libUnuk/MainMenu.cpp
index 5a58313..954c9db 100644
--- a/src/libUnuk/MainMenu.cpp
+++ b/src/libUnuk/MainMenu.cpp
@@ -91,8 +91,8 @@ mainMenuNavVal_t MainMenu::Run(void) {
if(btnNewGameActive) {
if(btnNewGameYes.CheckMouseOver())
return mainMenuNewGame;
-// else if(btnNewGameNo.CheckMouseOver())
-// return btnNewGameActive = false;
+ //else if(btnNewGameNo.CheckMouseOver())
+ //return btnNewGameActive = false;
}
}
}
diff --git a/src/libUnuk/Makefile b/src/libUnuk/Makefile
index 0fbbc53..04590cc 100644
--- a/src/libUnuk/Makefile
+++ b/src/libUnuk/Makefile
@@ -2,7 +2,7 @@ CC = g++
CFLAGS = -ansi -Wall -g
LDADD = -lGL -lGLU -lSDL -lSDL_ttf -lSDL_gfx -lSDL_image -ltinyxml
objects = ApplySurface.o Button.o ButtonToggle.o Character.o Collision.o \
- Debug.o DialogueBox.o Font.o FPS.o ImageLoader.o IngameMenu.o Input.o MainMenu.o \
+ Debug.o Font.o FPS.o ImageLoader.o IngameMenu.o Input.o MainMenu.o \
Map.o MapElement.o MapEntities.o NPC.o ParticleEmitter.o \
Rect.o Text.o Texture.o TextureManager.o Timer.o \