# HG changeset patch # User unc0rr # Date 1172240672 0 # Node ID 7ea71cd3acd510dbd025db594321f1c1fb99907a # Parent defe001d490c7fc2aff4f711f5f082a74649b416 - Change proto version to 4 - Updated copyright headers diff -r defe001d490c -r 7ea71cd3acd5 CMakeLists.txt --- a/CMakeLists.txt Fri Feb 23 13:31:11 2007 +0000 +++ b/CMakeLists.txt Fri Feb 23 14:24:32 2007 +0000 @@ -9,7 +9,7 @@ endif(DEFINED DATA_INSTALL_DIR) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) -set(HEDGEWARS_PROTO_VER 3) +set(HEDGEWARS_PROTO_VER 4) add_subdirectory(bin) add_subdirectory(QTfrontend) diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/SquareLabel.h --- a/QTfrontend/SquareLabel.h Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/SquareLabel.h Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Andrey Korotaev + * Copyright (c) 2006, 2007 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/about.cpp --- a/QTfrontend/about.cpp Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/about.cpp Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Andrey Korotaev + * Copyright (c) 2006, 2007 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/binds.h --- a/QTfrontend/binds.h Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/binds.h Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2005, 2006 Andrey Korotaev + * Copyright (c) 2005, 2006, 2007 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/chatwidget.cpp --- a/QTfrontend/chatwidget.cpp Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/chatwidget.cpp Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Igor Ulyanov + * Copyright (c) 2007 Igor Ulyanov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/chatwidget.h --- a/QTfrontend/chatwidget.h Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/chatwidget.h Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Igor Ulyanov + * Copyright (c) 2007 Igor Ulyanov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/frameTeam.cpp --- a/QTfrontend/frameTeam.cpp Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/frameTeam.cpp Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Ulyanov Igor + * Copyright (c) 2006, 2007 Ulyanov Igor * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/frameTeam.h --- a/QTfrontend/frameTeam.h Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/frameTeam.h Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Ulyanov Igor + * Copyright (c) 2006, 2007 Ulyanov Igor * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/game.cpp --- a/QTfrontend/game.cpp Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/game.cpp Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2005, 2006 Andrey Korotaev + * Copyright (c) 2005-2007 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/game.h --- a/QTfrontend/game.h Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/game.h Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2005, 2006 Andrey Korotaev + * Copyright (c) 2005-2007 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/gamecfgwidget.cpp --- a/QTfrontend/gamecfgwidget.cpp Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/gamecfgwidget.cpp Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Andrey Korotaev + * Copyright (c) 2006, 2007 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -72,7 +72,7 @@ connect(SB_InitHealth, SIGNAL(valueChanged(int)), this, SLOT(onInitHealthChanged(int))); connect(SB_TurnTime, SIGNAL(valueChanged(int)), this, SLOT(onTurnTimeChanged(int))); connect(CB_mode_Forts, SIGNAL(toggled(bool)), this, SLOT(onFortsModeChanged(bool))); - + connect(pMapContainer, SIGNAL(seedChanged(const QString &)), this, SLOT(onSeedChanged(const QString &))); connect(pMapContainer, SIGNAL(themeChanged(const QString &)), this, SLOT(onThemeChanged(const QString &))); connect(pMapContainer, SIGNAL(mapChanged(const QString &)), this, SLOT(onMapChanged(const QString &))); diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/gamecfgwidget.h --- a/QTfrontend/gamecfgwidget.h Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/gamecfgwidget.h Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Andrey Korotaev + * Copyright (c) 2006, 2007 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/gameuiconfig.cpp --- a/QTfrontend/gameuiconfig.cpp Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/gameuiconfig.cpp Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Andrey Korotaev + * Copyright (c) 2006, 2007 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/gameuiconfig.h --- a/QTfrontend/gameuiconfig.h Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/gameuiconfig.h Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Andrey Korotaev + * Copyright (c) 2006, 2007 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/hedgehogerWidget.cpp --- a/QTfrontend/hedgehogerWidget.cpp Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/hedgehogerWidget.cpp Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Ulyanov Igor + * Copyright (c) 2006, 2007 Ulyanov Igor * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/hedgehogerWidget.h --- a/QTfrontend/hedgehogerWidget.h Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/hedgehogerWidget.h Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Ulyanov Igor + * Copyright (c) 2006, 2007 Ulyanov Igor * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -40,7 +40,7 @@ protected: virtual void paintEvent(QPaintEvent* event); virtual void mousePressEvent ( QMouseEvent * event ); - + private: CHedgehogerWidget(); unsigned char numHedgehogs; diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/hwconsts.h.in --- a/QTfrontend/hwconsts.h.in Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/hwconsts.h.in Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2005, 2006 Andrey Korotaev + * Copyright (c) 2005-2007 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/hwform.cpp Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2005, 2006 Andrey Korotaev + * Copyright (c) 2005-2007 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/hwform.h --- a/QTfrontend/hwform.h Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/hwform.h Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2005, 2006 Andrey Korotaev + * Copyright (c) 2005-2007 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/hwmap.cpp --- a/QTfrontend/hwmap.cpp Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/hwmap.cpp Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Igor Ulyanov + * Copyright (c) 2006, 2007 Igor Ulyanov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ { } -void HWMap::getImage(std::string seed) +void HWMap::getImage(std::string seed) { m_seed=seed; Start(); diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/main.cpp.in --- a/QTfrontend/main.cpp.in Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/main.cpp.in Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2005, 2006 Andrey Korotaev + * Copyright (c) 2005-2007 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/mapContainer.cpp --- a/QTfrontend/mapContainer.cpp Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/mapContainer.cpp Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Igor Ulyanov + * Copyright (c) 2006-2007 Igor Ulyanov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/mapContainer.h --- a/QTfrontend/mapContainer.h Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/mapContainer.h Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Igor Ulyanov + * Copyright (c) 2006, 2007 Igor Ulyanov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/netserver.cpp --- a/QTfrontend/netserver.cpp Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/netserver.cpp Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Ulyanov Igor + * Copyright (c) 2006-2007 Ulyanov Igor * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/netserver.h --- a/QTfrontend/netserver.h Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/netserver.h Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Igor Ulyanov + * Copyright (c) 2006, 2007 Igor Ulyanov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/netudpserver.cpp --- a/QTfrontend/netudpserver.cpp Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/netudpserver.cpp Fri Feb 23 14:24:32 2007 +0000 @@ -1,3 +1,21 @@ +/* + * Hedgewars, a worms-like game + * Copyright (c) 2007 Ulyanov Igor + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + #include #include "netudpserver.h" @@ -9,7 +27,7 @@ pUdpSocket->bind(46631); connect(pUdpSocket, SIGNAL(readyRead()), this, SLOT(onClientRead())); - + } void HWNetUdpServer::onClientRead() diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/netudpserver.h --- a/QTfrontend/netudpserver.h Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/netudpserver.h Fri Feb 23 14:24:32 2007 +0000 @@ -1,3 +1,21 @@ +/* + * Hedgewars, a worms-like game + * Copyright (c) 2007 Igor Ulyanov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + #ifndef _NET_UDPSERVER_INCLUDED #define _NET_UDPSERVER_INCLUDED diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/netudpwidget.cpp --- a/QTfrontend/netudpwidget.cpp Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/netudpwidget.cpp Fri Feb 23 14:24:32 2007 +0000 @@ -1,3 +1,21 @@ +/* + * Hedgewars, a worms-like game + * Copyright (c) 2007 Ulyanov Igor + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + #include #include diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/netudpwidget.h --- a/QTfrontend/netudpwidget.h Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/netudpwidget.h Fri Feb 23 14:24:32 2007 +0000 @@ -1,3 +1,21 @@ +/* + * Hedgewars, a worms-like game + * Copyright (c) 2007 Igor Ulyanov + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + #ifndef _NET_UDPWIDGET_INCLUDED #define _NET_UDPWIDGET_INCLUDED diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/newnetclient.cpp --- a/QTfrontend/newnetclient.cpp Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/newnetclient.cpp Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Ulyanov Igor + * Copyright (c) 2006-2007 Ulyanov Igor * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/newnetclient.h --- a/QTfrontend/newnetclient.h Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/newnetclient.h Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Ulyanov Igor + * Copyright (c) 2006, 2007 Ulyanov Igor * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/pages.cpp --- a/QTfrontend/pages.cpp Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/pages.cpp Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Andrey Korotaev + * Copyright (c) 2006, 2007 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/pages.h --- a/QTfrontend/pages.h Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/pages.h Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Andrey Korotaev + * Copyright (c) 2006, 2007 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/tcpBase.cpp --- a/QTfrontend/tcpBase.cpp Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/tcpBase.cpp Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Igor Ulyanov + * Copyright (c) 2006-2007 Igor Ulyanov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/tcpBase.h --- a/QTfrontend/tcpBase.h Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/tcpBase.h Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Igor Ulyanov + * Copyright (c) 2006, 2007 Igor Ulyanov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/team.cpp --- a/QTfrontend/team.cpp Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/team.cpp Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2005, 2006 Andrey Korotaev + * Copyright (c) 2005-2007 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/team.h --- a/QTfrontend/team.h Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/team.h Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,7 @@ /* * Hedgewars, a worms-like game * Copyright (c) 2005 Andrey Korotaev + * Copyright (c) 2007 Igor Ulyanov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/teamselect.cpp --- a/QTfrontend/teamselect.cpp Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/teamselect.cpp Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Ulyanov Igor + * Copyright (c) 2006, 2007 Ulyanov Igor * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,9 +33,9 @@ curPlayingTeams.push_back(team); connect(framePlaying->getTeamWidget(team), SIGNAL(teamStatusChanged(HWTeam)), this, SLOT(netTeamStatusChanged(const HWTeam&))); - connect(framePlaying->getTeamWidget(team), SIGNAL(hhNmChanged(const HWTeam&)), + connect(framePlaying->getTeamWidget(team), SIGNAL(hhNmChanged(const HWTeam&)), this, SLOT(hhNumChanged(const HWTeam&))); - connect(framePlaying->getTeamWidget(team), SIGNAL(teamColorChanged(const HWTeam&)), + connect(framePlaying->getTeamWidget(team), SIGNAL(teamColorChanged(const HWTeam&)), this, SLOT(proxyTeamColorChanged(const HWTeam&))); } else { frameDontPlaying->addTeam(team, false); @@ -104,7 +104,7 @@ void TeamSelWidget::netTeamStatusChanged(const HWTeam& team) { QList::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team); - + } //void TeamSelWidget::removeTeam(__attribute__ ((unused)) HWTeam team) @@ -155,9 +155,9 @@ this, SLOT(changeTeamStatus(HWTeam))); } if(willBePlaying) { - connect(framePlaying->getTeamWidget(team), SIGNAL(hhNmChanged(const HWTeam&)), + connect(framePlaying->getTeamWidget(team), SIGNAL(hhNmChanged(const HWTeam&)), this, SLOT(hhNumChanged(const HWTeam&))); - connect(framePlaying->getTeamWidget(team), SIGNAL(teamColorChanged(const HWTeam&)), + connect(framePlaying->getTeamWidget(team), SIGNAL(teamColorChanged(const HWTeam&)), this, SLOT(proxyTeamColorChanged(const HWTeam&))); emit teamColorChanged(((TeamShowWidget*)framePlaying->getTeamWidget(team))->getTeam()); } diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/teamselect.h --- a/QTfrontend/teamselect.h Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/teamselect.h Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Ulyanov Igor + * Copyright (c) 2006, 2007 Ulyanov Igor * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/teamselhelper.cpp --- a/QTfrontend/teamselhelper.cpp Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/teamselhelper.cpp Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Ulyanov Igor + * Copyright (c) 2006, 2007 Ulyanov Igor * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,13 +31,13 @@ } TeamShowWidget::TeamShowWidget(HWTeam team, bool isPlaying, QWidget * parent) : - QWidget(parent), mainLayout(this), m_team(team), m_isPlaying(isPlaying), phhoger(0), + QWidget(parent), mainLayout(this), m_team(team), m_isPlaying(isPlaying), phhoger(0), colorButt(0) { mainLayout.setSpacing(1); mainLayout.setMargin(2); this->setMaximumHeight(35); - QIcon difficultyIcon=team.isNetTeam() ? + QIcon difficultyIcon=team.isNetTeam() ? QIcon(QString(":/res/botlevels/net%1.png").arg(m_team.difficulty)) : QIcon(QString(":/res/botlevels/%1.png").arg(m_team.difficulty)); @@ -123,7 +123,7 @@ color=*pOurFrameTeams->currentColor; } else { // set according color iterator - pOurFrameTeams->currentColor=std::find(pOurFrameTeams->availableColors.begin(), + pOurFrameTeams->currentColor=std::find(pOurFrameTeams->availableColors.begin(), pOurFrameTeams->availableColors.end(), color); if(pOurFrameTeams->currentColor==pOurFrameTeams->availableColors.end()) { // error condition diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/teamselhelper.h --- a/QTfrontend/teamselhelper.h Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/teamselhelper.h Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Ulyanov Igor + * Copyright (c) 2006, 2007 Ulyanov Igor * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/ui_hwform.cpp --- a/QTfrontend/ui_hwform.cpp Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/ui_hwform.cpp Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Andrey Korotaev + * Copyright (c) 2006, 2007 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r defe001d490c -r 7ea71cd3acd5 QTfrontend/ui_hwform.h --- a/QTfrontend/ui_hwform.h Fri Feb 23 13:31:11 2007 +0000 +++ b/QTfrontend/ui_hwform.h Fri Feb 23 14:24:32 2007 +0000 @@ -1,6 +1,6 @@ /* * Hedgewars, a worms-like game - * Copyright (c) 2006 Andrey Korotaev + * Copyright (c) 2006, 2007 Andrey Korotaev * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by