From 51bfbd368cc455b037393d3383346640113e915b Mon Sep 17 00:00:00 2001 From: Andrej Sinicyn Date: Sun, 31 Jul 2005 15:19:13 +0000 Subject: Don't allow more than one request trade dialog at once. --- ChangeLog | 5 ++--- src/game.cpp | 6 +++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f47d6fd..2d643abd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,7 @@ 2005-07-31 Andrej Sinicyn - * src/game.cpp: Don't allow more than one trade dialog at once; if a - trade is canceled on the other side, close the trade - window. + * src/game.cpp: Don't allow more than one trade dialog or requesting it at + once; if a trade is canceled on the other side, close the trade window. 2005-07-30 Andrej Sinicyn diff --git a/src/game.cpp b/src/game.cpp index 24fe3723..b550bc43 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -79,6 +79,7 @@ ConfirmDialog *exitConfirm = NULL; Being *target = NULL; Inventory *inventory = NULL; +RequestTradeDialog *requestTradeDialog = NULL; const int EMOTION_TIME = 150; /**< Duration of emotion icon */ const int MAX_TIME = 10000; @@ -1090,7 +1091,10 @@ void do_parse() WFIFOSET(3); break; } - new RequestTradeDialog(RFIFOP(2)); + if (requestTradeDialog == NULL) + { + requestTradeDialog = new RequestTradeDialog(RFIFOP(2)); + } break; // Trade: Response -- cgit v1.2.3-70-g09d2