Merge pull request #24 from heroesf/main

removed cpostit, unused files, small fix warning

src/EffectLib/EffectManager.cpp

@@ -7,7 +7,7 @@ void CEffectManager::GetInfo(std::string* pstInfo)
 {
 	char szInfo[256];
 	
-	sprintf(szInfo, "Effect: Inst - ED %d, EI %d Pool - PSI %d, MI %d, LI %d, PI %d, EI %d, ED %d, PSD %d, EM %d, LD %d", 		
+	sprintf(szInfo, "Effect: Inst - ED %zd, EI %zd Pool - PSI %zd, MI %zd, LI %zd, PI %zd, EI %zd, ED %zd, PSD %zd, EM %zd, LD %zd", 		
 		m_kEftDataMap.size(),
 		m_kEftInstMap.size(),		
 		CParticleSystemInstance::ms_kPool.GetCapacity(),

src/EterBase/CPostIt.cpp

@@ -1,299 +0,0 @@
-#include "StdAfx.h"
-#include "CPostIt.h"
-#include "EterBase/utils.h"
-
-class _CPostItMemoryBlock
-{
-public:
-	_CPostItMemoryBlock( void );
-	~_CPostItMemoryBlock( void );
-
-	BOOL Assign( HANDLE hBlock );
-	HANDLE CreateHandle( void );
-	BOOL DestroyHandle( void );
-
-	LPSTR Find( LPCSTR lpszKeyName );
-	BOOL Put( LPCSTR lpBuffer );
-	BOOL Put( LPCSTR lpszKeyName, LPCSTR lpBuffer );
-	BOOL Get( LPCSTR lpszKeyName, LPSTR lpBuffer, DWORD nSize );
-
-protected:
-	typedef std::list<CHAR *>	StrList;
-	typedef StrList::iterator	StrListItr;
-
-	HANDLE	m_hHandle;
-	StrList m_StrList;
-};
-
-CPostIt::CPostIt( LPCSTR szAppName ) : m_pMemoryBlock(NULL), m_bModified(FALSE)
-{
-	Init( szAppName );
-}
-
-CPostIt::~CPostIt( void )
-{
-	Destroy();
-}
-
-BOOL CPostIt::Init( LPCSTR szAppName )
-{
-	if( szAppName == NULL || !*szAppName ) {
-		strcpy( m_szClipFormatName, "YMCF" );
-	} else {
-		strcpy( m_szClipFormatName, "YMCF_" );
-		strcat( m_szClipFormatName, szAppName );
-	}
-	return TRUE;
-}
-
-BOOL CPostIt::CopyTo( CPostIt *pPostIt, LPCSTR lpszKeyName )
-{
-	if( m_pMemoryBlock == NULL )
-		return FALSE;
-	LPSTR szText = m_pMemoryBlock->Find( lpszKeyName );
-	if( szText == NULL )
-		return FALSE;
-	return pPostIt->Set( szText );
-}
-
-BOOL CPostIt::Flush( void )
-{
-	if( m_bModified == FALSE )
-		return FALSE;
-	if( m_pMemoryBlock == NULL )
-		return FALSE;
-	UINT	uDGPFormat;
-
-	uDGPFormat = ::RegisterClipboardFormatA( m_szClipFormatName );
-	if( ::OpenClipboard( NULL ) == FALSE )
-		return FALSE;
-	if( ::SetClipboardData( uDGPFormat, m_pMemoryBlock->CreateHandle() ) == NULL ) {
-//		DWORD dwLastError = ::GetLastError();
-		m_pMemoryBlock->DestroyHandle();
-		::CloseClipboard();
-		m_bModified = FALSE;
-		return FALSE;
-	}
-	::CloseClipboard();
-	m_bModified = FALSE;
-	return TRUE;
-}
-
-void CPostIt::Empty( void )
-{
-	SAFE_DELETE( m_pMemoryBlock );
-
-	UINT	uDGPFormat;
-
-	uDGPFormat = ::RegisterClipboardFormatA( m_szClipFormatName );
-	if( ::OpenClipboard( NULL ) == FALSE )
-		return;
-	HANDLE hClipboardMemory = ::GetClipboardData( uDGPFormat );
-	if( hClipboardMemory ) {
-//		::GlobalFree( hClipboardMemory );
-		::SetClipboardData( uDGPFormat, NULL );
-	}
-	::CloseClipboard();
-
-	m_bModified = FALSE;
-}
-
-void CPostIt::Destroy( void )
-{
-	Flush();
-	SAFE_DELETE( m_pMemoryBlock );
-}
-
-BOOL CPostIt::Set( LPCSTR lpszKeyName, LPCSTR lpBuffer )
-{
-	if( m_pMemoryBlock == NULL )
-		m_pMemoryBlock = new _CPostItMemoryBlock;
-	m_pMemoryBlock->Put( lpszKeyName, lpBuffer );
-	m_bModified = TRUE;
-	return TRUE;
-}
-
-BOOL CPostIt::Set( LPCSTR lpszKeyName, DWORD dwValue )
-{
-	CHAR szValue[12];
-
-	_snprintf( szValue, 12, "%d", dwValue );
-	return Set( lpszKeyName, szValue );
-}
-
-BOOL CPostIt::Set( LPCSTR lpBuffer )
-{
-	if( lpBuffer == NULL )
-		return FALSE;
-	if( m_pMemoryBlock == NULL )
-		m_pMemoryBlock = new _CPostItMemoryBlock;
-	m_pMemoryBlock->Put( lpBuffer );
-	m_bModified = TRUE;
-	return TRUE;
-}
-
-BOOL CPostIt::Get( LPCSTR lpszKeyName, LPSTR lpBuffer, DWORD nSize )
-{
-	if( m_pMemoryBlock == NULL ) {
-		UINT	uDGPFormat;
-
-		uDGPFormat = ::RegisterClipboardFormatA( m_szClipFormatName );
-		if( ::OpenClipboard( NULL ) == FALSE )
-			return FALSE;
-
-		HANDLE hClipboardMemory = ::GetClipboardData( uDGPFormat );
-
-		if( hClipboardMemory == NULL ) {
-			::CloseClipboard();
-			return FALSE;
-		}
-		m_pMemoryBlock = new _CPostItMemoryBlock;
-		m_pMemoryBlock->Assign( hClipboardMemory );
-
-		::CloseClipboard();
-	}
-
-	return m_pMemoryBlock->Get( lpszKeyName, lpBuffer, nSize );
-}
-
-_CPostItMemoryBlock::_CPostItMemoryBlock( void ) : m_hHandle( NULL )
-{
-}
-
-_CPostItMemoryBlock::~_CPostItMemoryBlock( void )
-{
-	for( StrListItr itr = m_StrList.begin(); itr != m_StrList.end(); ) {
-		LPSTR	lpszText = *itr;
-		SAFE_DELETE_ARRAY( lpszText );
-		itr = m_StrList.erase( itr );
-	}
-}
-
-BOOL _CPostItMemoryBlock::Assign( HANDLE hBlock )
-{
-	if( hBlock == NULL || hBlock == INVALID_HANDLE_VALUE )
-		return FALSE;
-	LPBYTE lpBuffer = (LPBYTE) ::GlobalLock( hBlock );
-
-	if( lpBuffer == NULL )
-		return FALSE;
-	DWORD dwCount = *((LPDWORD) lpBuffer);				lpBuffer += sizeof( DWORD );
-	for( DWORD dwI=0; dwI < dwCount; dwI++ ) {
-		WORD	wLen = *((LPWORD) lpBuffer);			lpBuffer += sizeof( WORD );
-
-		LPSTR	lpszText = new CHAR[ wLen + 1 ];
-		::CopyMemory( lpszText, lpBuffer, wLen );
-		lpszText[ wLen ] = '\0';
-
-		lpBuffer += wLen;
-
-		Put( lpszText );
-	}
-	::GlobalUnlock( hBlock ); 
-	return TRUE;
-}
-
-HANDLE _CPostItMemoryBlock::CreateHandle( void )
-{
-	if( m_StrList.size() == 0 )
-		return INVALID_HANDLE_VALUE;
-	DWORD dwBlockSize = sizeof( DWORD );
-	StrListItr itr;
-
-	// Calculation for Memory Block Size
-	for( itr = m_StrList.begin(); itr != m_StrList.end(); ++itr ) {
-		dwBlockSize += sizeof( WORD );
-		dwBlockSize += (DWORD) strlen( *itr );
-	}
-
-	HANDLE hBlock = ::GlobalAlloc( GMEM_ZEROINIT | GMEM_MOVEABLE, dwBlockSize );
-	if( hBlock == NULL )
-		return INVALID_HANDLE_VALUE;
-	LPBYTE lpBuffer = (LPBYTE) ::GlobalLock( hBlock );
-	if( lpBuffer == NULL ) {
-		::GlobalFree( hBlock );
-		return INVALID_HANDLE_VALUE;
-	}
-	*((LPDWORD) lpBuffer) = (DWORD) m_StrList.size();	lpBuffer += sizeof( DWORD );
-	for( itr = m_StrList.begin(); itr != m_StrList.end(); ++itr ) {
-		*((LPWORD) lpBuffer) = (WORD) strlen( *itr );	lpBuffer += sizeof( WORD );
-		::CopyMemory( lpBuffer, *itr, strlen( *itr ) );	lpBuffer += strlen( *itr );
-	}
-	::GlobalUnlock( hBlock );
-
-	m_hHandle = hBlock;
-	return hBlock;
-}
-
-BOOL _CPostItMemoryBlock::DestroyHandle( void )
-{
-	::GlobalFree( m_hHandle );
-	m_hHandle = NULL;
-	return TRUE;
-}
-
-LPSTR _CPostItMemoryBlock::Find( LPCSTR lpszKeyName )
-{
-	for( StrListItr itr = m_StrList.begin(); itr != m_StrList.end(); ++itr ) {
-		LPSTR	lpszText = *itr;
-
-		if( _strnicmp( lpszText, lpszKeyName, strlen( lpszKeyName ) ) != 0 )
-			continue;
-		if( *(lpszText + strlen( lpszKeyName )) != '=' )
-			continue;
-		return lpszText;
-	}
-	return NULL;
-}
-
-BOOL _CPostItMemoryBlock::Put( LPCSTR lpszKeyName, LPCSTR lpBuffer )
-{
-	LPSTR	lpszText;
-
-	if( (lpszText = Find( lpszKeyName )) != NULL ) {
-		for( StrListItr itr = m_StrList.begin(); itr != m_StrList.end(); ++itr ) {
-			if( lpszText == *itr ) {
-				SAFE_DELETE_ARRAY( lpszText );
-				m_StrList.erase( itr );
-				break;
-			}
-		}
-	}
-	if( lpBuffer == NULL || !*lpBuffer )
-		return TRUE;
-	size_t nStrLen	= strlen( lpszKeyName ) + 1 /* '=' */ + strlen( lpBuffer );
-	lpszText = new CHAR[ nStrLen + 1 ];
-	::CopyMemory( lpszText, lpszKeyName, strlen( lpszKeyName ) );
-	*(lpszText + strlen( lpszKeyName )) = '=';
-	::CopyMemory( lpszText + strlen( lpszKeyName ) + 1, lpBuffer, strlen( lpBuffer ) );
-	*(lpszText + nStrLen) = '\0';
-
-	m_StrList.push_back( lpszText );
-	return TRUE;
-}
-
-BOOL _CPostItMemoryBlock::Put( LPCSTR lpBuffer )
-{
-	LPSTR	lpszText;
-
-	if( lpBuffer == NULL || !*lpBuffer )
-		return TRUE;
-	size_t nStrLen	= strlen( lpBuffer );
-	lpszText = new CHAR[ nStrLen + 1 ];
-	::CopyMemory( lpszText, lpBuffer, nStrLen );
-	*(lpszText + nStrLen) = '\0';
-
-	m_StrList.push_back( lpszText );
-	return TRUE;
-}
-
-BOOL _CPostItMemoryBlock::Get( LPCSTR lpszKeyName, LPSTR lpBuffer, DWORD nSize )
-{
-	LPSTR lpszText = Find( lpszKeyName );
-	if( lpszText == NULL )
-		return FALSE;
-	lpszText += (strlen( lpszKeyName ) + 1);
-	::ZeroMemory( lpBuffer, nSize );
-	strncpy( lpBuffer, lpszText, (nSize < strlen( lpszText )) ? nSize : strlen( lpszText ) );
-	return TRUE;
-}

src/EterBase/CPostIt.h

@@ -1,80 +0,0 @@
-#ifndef _EL_CPOSTIT_H_
-#define _EL_CPOSTIT_H_
-
-// _CPostItMemoryBlock is defined in CPostIt.cpp
-class _CPostItMemoryBlock;
-
-/**
- * @class	CPostIt
- * @brief	게임런처에서 게임 클라이언트로 정보를 전달 및 클라이언트에서 수신하기 위하여 사용되는 클래스
- */
-class CPostIt
-{
-public:
-	/**
-	 * @brief	CPostIt constructor
-	 * @param [in]	szAppName	: 게임의 이름이 들어간다.
-	 */
-	explicit CPostIt( LPCSTR szAppName );
-
-	/**
-	 * @brief	CPostIt destructor
-	 */
-	~CPostIt( void );
-
-	/**
-	 * @brief	CPostIt class에서 보유하고 있는 데이타를 클립보드에 저장한다.
-	 */
-	BOOL	Flush( void );
-
-	/**
-	 * @brief	CPostIt class에서 보유하고 있는 데이타 및 클립보드에 있는 내용을 지운다.
-	 */
-	void	Empty( void );
-
-	/**
-	 * @brief	데이타를 읽어온다.
-	 * @param [in]	lpszKeyName	: 불러올 데이타의 키. "KEY" 식의 내용을 넣는다.
-	 * @param [in]	lpszData	: 불러올 데이타의 버퍼
-	 * @param [in]	nSize		: lpszData 버퍼의 최대사이즈
-	 */
-	BOOL	Get( LPCSTR lpszKeyName, LPSTR lpszData, DWORD nSize );
-
-	/**
-	 * @brief	저장할 데이타를 넣는다.
-	 * @param [in]	lpBuffer	: 저장할 데이타. "KEY=DATA" 식의 내용을 넣는다.
-	 */
-	BOOL	Set( LPCSTR lpszData );
-
-	/**
-	 * @brief	저장할 데이타를 넣는다.
-	 * @param [in]	lpszKeyName	: 저장할 데이타의 키. "KEY" 식의 내용을 넣는다.
-	 * @param [in]	lpszData	: 저장할 데이타. "DATA" 식의 내용을 넣는다.
-	 */
-	BOOL	Set( LPCSTR lpszKeyName, LPCSTR lpszData );
-
-	/**
-	 * @brief	저장할 데이타(DWORD)를 넣는다.
-	 * @param [in]	lpBuffer	: 저장할 데이타. "KEY=DATA" 식의 데이타를 넣는다.
-	 * @param [in]	dwValue		: 저장할 데이타. (DWORD)
-	 */
-	BOOL	Set( LPCSTR lpszKeyName, DWORD dwValue );
-
-	/**
-	 * @brief	CPostIt class를 복사한다. (클래스 constructor에 이름 인자가 있기 때문에, 새 이름을 지정해야함)
-	 * @param [in]	pPostIt		: Destination class
-	 * @param [in]	lpszKeyName	: Destination class's new app-name
-	 */
-	BOOL	CopyTo( CPostIt *pPostIt, LPCSTR lpszKeyName );
-
-protected:
-	BOOL					Init( LPCSTR szAppName );
-	void					Destroy( void );
-
-protected:
-	BOOL					m_bModified;
-	CHAR					m_szClipFormatName[_MAX_PATH];
-	_CPostItMemoryBlock*	m_pMemoryBlock;
-};
-
-#endif /* _EL_CPOSTIT_H_ */

src/EterBase/ServiceDefs.h

@@ -1,6 +0,0 @@
-#ifndef _EL_SERVICEDEFS_H_
-#define _EL_SERVICEDEFS_H_
-
-#define _IMPROVED_PACKET_ENCRYPTION_
-
-#endif //_EL_SERVICEDEFS_H_

src/EterBase/StdAfx.h

@@ -48,4 +48,5 @@
 
 #include "vk.h"
 #include "filename.h"
-#include "ServiceDefs.h"
+
+#include "../UserInterface/Locale_inc.h"

src/EterLib/Dynamic.h

@@ -1,75 +0,0 @@
-#pragma once
-
-template<typename T>
-class CDynamic
-{
-	public:
-		struct FClear
-		{
-			void operator() (CDynamic<T>& rDynamic)
-			{
-				rDynamic.Clear();
-			}
-		};
-
-	public:
-		CDynamic()
-		{
-			Initialize();
-		}
-
-		~CDynamic()
-		{
-			Clear();
-		}
-
-		void Clear()
-		{
-			if (m_pObject)
-				ms_objectPool.Free(m_pObject);
-							
-			Initialize();
-		}
-
-		T* GetUsablePointer()
-		{
-			if (!m_pObject)
-				m_pObject = ms_objectPool.Alloc();
-					
-			return m_pObject;
-		}
-
-		bool IsNull() const
-		{
-			if (m_pObject)
-				return false;
-			return true;
-		}
-
-		T* GetPointer() const
-		{
-			assert(m_pObject != NULL);
-			return m_pObject;
-		}
-		
-		T* operator->() const
-		{
-			assert(m_pObject != NULL);
-			return m_pObject;
-		}
-
-	private:
-		T*	m_pObject;
-
-	private:
-		void Initialize()
-		{
-			m_pObject = NULL;
-		}
-
-	private:
-		static CDynamicPool<T> ms_objectPool;
-};
-
-template<typename T>
-CDynamicPool<T> CDynamic<T>::ms_objectPool;

src/EterLib/NetStream.cpp

@@ -118,7 +118,7 @@ bool CNetworkStream::__RecvInternalBuffer()
 #else
 	if (IsSecurityMode())
 	{		
-		int restSize = min(m_recvTEABufSize - m_recvTEABufInputPos, m_recvBufSize - m_recvBufInputPos);
+		int restSize = std::min(m_recvTEABufSize - m_recvTEABufInputPos, m_recvBufSize - m_recvBufInputPos);
  
 		if (restSize > 0)
 		{

src/EterLib/Pool.h

@@ -64,7 +64,7 @@ class CDynamicPool
 			m_Free = m_Data;
 		}
 		
-		DWORD GetCapacity()
+		size_t GetCapacity()
 		{
 			return m_Data.size();
 		}

src/EterLib/StdAfx.h

@@ -39,95 +39,3 @@
 #ifndef VC_EXTRALEAN
 #include <winsock.h>
 #endif
-
-
-/*
-#include "Pool.h"
-#include "Dynamic.h"
-#include "Event.h"
-#include "FuncObject.h"
-#include "ReferenceObject.h"
-#include "Ref.h"
-
-#include "Util.h"
-#include "TextFileLoader.h"
-#include "Parser.h"
-
-#include "Resource.h"
-#include "ResourceManager.h"
-
-#include "MSWindow.h"
-#include "MSApplication.h"
-#include "Mutex.h"
-#include "Thread.h"
-
-#include "GrpBase.h"
-
-#include "GrpDib.h"
-#include "GrpMath.h"
-#include "GrpDevice.h"
-
-#include "CollisionData.h"
-#include "GrpCollisionObject.h"
-#include "GrpScreen.h"
-#include "CullingManager.h"
-
-// Attribute
-#include "AttributeData.h"
-#include "AttributeInstance.h"
-
-#include "GrpObjectInstance.h"
-#include "GrpRatioInstance.h"
-
-#include "GrpD3DXBuffer.h"
-
-#include "GrpTexture.h"
-#include "GrpImageTexture.h"
-#include "GrpFontTexture.h"
-
-#include "GrpText.h"
-#include "GrpImage.h"
-#include "GrpSubImage.h"
-
-#include "GrpIndexBuffer.h"
-#include "GrpVertexBuffer.h"
-#include "GrpVertexBufferStatic.h"
-#include "GrpVertexBufferDynamic.h"
-#include "GrpVertexShader.h"
-#include "GrpPixelShader.h"
-
-
-#include "GrpShadowTexture.h"
-#include "GrpImageInstance.h"
-#include "GrpExpandedImageInstance.h"
-#include "GrpTextInstance.h"
-#include "GrpLightManager.h"
-
-#include "TargaResource.h"
-
-#include "NetDevice.h"
-#include "NetAddress.h"
-// #include "NetStream.h"
-#include "NetPacketHeaderMap.h"
-#include "NetDatagramSender.h"
-#include "NetDatagramReceiver.h"
-
-#include "Input.h"
-#include "IME.h"
-
-#include "PathStack.h"
-//#include "Property.h"
-
-#include "Profiler.h"
-
-#include "StateManager.h"
-
-#include "ColorTransitionHelper.h"
-#include "LensFlare.h"
-#include "ScreenFilter.h"
-#include "EnvironmentMap.h"
-
-#include "lineintersect_utils.h"
-
-#include "Decal.h"
-*/

src/EterPythonLib/PythonWindow.cpp

@@ -46,6 +46,7 @@ namespace UI
 			start = start->GetParent();
 		}
 
+		return nullptr;
 	}
 
 	static CWindow* GetParentScissorWindow(CWindow* pWin)

src/UserInterface/InstanceBase.cpp

@@ -966,7 +966,7 @@ void CInstanceBase::DismountHorse()
 void CInstanceBase::GetInfo(std::string* pstInfo)
 {
 	char szInfo[256];
-	sprintf(szInfo, "Inst - UC %d, RC %d Pool - %d ", 
+	sprintf(szInfo, "Inst - UC %d, RC %d Pool - %zd ", 
 		ms_dwUpdateCounter, 
 		ms_dwRenderCounter,
 		ms_kPool.GetCapacity()

src/UserInterface/Locale.cpp

@@ -317,7 +317,7 @@ LRESULT CALLBACK SelectDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 		char szLocalePath[256], szDisplayName[256];
 		for(int i=0; gs_stLocaleData[i].szServiceName; i++ ) {
 			sprintf(szLocalePath, "locale/%s/item_proto", gs_stLocaleData[i].szLocaleName);
-			if( CEterPackManager::Instance().isExist(szLocalePath)) {
+			if(CPackManager::Instance().IsExist(szLocalePath)) {
 				sprintf(szDisplayName, "%s (%s, %d)", gs_stLocaleData[i].szLocaleName, gs_stLocaleData[i].szServiceName, gs_stLocaleData[i].wCodePage);
 				int iIndex = ListBox_AddString(GetDlgItem(hDlg, IDC_LOCALE_LIST), szDisplayName);
 				ListBox_SetItemData(GetDlgItem(hDlg, IDC_LOCALE_LIST), iIndex, i);
@@ -362,7 +362,7 @@ bool LocaleService_LoadGlobal(HINSTANCE hInstance)
 
 	for(int i=0; gs_stLocaleData[i].szServiceName; i++ ) {
 		sprintf(szLocalePath, "locale/%s/item_proto", gs_stLocaleData[i].szLocaleName);
-		if( CEterPackManager::Instance().isExist(szLocalePath)) {
+		if(CPackManager::Instance().IsExist(szLocalePath)) {
 			nFoundLocales++;
 			if(gs_iLocale == -1)
 				gs_iLocale = i;

src/UserInterface/Locale_inc.h

@@ -1,4 +1,6 @@
-#define LOCALE_SERVICE_SINGAPORE			// 싱가폴
+#define _IMPROVED_PACKET_ENCRYPTION_
+
+#define LOCALE_SERVICE_GLOBAL
 #define ENABLE_COSTUME_SYSTEM
 #define ENABLE_ENERGY_SYSTEM
 #define ENABLE_DRAGON_SOUL_SYSTEM

src/UserInterface/Locale_inc_BR.h

@@ -1,5 +0,0 @@
-#define LOCALE_SERVICE_BRAZIL				// 브라질
-
-#define ENABLE_COSTUME_SYSTEM
-#define ENABLE_ENERGY_SYSTEM
-#define ENABLE_DRAGON_SOUL_SYSTEM

src/UserInterface/Locale_inc_CA.h

@@ -1,4 +0,0 @@
-#define LOCALE_SERVICE_CANADA				// 캐나다
-
-#define ENABLE_COSTUME_SYSTEM
-#define ENABLE_ENERGY_SYSTEM

src/UserInterface/Locale_inc_EU.h

@@ -1,2 +0,0 @@
-#define LOCALE_SERVICE_EUROPE				// 유럽
-#define LSS_SECURITY_KEY		"1234abcd5678efgh"

src/UserInterface/Locale_inc_EU2.h

@@ -1,7 +0,0 @@
-#define LOCALE_SERVICE_EUROPE				// 유럽
-#define LSS_SECURITY_KEY					"1234abcd5678efgh"
-#define ENABLE_COSTUME_SYSTEM
-#define ENABLE_ENERGY_SYSTEM
-#define ENABLE_DRAGON_SOUL_SYSTEM
-#define ENABLE_NEW_EQUIPMENT_SYSTEM	
-

src/UserInterface/Locale_inc_GB.h

@@ -1,3 +0,0 @@
-#define LOCALE_SERVICE_GLOBAL			// GLOBAL version
-
-#define USE_RELATIVE_PATH

src/UserInterface/Locale_inc_HK.h

@@ -1,2 +0,0 @@
-#define LOCALE_SERVICE_HONGKONG			// 홍콩
-

src/UserInterface/Locale_inc_JP.h

@@ -1,5 +0,0 @@
-#define LOCALE_SERVICE_WE_JAPAN				// World Edition(유럽 버젼) 버젼의 일본
-#define LOCALE_SERVICE_EUROPE				// 유럽
-#define LSS_SECURITY_KEY		"1234abcd5678efgh"
-#define ENABLE_COSTUME_SYSTEM
-#define ENABLE_ENERGY_SYSTEM

src/UserInterface/Locale_inc_KO.h

@@ -1,6 +0,0 @@
-#include "Locale_inc_EU.h"
-
-#define ENABLE_COSTUME_SYSTEM
-#define ENABLE_ENERGY_SYSTEM
-#define ENABLE_DRAGON_SOUL_SYSTEM
-#define ENABLE_NEW_EQUIPMENT_SYSTEM

src/UserInterface/Locale_inc_KO_DEV.h

@@ -1,5 +0,0 @@
-#define LOCALE_SERVICE_YMIR					// Korean
-
-#define LOCALE_SERVICE_STAGE_DEVELOPMENT
-
-#define USE_RELATIVE_PATH

src/UserInterface/Locale_inc_NEWCIBN.h

@@ -1,6 +0,0 @@
-#define LOCALE_SERVICE_NEWCIBN			// 중국 자유세계
-
-#define ENABLE_COSTUME_SYSTEM
-#define ENABLE_ENERGY_SYSTEM
-#define ENABLE_DRAGON_SOUL_SYSTEM
-#define ENABLE_NEW_EQUIPMENT_SYSTEM

src/UserInterface/Locale_inc_SG.h

@@ -1,3 +0,0 @@
-#define LOCALE_SERVICE_SINGAPORE			// 싱가폴
-#define ENABLE_COSTUME_SYSTEM
-#define ENABLE_ENERGY_SYSTEM

src/UserInterface/Locale_inc_VI.h

@@ -1 +0,0 @@
-#define LOCALE_SERVICE_VIETNAM			// 베트남

src/UserInterface/Locale_inc_dev.h

@@ -1,6 +0,0 @@
-#include "Locale_inc_EU.h"
-
-#define ENABLE_COSTUME_SYSTEM
-#define ENABLE_ENERGY_SYSTEM
-#define ENABLE_DRAGON_SOUL_SYSTEM
-#define ENABLE_NEW_EQUIPMENT_SYSTEM

src/UserInterface/PythonCharacterManager.cpp

@@ -123,7 +123,7 @@ void CPythonCharacterManager::GetInfo(std::string* pstInfo)
 	CInstanceBase::GetInfo(pstInfo);
 
 	char szInfo[256];
-	sprintf(szInfo, "Container - Live %d, Dead %d", m_kAliveInstMap.size(), m_kDeadInstList.size());
+	sprintf(szInfo, "Container - Live %zd, Dead %zd", m_kAliveInstMap.size(), m_kDeadInstList.size());
 	pstInfo->append(szInfo);
 }
 

src/UserInterface/PythonItem.cpp

@@ -15,7 +15,7 @@ std::string CPythonItem::TGroundItemInstance::ms_astDropSoundFileName[DROPSOUND_
 void CPythonItem::GetInfo(std::string* pstInfo)
 {
 	char szInfo[256];
-	sprintf(szInfo, "Item: Inst %d, Pool %d", m_GroundItemInstanceMap.size(), m_GroundItemInstancePool.GetCapacity());
+	sprintf(szInfo, "Item: Inst %zd, Pool %zd", m_GroundItemInstanceMap.size(), m_GroundItemInstancePool.GetCapacity());
 
 	pstInfo->append(szInfo);
 }

src/UserInterface/PythonTextTail.cpp

@@ -42,7 +42,7 @@ CGraphicText * ms_pFont = NULL;
 void CPythonTextTail::GetInfo(std::string* pstInfo)
 {
 	char szInfo[256];
-	sprintf(szInfo, "TextTail: ChatTail %d, ChrTail (Map %d, List %d), ItemTail (Map %d, List %d), Pool %d", 
+	sprintf(szInfo, "TextTail: ChatTail %zd, ChrTail (Map %zd, List %zd), ItemTail (Map %zd, List %zd), Pool %zd", 
 		m_ChatTailMap.size(), 
 		m_CharacterTextTailMap.size(), m_CharacterTextTailList.size(), 
 		m_ItemTextTailMap.size(), m_ItemTextTailList.size(), 

src/UserInterface/UserInterface.cpp

@@ -10,7 +10,6 @@
 #endif
 
 #include "eterLib/Util.h"
-#include "eterBase/CPostIt.h"
 #include "EterBase/lzo.h"
 
 #include "PackLib/PackManager.h"