Rtch/Unuk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] Saveing from a none collision area so I can bleeding move....

Browse Source
This commit is contained in:
Rtch90 2012-02-01 18:42:24 +00:00
parent 5c2330c16b
commit b94cfb69fa
4 changed files with 316 additions and 315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Save/save
View File

@ -1,7 +1,7 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<save> <save>
<name>Allanis</name> <name>Allanis</name>
<x>120</x> <x>736</x>
<y>180</y> <y>20</y>
<map>map</map> <map>map</map>
</save> </save>

139
Unuk-QT/Makefile
View File

@ -1,25 +1,25 @@
############################################################################# #############################################################################
# Makefile for building: Unuk-QT # Makefile for building: Unuk-QT
# Generated by qmake (2.01a) (Qt 4.7.4) on: Wed Feb 1 19:59:14 2012 # Generated by qmake (2.01a) (Qt 4.7.4) on: Wed Feb 1 18:06:22 2012
# Project: Unuk-QT.pro # Project: Unuk-QT.pro
# Template: app # Template: app
# 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 # Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
############################################################################# #############################################################################
####### Compiler, tools and options ####### Compiler, tools and options
CC = gcc CC = gcc
CXX = g++ CXX = g++
DEFINES = -DQT_GUI_LIB -DQT_CORE_LIB DEFINES = -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
CFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES) CFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
CXXFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES) CXXFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
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. INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I.
LINK = g++ LINK = g++
LFLAGS = -Wl,-rpath,/home/kono/QtSDK/Desktop/Qt/474/gcc/lib LFLAGS =
LIBS = $(SUBLIBS) -L/home/kono/QtSDK/Desktop/Qt/474/gcc/lib -lGL -lSDL -lSDL_ttf -lSDL_image -lSDL_gfx -ltinyxml -lGLU -lQtGui -lQtCore -lpthread LIBS = $(SUBLIBS) -L/usr/lib -lGL -lSDL -lSDL_ttf -lSDL_image -lSDL_gfx -ltinyxml -lGLU -lQtGui -lQtCore -lpthread
AR = ar cqs AR = ar cqs
RANLIB = RANLIB =
QMAKE = /home/kono/QtSDK/Desktop/Qt/474/gcc/bin/qmake QMAKE = /usr/bin/qmake-qt4
TAR = tar -cf TAR = tar -cf
COMPRESS = gzip -9f COMPRESS = gzip -9f
COPY = cp -f COPY = cp -f
@ -109,26 +109,25 @@ OBJECTS = WorldManager.o \
EventHistory.o \ EventHistory.o \
Bar.o \ Bar.o \
Vec2.o Vec2.o
DIST = ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/g++.conf \ DIST = /usr/share/qt4/mkspecs/common/g++.conf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/unix.conf \ /usr/share/qt4/mkspecs/common/unix.conf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/linux.conf \ /usr/share/qt4/mkspecs/common/linux.conf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/qconfig.pri \ /usr/share/qt4/mkspecs/qconfig.pri \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/modules/qt_webkit_version.pri \ /usr/share/qt4/mkspecs/features/qt_functions.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_functions.prf \ /usr/share/qt4/mkspecs/features/qt_config.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_config.prf \ /usr/share/qt4/mkspecs/features/exclusive_builds.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/exclusive_builds.prf \ /usr/share/qt4/mkspecs/features/default_pre.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_pre.prf \ /usr/share/qt4/mkspecs/features/debug.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/debug.prf \ /usr/share/qt4/mkspecs/features/default_post.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_post.prf \ /usr/share/qt4/mkspecs/features/warn_on.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/warn_on.prf \ /usr/share/qt4/mkspecs/features/qt.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt.prf \ /usr/share/qt4/mkspecs/features/unix/thread.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/unix/thread.prf \ /usr/share/qt4/mkspecs/features/moc.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/moc.prf \ /usr/share/qt4/mkspecs/features/resources.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/resources.prf \ /usr/share/qt4/mkspecs/features/uic.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/uic.prf \ /usr/share/qt4/mkspecs/features/yacc.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/yacc.prf \ /usr/share/qt4/mkspecs/features/lex.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/lex.prf \ /usr/share/qt4/mkspecs/features/include_source_dir.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/include_source_dir.prf \
Unuk-QT.pro Unuk-QT.pro
QMAKE_TARGET = Unuk-QT QMAKE_TARGET = Unuk-QT
DESTDIR = DESTDIR =
@ -161,49 +160,51 @@ all: Makefile $(TARGET)
$(TARGET): $(OBJECTS) $(TARGET): $(OBJECTS)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
Makefile: Unuk-QT.pro ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/linux-g++/qmake.conf ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/g++.conf \ Makefile: Unuk-QT.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/unix.conf \ /usr/share/qt4/mkspecs/common/unix.conf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/linux.conf \ /usr/share/qt4/mkspecs/common/linux.conf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/qconfig.pri \ /usr/share/qt4/mkspecs/qconfig.pri \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/modules/qt_webkit_version.pri \ /usr/share/qt4/mkspecs/features/qt_functions.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_functions.prf \ /usr/share/qt4/mkspecs/features/qt_config.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_config.prf \ /usr/share/qt4/mkspecs/features/exclusive_builds.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/exclusive_builds.prf \ /usr/share/qt4/mkspecs/features/default_pre.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_pre.prf \ /usr/share/qt4/mkspecs/features/debug.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/debug.prf \ /usr/share/qt4/mkspecs/features/default_post.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_post.prf \ /usr/share/qt4/mkspecs/features/warn_on.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/warn_on.prf \ /usr/share/qt4/mkspecs/features/qt.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt.prf \ /usr/share/qt4/mkspecs/features/unix/thread.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/unix/thread.prf \ /usr/share/qt4/mkspecs/features/moc.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/moc.prf \ /usr/share/qt4/mkspecs/features/resources.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/resources.prf \ /usr/share/qt4/mkspecs/features/uic.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/uic.prf \ /usr/share/qt4/mkspecs/features/yacc.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/yacc.prf \ /usr/share/qt4/mkspecs/features/lex.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/lex.prf \ /usr/share/qt4/mkspecs/features/include_source_dir.prf \
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/include_source_dir.prf /usr/lib/libQtGui.prl \
$(QMAKE) -spec ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro /usr/lib/libQtCore.prl
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/g++.conf: $(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/unix.conf: /usr/share/qt4/mkspecs/common/g++.conf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/linux.conf: /usr/share/qt4/mkspecs/common/unix.conf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/qconfig.pri: /usr/share/qt4/mkspecs/common/linux.conf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/modules/qt_webkit_version.pri: /usr/share/qt4/mkspecs/qconfig.pri:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_functions.prf: /usr/share/qt4/mkspecs/features/qt_functions.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_config.prf: /usr/share/qt4/mkspecs/features/qt_config.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/exclusive_builds.prf: /usr/share/qt4/mkspecs/features/exclusive_builds.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_pre.prf: /usr/share/qt4/mkspecs/features/default_pre.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/debug.prf: /usr/share/qt4/mkspecs/features/debug.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_post.prf: /usr/share/qt4/mkspecs/features/default_post.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/warn_on.prf: /usr/share/qt4/mkspecs/features/warn_on.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt.prf: /usr/share/qt4/mkspecs/features/qt.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/unix/thread.prf: /usr/share/qt4/mkspecs/features/unix/thread.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/moc.prf: /usr/share/qt4/mkspecs/features/moc.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/resources.prf: /usr/share/qt4/mkspecs/features/resources.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/uic.prf: /usr/share/qt4/mkspecs/features/uic.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/yacc.prf: /usr/share/qt4/mkspecs/features/yacc.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/lex.prf: /usr/share/qt4/mkspecs/features/lex.prf:
../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/include_source_dir.prf: /usr/share/qt4/mkspecs/features/include_source_dir.prf:
/usr/lib/libQtGui.prl:
/usr/lib/libQtCore.prl:
qmake: FORCE qmake: FORCE
@$(QMAKE) -spec ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro @$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
dist: dist:
@$(CHK_DIR_EXISTS) .tmp/Unuk-QT1.0.0 || $(MKDIR) .tmp/Unuk-QT1.0.0 @$(CHK_DIR_EXISTS) .tmp/Unuk-QT1.0.0 || $(MKDIR) .tmp/Unuk-QT1.0.0