Update of /cvsroot/wpdev/wolfpack/network
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17133/network
Modified Files:
uosocket.cpp
Log Message:
fixes for an annoying drop bug that occured with stackable items
fixes for missing maps.
Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.399
retrieving revision 1.400
diff -C2 -d -r1.399 -r1.400
*** uosocket.cpp 25 Aug 2004 17:01:33 -0000 1.399
--- uosocket.cpp 28 Aug 2004 14:42:05 -0000 1.400
***************
*** 661,664 ****
--- 661,673 ----
// d) Set the Game Time
+ if (!Maps::instance()->hasMap(pChar->pos().map)) {
+ Coord_cl pos;
+ pos.x = 0;
+ pos.y = 0;
+ pos.z = 0;
+ pos.map = 0;
+ pChar->moveTo(pos);
+ }
+
// We're now playing this char
pChar->setLogoutTime( 0 );
***************
*** 677,683 ****
cUOTxMapDiffs diffs;
diffs.addEntry( Maps::instance()->mapPatches( 0 ), Maps::instance()->staticPatches( 0 ) );
! diffs.addEntry( Maps::instance()->mapPatches( 1 ), Maps::instance()->staticPatches( 1 ) );
! diffs.addEntry( Maps::instance()->mapPatches( 2 ), Maps::instance()->staticPatches( 2 ) );
! diffs.addEntry( Maps::instance()->mapPatches( 3 ), Maps::instance()->staticPatches( 3 ) );
send( &diffs );
--- 686,698 ----
cUOTxMapDiffs diffs;
diffs.addEntry( Maps::instance()->mapPatches( 0 ), Maps::instance()->staticPatches( 0 ) );
! if (Maps::instance()->hasMap(1)) {
! diffs.addEntry( Maps::instance()->mapPatches( 1 ), Maps::instance()->staticPatches( 1 ) );
! if (Maps::instance()->hasMap(2)) {
! diffs.addEntry( Maps::instance()->mapPatches( 2 ), Maps::instance()->staticPatches( 2 ) );
! if (Maps::instance()->hasMap(3)) {
! diffs.addEntry( Maps::instance()->mapPatches( 3 ), Maps::instance()->staticPatches( 3 ) );
! }
! }
! }
send( &diffs );
|
