global restruct finish part 1 of 3

This commit is contained in:
2010-02-07 16:19:44 +03:00
parent 3f8971b113
commit 86f5e2f625
3 changed files with 24 additions and 49 deletions

View File

@@ -94,7 +94,7 @@
<valuemap type="QVariantMap" >
<value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString" >Debug</value>
<valuelist key="abstractProcess.Environment" type="QVariantList" >
<value type="QString" >DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-S5Q8zKlbhY,guid=6ef5dd4aeeaf9cb3055a39934b629f00</value>
<value type="QString" >DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-rwgGTf2llu,guid=47f9f0046990c9c4983a622a4b6c11df</value>
<value type="QString" >DESKTOP_SESSION=gnome</value>
<value type="QString" >DESKTOP_STARTUP_ID=</value>
<value type="QString" >DISPLAY=:0.0</value>
@@ -102,27 +102,28 @@
<value type="QString" >GDM_KEYBOARD_LAYOUT=us</value>
<value type="QString" >GDM_LANG=ru_RU.UTF-8</value>
<value type="QString" >GNOME_DESKTOP_SESSION_ID=this-is-deprecated</value>
<value type="QString" >GNOME_KEYRING_SOCKET=/tmp/keyring-116Pb7/socket</value>
<value type="QString" >GNOME_KEYRING_SOCKET=/tmp/keyring-cqyv3T/socket</value>
<value type="QString" >GTK_MODULES=canberra-gtk-module</value>
<value type="QString" >GTK_RC_FILES=/etc/gtk/gtkrc:/home/andrey/.gtkrc-1.2-gnome2</value>
<value type="QString" >HOME=/home/andrey</value>
<value type="QString" >LANG=ru_RU.UTF-8</value>
<value type="QString" >LANGUAGE=</value>
<value type="QString" >LD_LIBRARY_PATH=/usr/lib/qtcreator:</value>
<value type="QString" >LOGNAME=andrey</value>
<value type="QString" >ORBIT_SOCKETDIR=/tmp/orbit-andrey</value>
<value type="QString" >PATH=/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games</value>
<value type="QString" >PWD=/home/andrey</value>
<value type="QString" >QTDIR=/usr</value>
<value type="QString" >SESSION_MANAGER=local/buull-eeePC:@/tmp/.ICE-unix/1205,unix/buull-eeePC:/tmp/.ICE-unix/1205</value>
<value type="QString" >SESSION_MANAGER=local/buull-eeePC:@/tmp/.ICE-unix/1283,unix/buull-eeePC:/tmp/.ICE-unix/1283</value>
<value type="QString" >SHELL=/bin/bash</value>
<value type="QString" >SPEECHD_PORT=7560</value>
<value type="QString" >SSH_AGENT_PID=1318</value>
<value type="QString" >SSH_AUTH_SOCK=/tmp/keyring-116Pb7/socket.ssh</value>
<value type="QString" >SSH_AGENT_PID=1356</value>
<value type="QString" >SSH_AUTH_SOCK=/tmp/keyring-cqyv3T/socket.ssh</value>
<value type="QString" >USER=andrey</value>
<value type="QString" >USERNAME=andrey</value>
<value type="QString" >XAUTHORITY=/var/run/gdm/auth-for-andrey-9AQSnh/database</value>
<value type="QString" >XAUTHORITY=/var/run/gdm/auth-for-andrey-FKbzYa/database</value>
<value type="QString" >XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/</value>
<value type="QString" >XDG_SESSION_COOKIE=f0649decca52f2beb55c9ea74ad1d028-1264754424.556816-274237329</value>
<value type="QString" >XDG_SESSION_COOKIE=f0649decca52f2beb55c9ea74ad1d028-1265373654.150132-179730100</value>
</valuelist>
<valuelist key="abstractProcess.arguments" type="QVariantList" >
<value type="QString" >/home/andrey/projects/aliendefender/aliendefender.pro</value>
@@ -146,7 +147,7 @@
<valuemap type="QVariantMap" >
<value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString" >Debug</value>
<valuelist key="abstractProcess.Environment" type="QVariantList" >
<value type="QString" >DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-S5Q8zKlbhY,guid=6ef5dd4aeeaf9cb3055a39934b629f00</value>
<value type="QString" >DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-rwgGTf2llu,guid=47f9f0046990c9c4983a622a4b6c11df</value>
<value type="QString" >DESKTOP_SESSION=gnome</value>
<value type="QString" >DESKTOP_STARTUP_ID=</value>
<value type="QString" >DISPLAY=:0.0</value>
@@ -154,27 +155,28 @@
<value type="QString" >GDM_KEYBOARD_LAYOUT=us</value>
<value type="QString" >GDM_LANG=ru_RU.UTF-8</value>
<value type="QString" >GNOME_DESKTOP_SESSION_ID=this-is-deprecated</value>
<value type="QString" >GNOME_KEYRING_SOCKET=/tmp/keyring-116Pb7/socket</value>
<value type="QString" >GNOME_KEYRING_SOCKET=/tmp/keyring-cqyv3T/socket</value>
<value type="QString" >GTK_MODULES=canberra-gtk-module</value>
<value type="QString" >GTK_RC_FILES=/etc/gtk/gtkrc:/home/andrey/.gtkrc-1.2-gnome2</value>
<value type="QString" >HOME=/home/andrey</value>
<value type="QString" >LANG=ru_RU.UTF-8</value>
<value type="QString" >LANGUAGE=</value>
<value type="QString" >LD_LIBRARY_PATH=/usr/lib/qtcreator:</value>
<value type="QString" >LOGNAME=andrey</value>
<value type="QString" >ORBIT_SOCKETDIR=/tmp/orbit-andrey</value>
<value type="QString" >PATH=/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games</value>
<value type="QString" >PWD=/home/andrey</value>
<value type="QString" >QTDIR=/usr</value>
<value type="QString" >SESSION_MANAGER=local/buull-eeePC:@/tmp/.ICE-unix/1205,unix/buull-eeePC:/tmp/.ICE-unix/1205</value>
<value type="QString" >SESSION_MANAGER=local/buull-eeePC:@/tmp/.ICE-unix/1283,unix/buull-eeePC:/tmp/.ICE-unix/1283</value>
<value type="QString" >SHELL=/bin/bash</value>
<value type="QString" >SPEECHD_PORT=7560</value>
<value type="QString" >SSH_AGENT_PID=1318</value>
<value type="QString" >SSH_AUTH_SOCK=/tmp/keyring-116Pb7/socket.ssh</value>
<value type="QString" >SSH_AGENT_PID=1356</value>
<value type="QString" >SSH_AUTH_SOCK=/tmp/keyring-cqyv3T/socket.ssh</value>
<value type="QString" >USER=andrey</value>
<value type="QString" >USERNAME=andrey</value>
<value type="QString" >XAUTHORITY=/var/run/gdm/auth-for-andrey-9AQSnh/database</value>
<value type="QString" >XAUTHORITY=/var/run/gdm/auth-for-andrey-FKbzYa/database</value>
<value type="QString" >XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/</value>
<value type="QString" >XDG_SESSION_COOKIE=f0649decca52f2beb55c9ea74ad1d028-1264754424.556816-274237329</value>
<value type="QString" >XDG_SESSION_COOKIE=f0649decca52f2beb55c9ea74ad1d028-1265373654.150132-179730100</value>
</valuelist>
<valuelist key="abstractProcess.arguments" type="QVariantList" >
<value type="QString" >-j3</value>
@@ -193,7 +195,7 @@
<valuemap type="QVariantMap" >
<value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString" >Debug</value>
<valuelist key="abstractProcess.Environment" type="QVariantList" >
<value type="QString" >DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-S5Q8zKlbhY,guid=6ef5dd4aeeaf9cb3055a39934b629f00</value>
<value type="QString" >DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-rwgGTf2llu,guid=47f9f0046990c9c4983a622a4b6c11df</value>
<value type="QString" >DESKTOP_SESSION=gnome</value>
<value type="QString" >DESKTOP_STARTUP_ID=</value>
<value type="QString" >DISPLAY=:0.0</value>
@@ -201,27 +203,28 @@
<value type="QString" >GDM_KEYBOARD_LAYOUT=us</value>
<value type="QString" >GDM_LANG=ru_RU.UTF-8</value>
<value type="QString" >GNOME_DESKTOP_SESSION_ID=this-is-deprecated</value>
<value type="QString" >GNOME_KEYRING_SOCKET=/tmp/keyring-116Pb7/socket</value>
<value type="QString" >GNOME_KEYRING_SOCKET=/tmp/keyring-cqyv3T/socket</value>
<value type="QString" >GTK_MODULES=canberra-gtk-module</value>
<value type="QString" >GTK_RC_FILES=/etc/gtk/gtkrc:/home/andrey/.gtkrc-1.2-gnome2</value>
<value type="QString" >HOME=/home/andrey</value>
<value type="QString" >LANG=ru_RU.UTF-8</value>
<value type="QString" >LANGUAGE=</value>
<value type="QString" >LD_LIBRARY_PATH=/usr/lib/qtcreator:</value>
<value type="QString" >LOGNAME=andrey</value>
<value type="QString" >ORBIT_SOCKETDIR=/tmp/orbit-andrey</value>
<value type="QString" >PATH=/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games</value>
<value type="QString" >PWD=/home/andrey</value>
<value type="QString" >QTDIR=/usr</value>
<value type="QString" >SESSION_MANAGER=local/buull-eeePC:@/tmp/.ICE-unix/1205,unix/buull-eeePC:/tmp/.ICE-unix/1205</value>
<value type="QString" >SESSION_MANAGER=local/buull-eeePC:@/tmp/.ICE-unix/1283,unix/buull-eeePC:/tmp/.ICE-unix/1283</value>
<value type="QString" >SHELL=/bin/bash</value>
<value type="QString" >SPEECHD_PORT=7560</value>
<value type="QString" >SSH_AGENT_PID=1318</value>
<value type="QString" >SSH_AUTH_SOCK=/tmp/keyring-116Pb7/socket.ssh</value>
<value type="QString" >SSH_AGENT_PID=1356</value>
<value type="QString" >SSH_AUTH_SOCK=/tmp/keyring-cqyv3T/socket.ssh</value>
<value type="QString" >USER=andrey</value>
<value type="QString" >USERNAME=andrey</value>
<value type="QString" >XAUTHORITY=/var/run/gdm/auth-for-andrey-9AQSnh/database</value>
<value type="QString" >XAUTHORITY=/var/run/gdm/auth-for-andrey-FKbzYa/database</value>
<value type="QString" >XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/</value>
<value type="QString" >XDG_SESSION_COOKIE=f0649decca52f2beb55c9ea74ad1d028-1264754424.556816-274237329</value>
<value type="QString" >XDG_SESSION_COOKIE=f0649decca52f2beb55c9ea74ad1d028-1265373654.150132-179730100</value>
</valuelist>
<valuelist key="abstractProcess.arguments" type="QVariantList" >
<value type="QString" >clean</value>

View File

@@ -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;
}
}

13
game.h
View File

@@ -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