diff --git a/Unuk-QT/Makefile b/Unuk-QT/Makefile
index 440db88..e48dc26 100644
--- a/Unuk-QT/Makefile
+++ b/Unuk-QT/Makefile
@@ -1,25 +1,25 @@
#############################################################################
# Makefile for building: Unuk-QT
-# Generated by qmake (2.01a) (Qt 4.7.4) on: Wed Feb 1 18:06:22 2012
+# Generated by qmake (2.01a) (Qt 4.7.4) on: Wed Feb 1 21:18:56 2012
# 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
+# Command: /home/kono/QtSDK/Desktop/Qt/474/gcc/bin/qmake -spec ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
#############################################################################
####### Compiler, tools and options
CC = gcc
CXX = g++
-DEFINES = -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
+DEFINES = -DQT_GUI_LIB -DQT_CORE_LIB
CFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
CXXFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I.
+INCPATH = -I../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/linux-g++ -I. -I../../../QtSDK/Desktop/Qt/474/gcc/include/QtCore -I../../../QtSDK/Desktop/Qt/474/gcc/include/QtGui -I../../../QtSDK/Desktop/Qt/474/gcc/include -I.
LINK = g++
-LFLAGS =
-LIBS = $(SUBLIBS) -L/usr/lib -lGL -lSDL -lSDL_ttf -lSDL_image -lSDL_gfx -ltinyxml -lGLU -lQtGui -lQtCore -lpthread
+LFLAGS = -Wl,-rpath,/home/kono/QtSDK/Desktop/Qt/474/gcc/lib
+LIBS = $(SUBLIBS) -L/home/kono/QtSDK/Desktop/Qt/474/gcc/lib -lGL -lSDL -lSDL_ttf -lSDL_image -lSDL_gfx -ltinyxml -lGLU -lQtGui -lQtCore -lpthread
AR = ar cqs
RANLIB =
-QMAKE = /usr/bin/qmake-qt4
+QMAKE = /home/kono/QtSDK/Desktop/Qt/474/gcc/bin/qmake
TAR = tar -cf
COMPRESS = gzip -9f
COPY = cp -f
@@ -109,25 +109,26 @@ OBJECTS = WorldManager.o \
EventHistory.o \
Bar.o \
Vec2.o
-DIST = /usr/share/qt4/mkspecs/common/g++.conf \
- /usr/share/qt4/mkspecs/common/unix.conf \
- /usr/share/qt4/mkspecs/common/linux.conf \
- /usr/share/qt4/mkspecs/qconfig.pri \
- /usr/share/qt4/mkspecs/features/qt_functions.prf \
- /usr/share/qt4/mkspecs/features/qt_config.prf \
- /usr/share/qt4/mkspecs/features/exclusive_builds.prf \
- /usr/share/qt4/mkspecs/features/default_pre.prf \
- /usr/share/qt4/mkspecs/features/debug.prf \
- /usr/share/qt4/mkspecs/features/default_post.prf \
- /usr/share/qt4/mkspecs/features/warn_on.prf \
- /usr/share/qt4/mkspecs/features/qt.prf \
- /usr/share/qt4/mkspecs/features/unix/thread.prf \
- /usr/share/qt4/mkspecs/features/moc.prf \
- /usr/share/qt4/mkspecs/features/resources.prf \
- /usr/share/qt4/mkspecs/features/uic.prf \
- /usr/share/qt4/mkspecs/features/yacc.prf \
- /usr/share/qt4/mkspecs/features/lex.prf \
- /usr/share/qt4/mkspecs/features/include_source_dir.prf \
+DIST = ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/g++.conf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/unix.conf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/linux.conf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/qconfig.pri \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/modules/qt_webkit_version.pri \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_functions.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_config.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/exclusive_builds.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_pre.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/debug.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_post.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/warn_on.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/unix/thread.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/moc.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/resources.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/uic.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/yacc.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/lex.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/include_source_dir.prf \
Unuk-QT.pro
QMAKE_TARGET = Unuk-QT
DESTDIR =
@@ -160,51 +161,49 @@ all: Makefile $(TARGET)
$(TARGET): $(OBJECTS)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
-Makefile: Unuk-QT.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \
- /usr/share/qt4/mkspecs/common/unix.conf \
- /usr/share/qt4/mkspecs/common/linux.conf \
- /usr/share/qt4/mkspecs/qconfig.pri \
- /usr/share/qt4/mkspecs/features/qt_functions.prf \
- /usr/share/qt4/mkspecs/features/qt_config.prf \
- /usr/share/qt4/mkspecs/features/exclusive_builds.prf \
- /usr/share/qt4/mkspecs/features/default_pre.prf \
- /usr/share/qt4/mkspecs/features/debug.prf \
- /usr/share/qt4/mkspecs/features/default_post.prf \
- /usr/share/qt4/mkspecs/features/warn_on.prf \
- /usr/share/qt4/mkspecs/features/qt.prf \
- /usr/share/qt4/mkspecs/features/unix/thread.prf \
- /usr/share/qt4/mkspecs/features/moc.prf \
- /usr/share/qt4/mkspecs/features/resources.prf \
- /usr/share/qt4/mkspecs/features/uic.prf \
- /usr/share/qt4/mkspecs/features/yacc.prf \
- /usr/share/qt4/mkspecs/features/lex.prf \
- /usr/share/qt4/mkspecs/features/include_source_dir.prf \
- /usr/lib/libQtGui.prl \
- /usr/lib/libQtCore.prl
- $(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
-/usr/share/qt4/mkspecs/common/g++.conf:
-/usr/share/qt4/mkspecs/common/unix.conf:
-/usr/share/qt4/mkspecs/common/linux.conf:
-/usr/share/qt4/mkspecs/qconfig.pri:
-/usr/share/qt4/mkspecs/features/qt_functions.prf:
-/usr/share/qt4/mkspecs/features/qt_config.prf:
-/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
-/usr/share/qt4/mkspecs/features/default_pre.prf:
-/usr/share/qt4/mkspecs/features/debug.prf:
-/usr/share/qt4/mkspecs/features/default_post.prf:
-/usr/share/qt4/mkspecs/features/warn_on.prf:
-/usr/share/qt4/mkspecs/features/qt.prf:
-/usr/share/qt4/mkspecs/features/unix/thread.prf:
-/usr/share/qt4/mkspecs/features/moc.prf:
-/usr/share/qt4/mkspecs/features/resources.prf:
-/usr/share/qt4/mkspecs/features/uic.prf:
-/usr/share/qt4/mkspecs/features/yacc.prf:
-/usr/share/qt4/mkspecs/features/lex.prf:
-/usr/share/qt4/mkspecs/features/include_source_dir.prf:
-/usr/lib/libQtGui.prl:
-/usr/lib/libQtCore.prl:
+Makefile: Unuk-QT.pro ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/linux-g++/qmake.conf ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/g++.conf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/unix.conf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/linux.conf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/qconfig.pri \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/modules/qt_webkit_version.pri \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_functions.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_config.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/exclusive_builds.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_pre.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/debug.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_post.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/warn_on.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/unix/thread.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/moc.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/resources.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/uic.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/yacc.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/lex.prf \
+ ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/include_source_dir.prf
+ $(QMAKE) -spec ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
+../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/g++.conf:
+../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/unix.conf:
+../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/linux.conf:
+../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/qconfig.pri:
+../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/modules/qt_webkit_version.pri:
+../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_functions.prf:
+../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_config.prf:
+../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/exclusive_builds.prf:
+../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_pre.prf:
+../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/debug.prf:
+../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_post.prf:
+../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/warn_on.prf:
+../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt.prf:
+../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/unix/thread.prf:
+../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/moc.prf:
+../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/resources.prf:
+../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/uic.prf:
+../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/yacc.prf:
+../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/lex.prf:
+../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/include_source_dir.prf:
qmake: FORCE
- @$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
+ @$(QMAKE) -spec ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
dist:
@$(CHK_DIR_EXISTS) .tmp/Unuk-QT1.0.0 || $(MKDIR) .tmp/Unuk-QT1.0.0
diff --git a/Unuk-QT/Unuk-QT.pro.user b/Unuk-QT/Unuk-QT.pro.user
index 98fe72b..14b8615 100644
--- a/Unuk-QT/Unuk-QT.pro.user
+++ b/Unuk-QT/Unuk-QT.pro.user
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.4.0, 2012-02-01T20:34:36. -->
+<!-- Written by Qt Creator 2.4.0, 2012-02-01T21:33:05. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
diff --git a/src/Unuk/Constants.h b/src/Unuk/Constants.h
index ba5cb22..147d202 100644
--- a/src/Unuk/Constants.h
+++ b/src/Unuk/Constants.h
@@ -8,5 +8,5 @@ const int SCREEN_WIDTH = 800;
const int SCREEN_HEIGHT = 600;
const int SCREEN_BPP = 16;
-const SDL_Color COLOUR_BLACK = { 0, 0, 0 };
-const SDL_Color COLOUR_WHITE = { 255, 255, 255 };
+const SDL_Color COLOUR_BLACK = { 0, 0, 0, 0 };
+const SDL_Color COLOUR_WHITE = { 255, 255, 255, 0 };
diff --git a/src/libUnuk/Engine/MemManager.cpp b/src/libUnuk/Engine/MemManager.cpp
index afb317e..57ff900 100644
--- a/src/libUnuk/Engine/MemManager.cpp
+++ b/src/libUnuk/Engine/MemManager.cpp
@@ -37,15 +37,15 @@ void BitMapEntry::SetMultipleBits(int position, bool flag, int count) {
void BitMapEntry::SetRangeOfInt(int* element, int msb, int lsb, bool flag) {
if(flag) {
- int mask = (unsigned(-1) << lsb) & (unsigned(-1) >> INT_SIZE - msb - 1);
+ int mask = (unsigned(-1) << lsb) & (unsigned(-1) >> (INT_SIZE - msb - 1));
*element |= mask;
} else {
- int mask = (unsigned(-1) << lsb) & (unsigned(-1) >> INT_SIZE - msb - 1);
+ int mask = (unsigned(-1) << lsb) & (unsigned(-1) >> (INT_SIZE - msb - 1));
*element &= ~mask;
}
}
-MemClass* BitMapEntry::FirstFreeBlock(size_t size) {
+MemClass* BitMapEntry::FirstFreeBlock(size_t/* size*/) {
for(int i = 0; i < BIT_MAP_ELEMENTS; i++) {
if(bitMap[i] == 0)
// There aint any bits free.
@@ -54,7 +54,7 @@ MemClass* BitMapEntry::FirstFreeBlock(size_t size) {
// Yield the first bit position. This is a 1
// in an int from the right.
int result = bitMap[i] & -(bitMap[i]);
- void* address = 0;
+ //void* address = 0;
int basePos = (INT_SIZE * i);
switch(result) {
diff --git a/src/libUnuk/LevelGen/LevelGen.cpp b/src/libUnuk/LevelGen/LevelGen.cpp
index aff5392..ea1af41 100644
--- a/src/libUnuk/LevelGen/LevelGen.cpp
+++ b/src/libUnuk/LevelGen/LevelGen.cpp
@@ -133,9 +133,8 @@ void LevelGen::Load(const string filename) {
NPC* npc = new NPC(this);
- int spawnX;
- int spawnY;
-
+ //int spawnX;
+ //int spawnY;
//FindSpawnPoint(spawnX, spawnY);
//npc->SetXY(spawnX, spawnY); // try to uncomment this, try to find out what's going on.. --konom
npc->SetXY(100, 230);
diff --git a/src/libUnuk/UI/Text.cpp b/src/libUnuk/UI/Text.cpp
index f76861b..468a692 100644
--- a/src/libUnuk/UI/Text.cpp
+++ b/src/libUnuk/UI/Text.cpp
@@ -124,7 +124,7 @@ int Text::SetTextBlended(string textArg, textSizes_t size, SDL_Color colour,bool
}
int Text::SetTextBlended(string textArg, textSizes_t size, Uint8 r, Uint8 g, Uint8 b, bool wordWrap) {
- SDL_Color f = { r, g, b };
+ SDL_Color f = { r, g, b, 0 };
return SetTextBlended(textArg, size, f, wordWrap);
}
@@ -192,8 +192,8 @@ int Text::SetTextShaded(string textArg, textSizes_t size, SDL_Color colour, SDL_
}
int Text::SetTextShaded(string textArg, textSizes_t size, Uint8 rF, Uint8 gF, Uint8 bF, Uint8 rB, Uint8 gB, Uint8 bB, bool wordWrap) {
- SDL_Color f = { rF, gF, bF };
- SDL_Color b = { rB, gB, bB };
+ SDL_Color f = { rF, gF, bF, 0 };
+ SDL_Color b = { rB, gB, bB, 0 };
return SetTextShaded(textArg, size, f, b, wordWrap);
}