diff --git a/aliendefender.pro.user b/aliendefender.pro.user index 2d2d684..2c2fa31 100644 --- a/aliendefender.pro.user +++ b/aliendefender.pro.user @@ -94,7 +94,7 @@ Debug - DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-S5Q8zKlbhY,guid=6ef5dd4aeeaf9cb3055a39934b629f00 + DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-rwgGTf2llu,guid=47f9f0046990c9c4983a622a4b6c11df DESKTOP_SESSION=gnome DESKTOP_STARTUP_ID= DISPLAY=:0.0 @@ -102,27 +102,28 @@ GDM_KEYBOARD_LAYOUT=us GDM_LANG=ru_RU.UTF-8 GNOME_DESKTOP_SESSION_ID=this-is-deprecated - GNOME_KEYRING_SOCKET=/tmp/keyring-116Pb7/socket + GNOME_KEYRING_SOCKET=/tmp/keyring-cqyv3T/socket GTK_MODULES=canberra-gtk-module GTK_RC_FILES=/etc/gtk/gtkrc:/home/andrey/.gtkrc-1.2-gnome2 HOME=/home/andrey LANG=ru_RU.UTF-8 + LANGUAGE= LD_LIBRARY_PATH=/usr/lib/qtcreator: LOGNAME=andrey ORBIT_SOCKETDIR=/tmp/orbit-andrey PATH=/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games PWD=/home/andrey QTDIR=/usr - SESSION_MANAGER=local/buull-eeePC:@/tmp/.ICE-unix/1205,unix/buull-eeePC:/tmp/.ICE-unix/1205 + SESSION_MANAGER=local/buull-eeePC:@/tmp/.ICE-unix/1283,unix/buull-eeePC:/tmp/.ICE-unix/1283 SHELL=/bin/bash SPEECHD_PORT=7560 - SSH_AGENT_PID=1318 - SSH_AUTH_SOCK=/tmp/keyring-116Pb7/socket.ssh + SSH_AGENT_PID=1356 + SSH_AUTH_SOCK=/tmp/keyring-cqyv3T/socket.ssh USER=andrey USERNAME=andrey - XAUTHORITY=/var/run/gdm/auth-for-andrey-9AQSnh/database + XAUTHORITY=/var/run/gdm/auth-for-andrey-FKbzYa/database XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/ - XDG_SESSION_COOKIE=f0649decca52f2beb55c9ea74ad1d028-1264754424.556816-274237329 + XDG_SESSION_COOKIE=f0649decca52f2beb55c9ea74ad1d028-1265373654.150132-179730100 /home/andrey/projects/aliendefender/aliendefender.pro @@ -146,7 +147,7 @@ Debug - DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-S5Q8zKlbhY,guid=6ef5dd4aeeaf9cb3055a39934b629f00 + DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-rwgGTf2llu,guid=47f9f0046990c9c4983a622a4b6c11df DESKTOP_SESSION=gnome DESKTOP_STARTUP_ID= DISPLAY=:0.0 @@ -154,27 +155,28 @@ GDM_KEYBOARD_LAYOUT=us GDM_LANG=ru_RU.UTF-8 GNOME_DESKTOP_SESSION_ID=this-is-deprecated - GNOME_KEYRING_SOCKET=/tmp/keyring-116Pb7/socket + GNOME_KEYRING_SOCKET=/tmp/keyring-cqyv3T/socket GTK_MODULES=canberra-gtk-module GTK_RC_FILES=/etc/gtk/gtkrc:/home/andrey/.gtkrc-1.2-gnome2 HOME=/home/andrey LANG=ru_RU.UTF-8 + LANGUAGE= LD_LIBRARY_PATH=/usr/lib/qtcreator: LOGNAME=andrey ORBIT_SOCKETDIR=/tmp/orbit-andrey PATH=/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games PWD=/home/andrey QTDIR=/usr - SESSION_MANAGER=local/buull-eeePC:@/tmp/.ICE-unix/1205,unix/buull-eeePC:/tmp/.ICE-unix/1205 + SESSION_MANAGER=local/buull-eeePC:@/tmp/.ICE-unix/1283,unix/buull-eeePC:/tmp/.ICE-unix/1283 SHELL=/bin/bash SPEECHD_PORT=7560 - SSH_AGENT_PID=1318 - SSH_AUTH_SOCK=/tmp/keyring-116Pb7/socket.ssh + SSH_AGENT_PID=1356 + SSH_AUTH_SOCK=/tmp/keyring-cqyv3T/socket.ssh USER=andrey USERNAME=andrey - XAUTHORITY=/var/run/gdm/auth-for-andrey-9AQSnh/database + XAUTHORITY=/var/run/gdm/auth-for-andrey-FKbzYa/database XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/ - XDG_SESSION_COOKIE=f0649decca52f2beb55c9ea74ad1d028-1264754424.556816-274237329 + XDG_SESSION_COOKIE=f0649decca52f2beb55c9ea74ad1d028-1265373654.150132-179730100 -j3 @@ -193,7 +195,7 @@ Debug - DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-S5Q8zKlbhY,guid=6ef5dd4aeeaf9cb3055a39934b629f00 + DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-rwgGTf2llu,guid=47f9f0046990c9c4983a622a4b6c11df DESKTOP_SESSION=gnome DESKTOP_STARTUP_ID= DISPLAY=:0.0 @@ -201,27 +203,28 @@ GDM_KEYBOARD_LAYOUT=us GDM_LANG=ru_RU.UTF-8 GNOME_DESKTOP_SESSION_ID=this-is-deprecated - GNOME_KEYRING_SOCKET=/tmp/keyring-116Pb7/socket + GNOME_KEYRING_SOCKET=/tmp/keyring-cqyv3T/socket GTK_MODULES=canberra-gtk-module GTK_RC_FILES=/etc/gtk/gtkrc:/home/andrey/.gtkrc-1.2-gnome2 HOME=/home/andrey LANG=ru_RU.UTF-8 + LANGUAGE= LD_LIBRARY_PATH=/usr/lib/qtcreator: LOGNAME=andrey ORBIT_SOCKETDIR=/tmp/orbit-andrey PATH=/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games PWD=/home/andrey QTDIR=/usr - SESSION_MANAGER=local/buull-eeePC:@/tmp/.ICE-unix/1205,unix/buull-eeePC:/tmp/.ICE-unix/1205 + SESSION_MANAGER=local/buull-eeePC:@/tmp/.ICE-unix/1283,unix/buull-eeePC:/tmp/.ICE-unix/1283 SHELL=/bin/bash SPEECHD_PORT=7560 - SSH_AGENT_PID=1318 - SSH_AUTH_SOCK=/tmp/keyring-116Pb7/socket.ssh + SSH_AGENT_PID=1356 + SSH_AUTH_SOCK=/tmp/keyring-cqyv3T/socket.ssh USER=andrey USERNAME=andrey - XAUTHORITY=/var/run/gdm/auth-for-andrey-9AQSnh/database + XAUTHORITY=/var/run/gdm/auth-for-andrey-FKbzYa/database XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/ - XDG_SESSION_COOKIE=f0649decca52f2beb55c9ea74ad1d028-1264754424.556816-274237329 + XDG_SESSION_COOKIE=f0649decca52f2beb55c9ea74ad1d028-1265373654.150132-179730100 clean diff --git a/game.cpp b/game.cpp deleted file mode 100644 index 5d70cd7..0000000 --- a/game.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "game.h" - -game::game(QSize size, QPoint start, QPoint finish, int cellsize) -{ - data = new GameData(); - data->size = size/cellsize; - data->start = start/cellsize; - data->finish = finish/cellsize; - data->cellsize = cellsize; - data->Cells = new int*[data->size.width()]; - for (int i = 0; i < data->size.width(); i++) { - data->Cells[i] = new int[data->size.height()]; - for (int j = 0; j < data->size.height(); j++) data->Cells[i][j] = 0; - } -} diff --git a/game.h b/game.h deleted file mode 100644 index dcef942..0000000 --- a/game.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef GAME_H -#define GAME_H - -#include "basestruct.h" - -class game -{ -public: - game(QSize size, QPoint start, QPoint finish, int cellsize); - GameData *data; -}; - -#endif // GAME_H