Changed: Use _T macro and TCHAR to support UNICODE

--HG--
branch : develop
feature/pipeline-tools
kervala 8 years ago
parent 83bd0ffe38
commit 947178e859

@ -137,7 +137,7 @@ Value* export_material_cf (Value** arg_list, int count)
check_arg_count(export_material, 4, count); check_arg_count(export_material, 4, count);
// Check to see if the arguments match up to what we expect // Check to see if the arguments match up to what we expect
char *message = "NeLLigoExportMaterial [Object] [Filename] [CheckOnly] [Error in dialog]"; TCHAR *message = _T("NeLLigoExportMaterial [Object] [Filename] [CheckOnly] [Error in dialog]");
type_check(arg_list[0], MAXNode, message); type_check(arg_list[0], MAXNode, message);
type_check(arg_list[1], String, message); type_check(arg_list[1], String, message);
type_check(arg_list[2], Boolean, message); type_check(arg_list[2], Boolean, message);
@ -306,7 +306,7 @@ Value* export_transition_cf (Value** arg_list, int count)
check_arg_count(export_transition, 6, count); check_arg_count(export_transition, 6, count);
// Check to see if the arguments match up to what we expect // Check to see if the arguments match up to what we expect
char *message = "NeLLigoExportTransition [Object array (count=9)] [Output filename] [First material filename] [Second material filename] [CheckOnly] [Error in dialog]"; TCHAR *message = _T("NeLLigoExportTransition [Object array (count=9)] [Output filename] [First material filename] [Second material filename] [CheckOnly] [Error in dialog]");
type_check(arg_list[0], Array, message); type_check(arg_list[0], Array, message);
type_check(arg_list[1], String, message); type_check(arg_list[1], String, message);
type_check(arg_list[2], String, message); type_check(arg_list[2], String, message);
@ -595,7 +595,7 @@ Value* get_error_zone_template_cf (Value** arg_list, int count)
check_arg_count(get_error_zone_template, 4, count); check_arg_count(get_error_zone_template, 4, count);
// Check to see if the arguments match up to what we expect // Check to see if the arguments match up to what we expect
char *message = "NeLLigoGetErrorZoneTemplate [Array error codes] [Array vertex id] [Array messages] [Error index]"; TCHAR *message = _T("NeLLigoGetErrorZoneTemplate [Array error codes] [Array vertex id] [Array messages] [Error index]");
type_check(arg_list[0], Array, message); type_check(arg_list[0], Array, message);
type_check(arg_list[1], Array, message); type_check(arg_list[1], Array, message);
type_check(arg_list[2], Array, message); type_check(arg_list[2], Array, message);
@ -637,7 +637,7 @@ Value* get_error_zone_template_cf (Value** arg_list, int count)
vertexId->append (Integer::intern (id+1)); vertexId->append (Integer::intern (id+1));
// Append messages // Append messages
messages->append (new String("[LIGO DEBUG] Opened edge")); messages->append (new String(_T("[LIGO DEBUG] Opened edge")));
} }
// Return the main error message // Return the main error message
@ -687,7 +687,7 @@ Value* check_zone_with_material_cf (Value** arg_list, int count)
check_arg_count(check_zone_with_template, 3, count); check_arg_count(check_zone_with_template, 3, count);
// Check to see if the arguments match up to what we expect // Check to see if the arguments match up to what we expect
char *message = "NeLLigoCheckZoneWithMaterial [Object] [Material filename] [Error in dialog]"; TCHAR *message = _T("NeLLigoCheckZoneWithMaterial [Object] [Material filename] [Error in dialog]");
type_check(arg_list[0], MAXNode, message); type_check(arg_list[0], MAXNode, message);
type_check(arg_list[1], String, message); type_check(arg_list[1], String, message);
type_check(arg_list[2], Boolean, message); type_check(arg_list[2], Boolean, message);
@ -820,7 +820,7 @@ Value* check_zone_with_transition_cf (Value** arg_list, int count)
check_arg_count(check_zone_with_template, 4, count); check_arg_count(check_zone_with_template, 4, count);
// Check to see if the arguments match up to what we expect // Check to see if the arguments match up to what we expect
char *message = "NeLLigoCheckZoneWithTransition [Object] [Transition filename] [Transition number: 0~8] [Error in dialog]"; TCHAR *message = _T("NeLLigoCheckZoneWithTransition [Object] [Transition filename] [Transition number: 0~8] [Error in dialog]");
type_check(arg_list[0], MAXNode, message); type_check(arg_list[0], MAXNode, message);
type_check(arg_list[1], String, message); type_check(arg_list[1], String, message);
type_check(arg_list[2], Integer, message); type_check(arg_list[2], Integer, message);
@ -987,7 +987,7 @@ Value* export_zone_cf (Value** arg_list, int count)
check_arg_count(check_zone_with_template, 5, count); check_arg_count(check_zone_with_template, 5, count);
// Check to see if the arguments match up to what we expect // Check to see if the arguments match up to what we expect
char *message = "NeLLigoExportZone [Object] [Ligozone filename] [Category Array] [Error in dialog] [Snapshot]"; TCHAR *message = _T("NeLLigoExportZone [Object] [Ligozone filename] [Category Array] [Error in dialog] [Snapshot]");
type_check(arg_list[0], MAXNode, message); type_check(arg_list[0], MAXNode, message);
type_check(arg_list[1], String, message); type_check(arg_list[1], String, message);
type_check(arg_list[2], Array, message); type_check(arg_list[2], Array, message);
@ -1362,7 +1362,7 @@ Value* get_error_string_cf (Value** arg_list, int count)
check_arg_count(get_error_string, 1, count); check_arg_count(get_error_string, 1, count);
// Checks arg // Checks arg
char *message = "NeLLigoGetErrorString [error code]"; TCHAR *message = _T("NeLLigoGetErrorString [error code]");
type_check(arg_list[0], Integer, message); type_check(arg_list[0], Integer, message);
// The first arg // The first arg
@ -1380,7 +1380,7 @@ Value* set_directory_cf (Value** arg_list, int count)
check_arg_count(set_directory, 1, count); check_arg_count(set_directory, 1, count);
// Checks arg // Checks arg
char *message = "NeLLigoDirectory [path]"; TCHAR *message = _T("NeLLigoDirectory [path]");
type_check(arg_list[0], String, message); type_check(arg_list[0], String, message);
// The first arg // The first arg
@ -1398,7 +1398,7 @@ Value* get_zone_mask_cf (Value** arg_list, int count)
check_arg_count(check_zone_with_template, 5, count); check_arg_count(check_zone_with_template, 5, count);
// Check to see if the arguments match up to what we expect // Check to see if the arguments match up to what we expect
char *message = "NeLLigoGetZoneMask [Object] [Mask Array] [Width Array] [Height Array] [Error in dialog]"; TCHAR *message = _T("NeLLigoGetZoneMask [Object] [Mask Array] [Width Array] [Height Array] [Error in dialog]");
type_check(arg_list[0], MAXNode, message); type_check(arg_list[0], MAXNode, message);
type_check(arg_list[1], Array, message); type_check(arg_list[1], Array, message);
type_check(arg_list[2], Array, message); type_check(arg_list[2], Array, message);
@ -1558,7 +1558,7 @@ Value* get_zone_size_cf (Value** arg_list, int count)
check_arg_count(check_zone_with_template, 6, count); check_arg_count(check_zone_with_template, 6, count);
// Check to see if the arguments match up to what we expect // Check to see if the arguments match up to what we expect
char *message = "NeLLigoGetZoneMask [Object] [minx Array] [maxy Array] [miny Array] [maxy Array] [Error in dialog]"; TCHAR *message = _T("NeLLigoGetZoneMask [Object] [minx Array] [maxy Array] [miny Array] [maxy Array] [Error in dialog]");
type_check(arg_list[0], MAXNode, message); type_check(arg_list[0], MAXNode, message);
type_check(arg_list[1], Array, message); type_check(arg_list[1], Array, message);
type_check(arg_list[2], Array, message); type_check(arg_list[2], Array, message);
@ -1859,7 +1859,7 @@ Value* make_snapshot_cf (Value** arg_list, int count)
check_arg_count(NeLLigoMakeSnapShot, 7, count); check_arg_count(NeLLigoMakeSnapShot, 7, count);
// Check to see if the arguments match up to what we expect // Check to see if the arguments match up to what we expect
char *message = "NeLLigoMakeSnapShot [Object] [Snapshot filename] [xMin] [xMax] [yMin] [yMax] [Error in dialog]"; TCHAR *message = _T("NeLLigoMakeSnapShot [Object] [Snapshot filename] [xMin] [xMax] [yMin] [yMax] [Error in dialog]");
type_check(arg_list[0], MAXNode, message); type_check(arg_list[0], MAXNode, message);
type_check(arg_list[1], String, message); type_check(arg_list[1], String, message);
type_check(arg_list[2], Integer, message); type_check(arg_list[2], Integer, message);

@ -81,12 +81,12 @@ void CAnimationSetDlg::OnAddAnimation ()
if (instance != 0xffffffff) if (instance != 0xffffffff)
{ {
// Create a dialog // Create a dialog
static char BASED_CODE szFilter[] = static TCHAR BASED_CODE szFilter[] =
"NeL Animation Files (*.anim)\0*.anim\0" _T("NeL Animation Files (*.anim)\0*.anim\0")
"All Files (*.*)\0*.*\0\0"; _T("All Files (*.*)\0*.*\0\0");
// Filename buffer // Filename buffer
char buffer[65535]; TCHAR buffer[65535];
buffer[0]=0; buffer[0]=0;
OPENFILENAME openFile; OPENFILENAME openFile;
@ -98,7 +98,7 @@ void CAnimationSetDlg::OnAddAnimation ()
openFile.lpstrFile = buffer; openFile.lpstrFile = buffer;
openFile.nMaxFile = 65535; openFile.nMaxFile = 65535;
openFile.Flags = OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT|OFN_ALLOWMULTISELECT|OFN_ENABLESIZING|OFN_EXPLORER; openFile.Flags = OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT|OFN_ALLOWMULTISELECT|OFN_ENABLESIZING|OFN_EXPLORER;
openFile.lpstrDefExt = "*.anim"; openFile.lpstrDefExt = _T("*.anim");
if (GetOpenFileName(&openFile)) if (GetOpenFileName(&openFile))
@ -107,7 +107,7 @@ void CAnimationSetDlg::OnAddAnimation ()
try try
{ {
// Filename pointer // Filename pointer
char *c=buffer; TCHAR *c=buffer;
// Read the path // Read the path
CString path = buffer; CString path = buffer;

@ -77,24 +77,24 @@ public:
/** validate a value against upper bound. (if an upper bound was set /** validate a value against upper bound. (if an upper bound was set
* \return NULL if ok or an error message * \return NULL if ok or an error message
*/ */
const char *validateUpperBound(T v) const TCHAR *validateUpperBound(T v)
{ {
if (!_UpperBoundEnabled) return NULL; if (!_UpperBoundEnabled) return NULL;
if (_UpperBoundExcluded && v < _UpperBound) return NULL; if (_UpperBoundExcluded && v < _UpperBound) return NULL;
if (!_UpperBoundExcluded && v <= _UpperBound) return NULL; if (!_UpperBoundExcluded && v <= _UpperBound) return NULL;
return "value too high"; return _T("value too high");
} }
/** validate a value against lower bound. (if an lower bound was set /** validate a value against lower bound. (if an lower bound was set
* \return NULL if ok or an error message * \return NULL if ok or an error message
*/ */
const char *validateLowerBound(T v) const TCHAR *validateLowerBound(T v)
{ {
if (!_LowerBoundEnabled) return NULL; if (!_LowerBoundEnabled) return NULL;
if (_LowerBoundExcluded && v > _LowerBound) return NULL; if (_LowerBoundExcluded && v > _LowerBound) return NULL;
if (!_LowerBoundExcluded && v >= _LowerBound) return NULL; if (!_LowerBoundExcluded && v >= _LowerBound) return NULL;
return "value too low"; return _T("value too low");
} }
/// copy this bound checker object to another one /// copy this bound checker object to another one

@ -22,11 +22,11 @@
// CChooseName dialog // CChooseName dialog
CChooseName::CChooseName(const char *initialName, CWnd* pParent /*=NULL*/) CChooseName::CChooseName(const TCHAR *initialName, CWnd* pParent /*=NULL*/)
: CDialog(CChooseName::IDD, pParent) : CDialog(CChooseName::IDD, pParent)
{ {
//{{AFX_DATA_INIT(CChooseName) //{{AFX_DATA_INIT(CChooseName)
m_Name = _T(initialName); m_Name = initialName;
//}}AFX_DATA_INIT //}}AFX_DATA_INIT
} }

@ -32,7 +32,7 @@ class CChooseName : public CDialog
{ {
// Construction // Construction
public: public:
CChooseName(const char *initialName, CWnd* pParent = NULL); // standard constructor CChooseName(const TCHAR *initialName, CWnd* pParent = NULL); // standard constructor
std::string getName(); std::string getName();

@ -60,7 +60,7 @@ void CChoosePoolID::OnOK()
} }
else else
{ {
MessageBox("Invalid value", "error", MB_OK); MessageBox(_T("Invalid value"), _T("error"), MB_OK);
} }
} }

@ -133,7 +133,7 @@ public:
// SPECIALIZE THAT. write value into the given CString // SPECIALIZE THAT. write value into the given CString
static void value2CString(T value, CString &dest); static void value2CString(T value, CString &dest);
// SPECIALIZE THAT. convert a CString into a value, return NULL if ok, or a pointer to an error message // SPECIALIZE THAT. convert a CString into a value, return NULL if ok, or a pointer to an error message
static const char *string2value(const CString &value, T &result); static const TCHAR *string2value(const CString &value, T &result);
@ -162,14 +162,13 @@ protected:
void updateValueFromText(void) void updateValueFromText(void)
{ {
T value; T value;
const char *message = string2value(m_Value, value); const TCHAR *message = string2value(m_Value, value);
if (!message) if (!message)
{ {
const char *mess = validateUpperBound(value) const TCHAR *mess = validateUpperBound(value), *mess2 = validateLowerBound(value);
,*mess2 = validateLowerBound(value);
if (mess || mess2) if (mess || mess2)
{ {
MessageBox(mess ? mess : mess2, "error"); MessageBox(mess ? mess : mess2, _T("error"));
return; return;
} }
@ -179,7 +178,7 @@ protected:
return; return;
} }
MessageBox(message, "error"); MessageBox(message, _T("error"));
} }
void selectRange(void) void selectRange(void)
@ -249,24 +248,23 @@ protected:
{ {
T upT, loT; T upT, loT;
const char *message = string2value(lo, loT); const TCHAR *message = string2value(lo, loT);
if (message) if (message)
{ {
::MessageBox(NULL, message, "Range selection error", MB_OK); ::MessageBox(NULL, message, _T("Range selection error"), MB_OK);
return false; return false;
} }
const char *mess = validateUpperBound(loT) const TCHAR *mess = validateUpperBound(loT), *mess2 = validateLowerBound(loT);
,*mess2 = validateLowerBound(loT);
if (mess || mess2) if (mess || mess2)
{ {
MessageBox(mess ? mess : mess2, "error"); MessageBox(mess ? mess : mess2, _T("error"));
return false; return false;
} }
message = string2value(up, upT); message = string2value(up, upT);
if (message) if (message)
{ {
::MessageBox(NULL, message, "Range selection error", MB_OK); ::MessageBox(NULL, message, _T("Range selection error"), MB_OK);
return false; return false;
} }
@ -274,14 +272,14 @@ protected:
mess2 = validateLowerBound(upT); mess2 = validateLowerBound(upT);
if (mess || mess2) if (mess || mess2)
{ {
MessageBox(mess ? mess : mess2, "error"); MessageBox(mess ? mess : mess2, _T("error"));
return false; return false;
} }
if (upT <= loT) if (upT <= loT)
{ {
::MessageBox(NULL, "upper bound must be strictly greater than lower bound", "Range selection error", MB_OK); ::MessageBox(NULL, _T("upper bound must be strictly greater than lower bound"), _T("Range selection error"), MB_OK);
return false; return false;
} }
@ -314,10 +312,10 @@ CEditableRangeT<float>::CEditableRangeT(const std::string &id, CParticleWorkspac
inline void CEditableRangeT<float>::value2CString(float value, CString &dest) inline void CEditableRangeT<float>::value2CString(float value, CString &dest)
{ {
dest.Format("%g", (double) value); dest.Format(_T("%g"), (double) value);
} }
inline const char *CEditableRangeT<float>::string2value(const CString &value, float &result) inline const TCHAR *CEditableRangeT<float>::string2value(const CString &value, float &result)
{ {
if (sscanf((LPCTSTR) value, "%f", &result) == 1) if (sscanf((LPCTSTR) value, "%f", &result) == 1)
{ {
@ -325,7 +323,7 @@ inline const char *CEditableRangeT<float>::string2value(const CString &value, fl
} }
else else
{ {
return "invalid value"; return _T("invalid value");
} }
} }
@ -340,17 +338,17 @@ CEditableRangeT<uint32>::CEditableRangeT(const std::string &id, CParticleWorkspa
inline void CEditableRangeT<uint32>::value2CString(uint32 value, CString &dest) inline void CEditableRangeT<uint32>::value2CString(uint32 value, CString &dest)
{ {
dest.Format("%d", value); dest.Format(_T("%d"), value);
} }
inline const char *CEditableRangeT<uint32>::string2value(const CString &value, uint32 &result) inline const TCHAR *CEditableRangeT<uint32>::string2value(const CString &value, uint32 &result)
{ {
uint32 tmp; uint32 tmp;
if (sscanf((LPCTSTR) value, "%d", &tmp) == 1) if (sscanf((LPCTSTR) value, "%d", &tmp) == 1)
{ {
if (strchr((LPCTSTR) value, '-')) if (strchr((LPCTSTR) value, '-'))
{ {
return "negative values not allowed"; return _T("negative values not allowed");
} }
else else
{ {
@ -360,7 +358,7 @@ inline const char *CEditableRangeT<uint32>::string2value(const CString &value, u
} }
else else
{ {
return "invalid value"; return _T("invalid value");
} }
} }
@ -376,10 +374,10 @@ CEditableRangeT<sint32>::CEditableRangeT(const std::string &id, CParticleWorkspa
inline void CEditableRangeT<sint32>::value2CString(sint32 value, CString &dest) inline void CEditableRangeT<sint32>::value2CString(sint32 value, CString &dest)
{ {
dest.Format("%d", value); dest.Format(_T("%d"), value);
} }
inline const char *CEditableRangeT<sint32>::string2value(const CString &value, sint32 &result) inline const TCHAR *CEditableRangeT<sint32>::string2value(const CString &value, sint32 &result)
{ {
uint32 tmp; uint32 tmp;
if (sscanf((LPCTSTR) value, "%d", &tmp) == 1) if (sscanf((LPCTSTR) value, "%d", &tmp) == 1)
@ -389,7 +387,7 @@ inline const char *CEditableRangeT<sint32>::string2value(const CString &value, s
} }
else else
{ {
return "invalid value"; return _T("invalid value");
} }
} }

@ -833,7 +833,7 @@ void CSkeletonScaleDlg::OnSsdButtonSave()
} }
else else
{ {
MessageBox("Failed to open file for write!"); MessageBox(_T("Failed to open file for write!"));
} }
} }
@ -866,7 +866,7 @@ void CSkeletonScaleDlg::OnSsdButtonSaveas()
} }
else else
{ {
MessageBox("Failed to open file for write!"); MessageBox(_T("Failed to open file for write!"));
} }
} }
} }
@ -907,7 +907,7 @@ bool CSkeletonScaleDlg::saveCurrentInStream(NLMISC::IStream &f)
} }
catch(NLMISC::EStream &) catch(NLMISC::EStream &)
{ {
MessageBox("Failed to save file!"); MessageBox(_T("Failed to save file!"));
return false; return false;
} }

@ -42,7 +42,7 @@
#define NEL_OV_SNAPSHOT_TOOL_REGKEY "Software\\Nevrax\\nel\\object_viewer\\snapshot_dlg" #define NEL_OV_SNAPSHOT_TOOL_REGKEY _T("Software\\Nevrax\\nel\\object_viewer\\snapshot_dlg")
using namespace NLMISC; using namespace NLMISC;

@ -223,7 +223,7 @@ void CVegetableDensityPage::updateViewAngleMax()
void CVegetableDensityPage::updateAngleMinFromEditText() void CVegetableDensityPage::updateAngleMinFromEditText()
{ {
// get angles edited. // get angles edited.
char stmp[256]; TCHAR stmp[256];
AngleMinEdit.GetWindowText(stmp, 256); AngleMinEdit.GetWindowText(stmp, 256);
float angleMin; float angleMin;
NLMISC::fromString(stmp, angleMin); NLMISC::fromString(stmp, angleMin);
@ -247,7 +247,7 @@ void CVegetableDensityPage::updateAngleMinFromEditText()
void CVegetableDensityPage::updateAngleMaxFromEditText() void CVegetableDensityPage::updateAngleMaxFromEditText()
{ {
// get angles edited. // get angles edited.
char stmp[256]; TCHAR stmp[256];
AngleMaxEdit.GetWindowText(stmp, 256); AngleMaxEdit.GetWindowText(stmp, 256);
float angleMax; float angleMax;
NLMISC::fromString(stmp, angleMax); NLMISC::fromString(stmp, angleMax);
@ -320,7 +320,7 @@ BOOL CVegetableDensityPage::OnInitDialog()
// Init ShapeName // Init ShapeName
StaticVegetableShape.SetWindowText(""); StaticVegetableShape.SetWindowText(_T(""));
return TRUE; // return TRUE unless you set the focus to a control return TRUE; // return TRUE unless you set the focus to a control
@ -477,12 +477,12 @@ static void concatEdit2Lines(CEdit &edit)
const uint lineLen= 1000; const uint lineLen= 1000;
uint n; uint n;
// retrieve the 2 lines. // retrieve the 2 lines.
char tmp0[2*lineLen]; TCHAR tmp0[2*lineLen];
char tmp1[lineLen]; TCHAR tmp1[lineLen];
n= edit.GetLine(0, tmp0, lineLen); tmp0[n]= 0; n= edit.GetLine(0, tmp0, lineLen); tmp0[n]= 0;
n= edit.GetLine(1, tmp1, lineLen); tmp1[n]= 0; n= edit.GetLine(1, tmp1, lineLen); tmp1[n]= 0;
// concat and update the CEdit. // concat and update the CEdit.
edit.SetWindowText(strcat(tmp0, tmp1)); edit.SetWindowText(_tcscat(tmp0, tmp1));
} }
void CVegetableDensityPage::OnChangeEditAngleMin() void CVegetableDensityPage::OnChangeEditAngleMin()
@ -515,8 +515,9 @@ void CVegetableDensityPage::OnChangeEditAngleMax()
// *************************************************************************** // ***************************************************************************
void CVegetableDensityPage::OnButtonVegetableBrowse() void CVegetableDensityPage::OnButtonVegetableBrowse()
{ {
CFileDialog fd(TRUE, "veget", "*.veget", 0, NULL, this) ; CFileDialog fd(TRUE, _T("veget"), _T("*.veget"), 0, NULL, this) ;
fd.m_ofn.lpstrTitle= "Open Vegetable Shape"; fd.m_ofn.lpstrTitle = _T("Open Vegetable Shape");
if (fd.DoModal() == IDOK) if (fd.DoModal() == IDOK)
{ {
// Add to the path // Add to the path

@ -336,13 +336,13 @@ void CVegetableDlg::clearVegetables()
// *************************************************************************** // ***************************************************************************
bool CVegetableDlg::loadVegetableSet(NL3D::CTileVegetableDesc &vegetSet, const char *title) bool CVegetableDlg::loadVegetableSet(NL3D::CTileVegetableDesc &vegetSet, const TCHAR *title)
{ {
vegetSet.clear(); vegetSet.clear();
bool ok= false; bool ok= false;
CFileDialog fd(TRUE, ".vegetset", "*.vegetset", 0, NULL, this) ; CFileDialog fd(TRUE, _T(".vegetset"), _T("*.vegetset"), 0, NULL, this) ;
fd.m_ofn.lpstrTitle= title; fd.m_ofn.lpstrTitle = title;
if (fd.DoModal() == IDOK) if (fd.DoModal() == IDOK)
{ {
NLMISC::CIFile f; NLMISC::CIFile f;
@ -361,13 +361,13 @@ bool CVegetableDlg::loadVegetableSet(NL3D::CTileVegetableDesc &vegetSet, const
catch(NLMISC::EStream &) catch(NLMISC::EStream &)
{ {
ok= false; ok= false;
MessageBox("Failed to load file!"); MessageBox(_T("Failed to load file!"));
} }
} }
else else
{ {
ok= false; ok= false;
MessageBox("Failed to open file!"); MessageBox(_T("Failed to open file!"));
} }
} }
@ -540,7 +540,7 @@ void CVegetableDlg::OnButtonVegetableClear()
if(_Vegetables.size()==0) if(_Vegetables.size()==0)
return; return;
if( MessageBox("Clear all the list?", "Clear List", MB_OKCANCEL | MB_ICONWARNING | MB_APPLMODAL)==IDOK ) if( MessageBox(_T("Clear all the list?"), _T("Clear List"), MB_OKCANCEL | MB_ICONWARNING | MB_APPLMODAL)==IDOK )
{ {
clearVegetables(); clearVegetables();
@ -605,8 +605,8 @@ void CVegetableDlg::OnButtonVegetableRemove()
// *************************************************************************** // ***************************************************************************
void CVegetableDlg::OnButtonVegetableLoadDesc() void CVegetableDlg::OnButtonVegetableLoadDesc()
{ {
CFileDialog fd(TRUE, ".vegetdesc", "*.vegetdesc", 0, NULL, this) ; CFileDialog fd(TRUE, _T(".vegetdesc"), _T("*.vegetdesc"), 0, NULL, this) ;
fd.m_ofn.lpstrTitle= "Open Vegetable Descriptor"; fd.m_ofn.lpstrTitle = _T("Open Vegetable Descriptor");
if (fd.DoModal() == IDOK) if (fd.DoModal() == IDOK)
{ {
NLMISC::CIFile f; NLMISC::CIFile f;
@ -631,12 +631,12 @@ void CVegetableDlg::OnButtonVegetableLoadDesc()
} }
catch(NLMISC::EStream &) catch(NLMISC::EStream &)
{ {
MessageBox("Failed to load file!"); MessageBox(_T("Failed to load file!"));
} }
} }
else else
{ {
MessageBox("Failed to open file!"); MessageBox(_T("Failed to open file!"));
} }
} }
@ -666,12 +666,12 @@ void CVegetableDlg::OnButtonVegetableSaveDesc()
} }
catch(NLMISC::EStream &) catch(NLMISC::EStream &)
{ {
MessageBox("Failed to save file!"); MessageBox(_T("Failed to save file!"));
} }
} }
else else
{ {
MessageBox("Failed to open file for write!"); MessageBox(_T("Failed to open file for write!"));
} }
} }
} }
@ -684,7 +684,7 @@ void CVegetableDlg::OnButtonVegetableLoadSet()
{ {
NL3D::CTileVegetableDesc vegetSet; NL3D::CTileVegetableDesc vegetSet;
// if succes to load the vegetSet // if succes to load the vegetSet
if(loadVegetableSet(vegetSet, "Load Vegetable Set")) if(loadVegetableSet(vegetSet, _T("Load Vegetable Set")))
{ {
// Delete all vegetables. // Delete all vegetables.
clearVegetables(); clearVegetables();
@ -702,7 +702,7 @@ void CVegetableDlg::OnButtonVegetableAppendSet()
{ {
NL3D::CTileVegetableDesc vegetSet; NL3D::CTileVegetableDesc vegetSet;
// if succes to load the vegetSet // if succes to load the vegetSet
if(loadVegetableSet(vegetSet, "Append Vegetable Set")) if(loadVegetableSet(vegetSet, _T("Append Vegetable Set")))
{ {
// Do not Delete any vegetables. // Do not Delete any vegetables.
// build them from list. // build them from list.
@ -737,12 +737,12 @@ void CVegetableDlg::OnButtonVegetableSaveSet()
} }
catch(NLMISC::EStream &) catch(NLMISC::EStream &)
{ {
MessageBox("Failed to save file!"); MessageBox(_T("Failed to save file!"));
} }
} }
else else
{ {
MessageBox("Failed to open file for write!"); MessageBox(_T("Failed to open file for write!"));
} }
} }

@ -144,7 +144,7 @@ protected:
// clear all vegetables. // clear all vegetables.
void clearVegetables(); void clearVegetables();
// load a vegetSet with a FileDialog // load a vegetSet with a FileDialog
bool loadVegetableSet(NL3D::CTileVegetableDesc &vegetSet, const char *title); bool loadVegetableSet(NL3D::CTileVegetableDesc &vegetSet, const TCHAR *title);
/** build the vegetSet from the current _Vegetables /** build the vegetSet from the current _Vegetables
* NB: transform Rotate Angle in Radians. * NB: transform Rotate Angle in Radians.
* \param keepDefaultShapeName if true, then vegetables with a ShapeName=="" are kept. * \param keepDefaultShapeName if true, then vegetables with a ShapeName=="" are kept.

@ -216,8 +216,7 @@ void CVegetableListBox::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct)
dc.SetTextColor(::GetSysColor(COLOR_GRAYTEXT) ); dc.SetTextColor(::GetSysColor(COLOR_GRAYTEXT) );
} }
dc.DrawText( dc.DrawText(str,
(const char*)str,
str.GetLength(), str.GetLength(),
&lpDrawItemStruct->rcItem, &lpDrawItemStruct->rcItem,
DT_LEFT|DT_SINGLELINE|DT_VCENTER); DT_LEFT|DT_SINGLELINE|DT_VCENTER);

@ -134,7 +134,7 @@ void CVegetableListColor::clear()
void CVegetableListColor::addValue(CRGBA color) void CVegetableListColor::addValue(CRGBA color)
{ {
// Append a dummy string to the list box. // Append a dummy string to the list box.
AddString(" "); AddString(_T(" "));
// append a color to the array. // append a color to the array.
_Colors.push_back(color); _Colors.push_back(color);
@ -149,7 +149,7 @@ void CVegetableListColor::insertValueBeforeCurSel(CRGBA color)
else else
{ {
// insert a dummy string to the list box. // insert a dummy string to the list box.
InsertString(id, " "); InsertString(id, _T(" "));
// insert a color to the array. // insert a color to the array.
_Colors.insert(_Colors.begin()+id, color); _Colors.insert(_Colors.begin()+id, color);

@ -203,7 +203,7 @@ void CVegetableNoiseValueDlg::OnReleasedcaptureSliderVegetableScaleNoise(NMHDR*
// And reset // And reset
SliderNoiseValue.SetPos(NL_VEGETABLE_EDIT_SLIDER_NVS_SIZE/2); SliderNoiseValue.SetPos(NL_VEGETABLE_EDIT_SLIDER_NVS_SIZE/2);
_EnteringScalerSlider= false; _EnteringScalerSlider= false;
StaticScaleMarker.SetWindowText("100%"); StaticScaleMarker.SetWindowText(_T("100%"));
// Must update display. // Must update display.
_VegetableRefresh->refreshVegetableDisplay(); _VegetableRefresh->refreshVegetableDisplay();

@ -304,7 +304,7 @@ void CWaterPoolEditor::OnAddPool()
{ {
if (_Wpm->hasPool(cpi.PoolID) ) if (_Wpm->hasPool(cpi.PoolID) )
{ {
MessageBox("Pool already exists", "error"); MessageBox(_T("Pool already exists"), _T("error"));
} }
else else
{ {
@ -324,7 +324,7 @@ void CWaterPoolEditor::OnDeletePool()
UpdateData(); UpdateData();
if (m_PoolList.GetCount() == 1) if (m_PoolList.GetCount() == 1)
{ {
MessageBox("Must have at least one water pool", "error"); MessageBox(_T("Must have at least one water pool"), _T("error"));
} }
else else
{ {
@ -350,8 +350,8 @@ void CWaterPoolEditor::OnSelchangeMapSize()
void CWaterPoolEditor::OnLoadPool() void CWaterPoolEditor::OnLoadPool()
{ {
static char BASED_CODE szFilter[] = "NeL Water Pool Files (*.wpf)|*.wpf||"; static TCHAR BASED_CODE szFilter[] = _T("NeL Water Pool Files (*.wpf)|*.wpf||");
CFileDialog fileDlg( TRUE, ".wpf", "*.wpf", OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT, szFilter); CFileDialog fileDlg( TRUE, _T(".wpf"), _T("*.wpf"), OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT, szFilter);
if (fileDlg.DoModal()==IDOK) if (fileDlg.DoModal()==IDOK)
{ {
try try
@ -388,8 +388,8 @@ void CWaterPoolEditor::OnLoadPool()
void CWaterPoolEditor::OnSavePool() void CWaterPoolEditor::OnSavePool()
{ {
static char BASED_CODE szFilter[] = "NeL Water Pool Files (*.wpf)|*.wpf||"; static TCHAR BASED_CODE szFilter[] = _T("NeL Water Pool Files (*.wpf)|*.wpf||");
CFileDialog fileDlg( TRUE, ".wpf", "*.wpf", OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT, szFilter); CFileDialog fileDlg( TRUE, _T(".wpf"), _T("*.wpf"), OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT, szFilter);
if (fileDlg.DoModal()==IDOK) if (fileDlg.DoModal()==IDOK)
{ {
try try

@ -36,15 +36,15 @@ bool CNelExport::exportMesh (const char *sPath, INode& node, TimeValue time)
{ {
// Result to return // Result to return
bool bRet = false; bool bRet = false;
char tempFileName[MAX_PATH] = { 0 }; TCHAR tempFileName[MAX_PATH] = { 0 };
char tempPathBuffer[MAX_PATH] = { 0 }; TCHAR tempPathBuffer[MAX_PATH] = { 0 };
try try
{ {
DWORD dwRetVal = GetTempPathA(MAX_PATH, tempPathBuffer); DWORD dwRetVal = GetTempPath(MAX_PATH, tempPathBuffer);
if (dwRetVal > MAX_PATH || (dwRetVal == 0)) if (dwRetVal > MAX_PATH || (dwRetVal == 0))
nlerror("GetTempPath failed"); nlerror("GetTempPath failed");
UINT uRetVal = GetTempFileNameA(tempPathBuffer, TEXT("_nel_export_mesh_"), 0, tempFileName); UINT uRetVal = GetTempFileName(tempPathBuffer, _T("_nel_export_mesh_"), 0, tempFileName);
if (uRetVal == 0) if (uRetVal == 0)
nlerror("GetTempFileName failed"); nlerror("GetTempFileName failed");

@ -2332,11 +2332,11 @@ INT_PTR CALLBACK MiscDialogCallback (
break; break;
case IDOK: case IDOK:
{ {
currentParam->FloatingObject=SendMessage (GetDlgItem (hwndDlg, IDC_FLOATING_OBJECT), BM_GETCHECK, 0, 0); currentParam->FloatingObject = SendMessage (GetDlgItem (hwndDlg, IDC_FLOATING_OBJECT), BM_GETCHECK, 0, 0);
// Ligoscape // Ligoscape
currentParam->LigoSymmetry = SendMessage (GetDlgItem (hwndDlg, IDC_LIGO_SYMMETRY), BM_GETCHECK, 0, 0); currentParam->LigoSymmetry = SendMessage (GetDlgItem (hwndDlg, IDC_LIGO_SYMMETRY), BM_GETCHECK, 0, 0);
char tmp[512]; TCHAR tmp[512];
GetWindowText (GetDlgItem (hwndDlg, IDC_LIGO_ROTATE), tmp, 512); GetWindowText (GetDlgItem (hwndDlg, IDC_LIGO_ROTATE), tmp, 512);
currentParam->LigoRotate = tmp; currentParam->LigoRotate = tmp;
@ -2365,7 +2365,7 @@ INT_PTR CALLBACK MiscDialogCallback (
// Skeleton Scale // Skeleton Scale
currentParam->ExportBoneScale= SendMessage( GetDlgItem(hwndDlg, IDC_EXPORT_BONE_SCALE), BM_GETCHECK, 0, 0); currentParam->ExportBoneScale= SendMessage( GetDlgItem(hwndDlg, IDC_EXPORT_BONE_SCALE), BM_GETCHECK, 0, 0);
GetWindowText (GetDlgItem (hwndDlg, IDC_EXPORT_BONE_SCALE_NAME_EXT), tmp, 512); GetWindowText (GetDlgItem (hwndDlg, IDC_EXPORT_BONE_SCALE_NAME_EXT), tmp, 512);
currentParam->ExportBoneScaleNameExt= tmp; currentParam->ExportBoneScaleNameExt = wideToUtf8(tmp);
// remanence // remanence
currentParam->UseRemanence = SendMessage (GetDlgItem (hwndDlg, IDC_USE_REMANENCE), BM_GETCHECK, 0, 0); currentParam->UseRemanence = SendMessage (GetDlgItem (hwndDlg, IDC_USE_REMANENCE), BM_GETCHECK, 0, 0);

@ -1761,7 +1761,7 @@ ITrack* CExportNel::buildATrack (CAnimation& animation, Control& c, TNelValueTyp
} }
else else
{ {
MessageBox (NULL, "Warning: no pos track exported!", "Tmp NEL", MB_OK|MB_ICONEXCLAMATION); MessageBox (NULL, _T("Warning: no pos track exported!"), _T("Tmp NEL"), MB_OK|MB_ICONEXCLAMATION);
} }
} }
} }

@ -45,7 +45,7 @@ class RPOClassDesc:public ClassDesc
} }
const TCHAR * ClassName() const TCHAR * ClassName()
{ {
return "RklPatch"; return _T("RklPatch");
} }
SClass_ID SuperClassID() SClass_ID SuperClassID()
{ {
@ -57,7 +57,7 @@ class RPOClassDesc:public ClassDesc
} }
const TCHAR* Category() const TCHAR* Category()
{ {
return "Rykol Tools"; return _T("Rykol Tools");
} }
}; };
@ -381,7 +381,7 @@ void RPO::GetCollapseTypes(Tab<Class_ID> &clist,Tab<TSTR*> &nlist)
//TODO: Append any any other collapse type the plugin supports //TODO: Append any any other collapse type the plugin supports
Class_ID id = RYKOLPATCHOBJ_CLASS_ID; Class_ID id = RYKOLPATCHOBJ_CLASS_ID;
TSTR *name = new TSTR("Rykol Patch Mesh"); TSTR *name = new TSTR(_T("Rykol Patch Mesh"));
clist.Append(1,&id); clist.Append(1,&id);
nlist.Append(1,&name); nlist.Append(1,&name);
} }

@ -202,7 +202,7 @@ bool RPatchMesh::exportZone(INode* pNode, PatchMesh* pPM, NL3D::CZone& zone, CZo
if (loaded == false) if (loaded == false)
{ {
nlwarning ("Can't load any tile bank. Select on with the tile_utility plug-in"); nlwarning ("Can't load any tile bank. Select on with the tile_utility plug-in");
mprintf ("Can't load any tile bank. Select on with the tile_utility plug-in"); mprintf (_T("Can't load any tile bank. Select on with the tile_utility plug-in"));
return false; return false;
} }
} }
@ -422,7 +422,7 @@ bool RPatchMesh::exportZone(INode* pNode, PatchMesh* pPM, NL3D::CZone& zone, CZo
icv=getCommonVertex(pPM,idstpatch,isrcpatch); icv=getCommonVertex(pPM,idstpatch,isrcpatch);
if (icv==-1) if (icv==-1)
{ {
mprintf ("Invalid bind"); mprintf (_T("Invalid bind"));
nlwarning ("Invalid bind"); nlwarning ("Invalid bind");
return false; return false;
} }
@ -439,7 +439,7 @@ bool RPatchMesh::exportZone(INode* pNode, PatchMesh* pPM, NL3D::CZone& zone, CZo
icv=getCommonVertex(pPM,idstpatch,isrcpatch); icv=getCommonVertex(pPM,idstpatch,isrcpatch);
if (icv==-1) if (icv==-1)
{ {
mprintf ("Invalid bind"); mprintf (_T("Invalid bind"));
nlwarning ("Invalid bind"); nlwarning ("Invalid bind");
return false; return false;
} }
@ -451,7 +451,7 @@ bool RPatchMesh::exportZone(INode* pNode, PatchMesh* pPM, NL3D::CZone& zone, CZo
isrcedge=getEdge(pPM,srcpatch,srcpatch->v[nv],icv); isrcedge=getEdge(pPM,srcpatch,srcpatch->v[nv],icv);
if (isrcedge==-1) if (isrcedge==-1)
{ {
mprintf ("Invalid edge"); mprintf (_T("Invalid edge"));
nlwarning ("Invalid bind"); nlwarning ("Invalid bind");
return false; return false;
} }
@ -595,7 +595,7 @@ bool RPatchMesh::exportZone(INode* pNode, PatchMesh* pPM, NL3D::CZone& zone, CZo
sym.invert (); sym.invert ();
if (!CPatchInfo::transform (patchinfo, zoneSymmetry, bank, symmetry, rotate, snapCell, weldThreshold, sym)) if (!CPatchInfo::transform (patchinfo, zoneSymmetry, bank, symmetry, rotate, snapCell, weldThreshold, sym))
{ {
mprintf ("Can't transform the zone"); mprintf (_T("Can't transform the zone"));
nlwarning ("Invalid bind"); nlwarning ("Invalid bind");
return false; return false;
} }

Loading…
Cancel
Save