[wpdev-commits] wolfpack basechar.cpp,1.51,1.52 basechar.h,1.39,1.40 items.cpp,1.365,1.366 items.h,1.181,1.182 persistentbroker.cpp,1.32,1.33 uobject.cpp,1.126,1.127 uobject.h,1.79,1.80

[<dar...@pr...>]

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18287

Modified Files:
	basechar.cpp basechar.h items.cpp items.h persistentbroker.cpp 
	uobject.cpp uobject.h 
Log Message:
Redid parts of the tooltip implementation.

Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** basechar.cpp	25 Jan 2004 20:24:25 -0000	1.51
--- basechar.cpp	29 Jan 2004 23:56:31 -0000	1.52
***************
*** 2060,2061 ****
--- 2060,2068 ----
  }
  
+ void cBaseChar::createTooltip(cUOTxTooltipList &tooltip, cPlayer *player) {
+ 	cUObject::createTooltip(tooltip, player);
+ 
+ 	if (!onShowTooltip(player, &tooltip)) {
+ 		tooltip.addLine( 0x1005bd, " \t" + name_ + "\t " );
+ 	}
+ }

Index: basechar.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** basechar.h	25 Jan 2004 20:24:26 -0000	1.39
--- basechar.h	29 Jan 2004 23:56:32 -0000	1.40
***************
*** 108,111 ****
--- 108,112 ----
  	virtual void log( const QString &string ) = 0;
  	unsigned int damage( eDamageType type, unsigned int amount, cUObject *source = 0 );
+ 	void createTooltip(cUOTxTooltipList &tooltip, cPlayer *player);
  	
  	// other public methods

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.365
retrieving revision 1.366
diff -C2 -d -r1.365 -r1.366
*** items.cpp	26 Jan 2004 09:42:30 -0000	1.365
--- items.cpp	29 Jan 2004 23:56:32 -0000	1.366
***************
*** 2365,2366 ****
--- 2365,2382 ----
  	return pItem;
  }
+ 
+ void cItem::createTooltip(cUOTxTooltipList &tooltip, cPlayer *player) {
+ 	cUObject::createTooltip(tooltip, player);
+ 
+ 	if (!onShowTooltip(player, &tooltip)) {
+ 		if (name_.isNull() || name_.isEmpty()) {
+ 			if (amount_ > 1) {
+ 				tooltip.addLine(0x1005bd, " \t#" + QString::number( 0xF9060 + id_ ) + "\t: " + QString::number(amount_));
+ 			} else {
+ 				tooltip.addLine(0xF9060 + id_, "");
+ 			}
+ 		}
+ 		else
+ 			tooltip.addLine( 0x1005bd, " \t" + name_ + "\t " );
+ 	}
+ }

Index: items.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.h,v
retrieving revision 1.181
retrieving revision 1.182
diff -C2 -d -r1.181 -r1.182
*** items.h	26 Nov 2003 03:53:53 -0000	1.181
--- items.h	29 Jan 2004 23:56:33 -0000	1.182
***************
*** 246,249 ****
--- 246,250 ----
  	P_CHAR getOutmostChar();
  
+ 	void createTooltip(cUOTxTooltipList &tooltip, cPlayer *player);
  	virtual stError *setProperty( const QString &name, const cVariant &value );
  	virtual stError *getProperty( const QString &name, cVariant &value ) const;

Index: persistentbroker.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/persistentbroker.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** persistentbroker.cpp	22 Jan 2004 04:39:58 -0000	1.32
--- persistentbroker.cpp	29 Jan 2004 23:56:34 -0000	1.33
***************
*** 33,36 ****
--- 33,37 ----
  #include "persistentobject.h"
  
+ #include "exceptions.h"
  #include "dbdriver.h"
  #include "console.h"
***************
*** 89,93 ****
  		d->sqlite = false;
  #else
! 		throw QString( "Sorry, you have to define MYSQL_DRIVER to make wolfpack work with MySQL.\n" );
  #endif
  	}
--- 90,94 ----
  		d->sqlite = false;
  #else
! 		throw wpException( "Sorry, you have to define MYSQL_DRIVER to make wolfpack work with MySQL.\n" );
  #endif
  	}

Index: uobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** uobject.cpp	26 Jan 2004 03:48:40 -0000	1.126
--- uobject.cpp	29 Jan 2004 23:56:34 -0000	1.127
***************
*** 750,754 ****
  		}
  	} else {
! 		// TODO: Tooltip implementation sucks... redo...
  	}
  }
--- 750,761 ----
  		}
  	} else {
! 		cUOTxTooltipList tooltip;		
! 
! 		for (cUOSocket *s = cNetwork::instance()->first(); s; s = cNetwork::instance()->next()) {
! 			if (s->player() && s->player()->inRange(this, s->player()->visualRange())) {
! 				createTooltip(tooltip, s->player());
! 				s->send(&tooltip);
! 			}
! 		}
  	}
  }
***************
*** 778,779 ****
--- 785,792 ----
  	return result;
  }
+ 
+ void cUObject::createTooltip(cUOTxTooltipList &tooltip, cPlayer *player) {
+ 	tooltip.resize(19); // Resize to the original size
+ 	tooltip.setSerial(serial_);
+ 	tooltip.setId(tooltip_);
+ }

Index: uobject.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.h,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** uobject.h	25 Jan 2004 20:24:26 -0000	1.79
--- uobject.h	29 Jan 2004 23:56:34 -0000	1.80
***************
*** 56,59 ****
--- 56,60 ----
  class QSqlQuery;
  class cItem;
+ class cUOTxTooltipList;
  
  struct stError;
***************
*** 134,137 ****
--- 135,139 ----
  	// Events
  	virtual bool onCreate( const QString &definition );
+ 	virtual void createTooltip(cUOTxTooltipList &tooltip, cPlayer *player);
  	
  	bool free;