[wpdev-commits] wolfpack/network uosocket.cpp,1.432,1.433 uotxpackets.cpp,1.103,1.104

[Sebastian H. <dar...@us...>]

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

Modified Files:
	uosocket.cpp uotxpackets.cpp 
Log Message:
Implemented a make ascii funciton that converts german umlauts into their 7bit representation for the ascii only packets (paperdoll, status)

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.432
retrieving revision 1.433
diff -C2 -d -r1.432 -r1.433
*** uosocket.cpp	18 Oct 2004 12:09:52 -0000	1.432
--- uosocket.cpp	26 Oct 2004 18:37:35 -0000	1.433
***************
*** 40,43 ****
--- 40,44 ----
  #include "../console.h"
  #include "../territories.h"
+ #include "../inlines.h"
  #include "../sectors.h"
  #include "../multi.h"
***************
*** 2441,2445 ****
  	sendStats.setAllowRename( ( ( pChar->objectType() == enNPC && dynamic_cast<P_NPC>( pChar )->owner() == _player && !pChar->isHuman() ) || _player->isGM() ) && ( _player != pChar ) );
  
! 	sendStats.setName( pChar->name() );
  	sendStats.setSerial( pChar->serial() );
  
--- 2442,2446 ----
  	sendStats.setAllowRename( ( ( pChar->objectType() == enNPC && dynamic_cast<P_NPC>( pChar )->owner() == _player && !pChar->isHuman() ) || _player->isGM() ) && ( _player != pChar ) );
  
! 	sendStats.setName( makeAscii( pChar->name() ) );
  	sendStats.setSerial( pChar->serial() );
  

Index: uotxpackets.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uotxpackets.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** uotxpackets.cpp	12 Oct 2004 12:55:14 -0000	1.103
--- uotxpackets.cpp	26 Oct 2004 18:37:36 -0000	1.104
***************
*** 489,493 ****
  	if ( !nameByScript.isNull() )
  	{
! 		setName( nameByScript );
  	}
  	else
--- 489,494 ----
  	if ( !nameByScript.isNull() )
  	{
! 		// Replace non displayable characters
! 		setName( makeAscii(nameByScript) );
  	}
  	else
***************
*** 567,575 ****
  			}
  
! 			setName( prefix + pChar->name() + ( title.isEmpty() ? QString( "" ) : ", " + title ) );
  		}
  		else
  		{
! 			setName( pChar->name() + ( title.isEmpty() ? QString( "" ) : ", " + title ) );
  		}
  	}
--- 568,576 ----
  			}
  
! 			setName( makeAscii( prefix + pChar->name() + ( title.isEmpty() ? QString( "" ) : ", " + title ) ) );
  		}
  		else
  		{
! 			setName( makeAscii( pChar->name() + ( title.isEmpty() ? QString( "" ) : ", " + title ) ) );
  		}
  	}