[atlantik-cvs] CVS: kdegames/atlantik/libatlantic atlantic_core.cpp,1.14.4.4,1.14.4.5 atlantic_core.h,1.13.4.4,1.13.4.5

Update of /home/kde/kdegames/atlantik/libatlantic
In directory office:/tmp/cvs-serv15544/libatlantic

Modified Files:
      Tag: KDE_3_1_BRANCH
	atlantic_core.cpp atlantic_core.h 
Log Message:
backport: removed buggy trademap in network code for decent ptrlist in core

Index: atlantic_core.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantic/atlantic_core.cpp,v
retrieving revision 1.14.4.4
retrieving revision 1.14.4.5
diff -u -d -r1.14.4.4 -r1.14.4.5
--- atlantic_core.cpp	31 Jan 2003 06:24:39 -0000	1.14.4.4
+++ atlantic_core.cpp	17 Jun 2003 18:21:34 -0000	1.14.4.5
@@ -42,9 +42,10 @@
 	m_players.setAutoDelete(true);
 	m_players.clear();
 	m_players.setAutoDelete(false);
-	m_trades.setAutoDelete(true);
-	m_trades.clear();
-	m_trades.setAutoDelete(false);
+
+	Trade *trade = 0;
+	for (QPtrListIterator<Trade> it(m_trades); (trade = *it) ; ++it)
+		removeTrade(trade);
 }
 
 QPtrList<Player> AtlanticCore::players()
@@ -151,6 +152,16 @@
 	Trade *trade = new Trade(tradeId);
 	m_trades.append(trade);
 	return trade;
+}
+
+Trade *AtlanticCore::findTrade(int tradeId)
+{
+	Trade *trade = 0;
+	for (QPtrListIterator<Trade> it(m_trades); (trade = *it) ; ++it)
+		if (trade->tradeId() == tradeId)
+			return trade;
+
+	return 0;
 }
 
 void AtlanticCore::removeTrade(Trade *trade)

Index: atlantic_core.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantic/atlantic_core.h,v
retrieving revision 1.13.4.4
retrieving revision 1.13.4.5
diff -u -d -r1.13.4.4 -r1.13.4.5
--- atlantic_core.h	31 Jan 2003 06:24:39 -0000	1.13.4.4
+++ atlantic_core.h	17 Jun 2003 18:21:34 -0000	1.13.4.5
@@ -51,6 +51,7 @@
 
 	QPtrList<Trade> trades();
 	Trade *newTrade(int tradeId);
+	Trade *findTrade(int tradeId);
 	void removeTrade(Trade *trade);
 
 	QPtrList<Auction> auctions();