[atlantik-cvs] CVS: kdegames/atlantik/libatlantic atlantic_core.cpp,1.14.4.7,1.14.4.8
| Newsgroups | gmane.comp.kde.devel.atlantik |
|---|---|
| Message-ID | <[email protected]> |
Update of /home/kde/kdegames/atlantik/libatlantic
In directory office:/tmp/cvs-serv22069/libatlantic
Modified Files:
Tag: KDE_3_1_BRANCH
atlantic_core.cpp
Log Message:
do not just delete players, also remove porfolios, when resetting core
Index: atlantic_core.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantic/atlantic_core.cpp,v
retrieving revision 1.14.4.7
retrieving revision 1.14.4.8
diff -u -d -r1.14.4.7 -r1.14.4.8
--- atlantic_core.cpp 14 Jul 2003 01:30:11 -0000 1.14.4.7
+++ atlantic_core.cpp 14 Jul 2003 07:16:16 -0000 1.14.4.8
@@ -46,22 +46,24 @@
for (QPtrListIterator<Trade> it(m_trades); (trade = *it) ; ++it)
removeTrade(trade);
- if (deletePlayers)
- {
- m_players.setAutoDelete(true);
- m_players.clear();
- m_players.setAutoDelete(false);
-
- m_playerSelf = 0;
- }
- else
+ Player *player = 0;
+ for (QPtrListIterator<Player> it(m_players); (player = *it) ; ++it)
{
- Player *player = 0;
- for (QPtrListIterator<Player> it(m_players); (player = *it) ; ++it)
+ if (deletePlayers)
+ {
+ emit removeGUI(player);
+ emit deletePlayer(player);
+ }
+ else
{
player->setLocation(0);
player->setDestination(0);
}
+ }
+ if (deletePlayers)
+ {
+ m_players.clear();
+ m_playerSelf = 0;
}
}