Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Unicode MFC use

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-12-18 14:42:04 +01:00
parent a0b4bb2397
commit c458084b59
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
code/nel/tools/logic/logic_editor_dll/logic_editorDoc.cpp
View file

@ -488,7 +488,7 @@ BOOL CLogic_editorDoc::OnSaveDocument( LPCTSTR fileName )
{ {
variable = m_variables.GetNext( pos ); variable = m_variables.GetNext( pos );
CLogicVariable logicVariable; CLogicVariable logicVariable;
logicVariable.setName( string((LPCSTR)variable) ); logicVariable.setName(tStrToUtf8(variable));
logicStateMachine.addVariable( logicVariable ); logicStateMachine.addVariable( logicVariable );
} }
@ -502,7 +502,7 @@ BOOL CLogic_editorDoc::OnSaveDocument( LPCTSTR fileName )
CLogicCounter logicCounter; CLogicCounter logicCounter;
cCounterToCLogicCounter( *pCounter, logicCounter ); cCounterToCLogicCounter( *pCounter, logicCounter );
// set the logic counter name // set the logic counter name
logicCounter.setName( (LPCSTR)eltName ); logicCounter.setName(tStrToUtf8(eltName));
// add the logic counter // add the logic counter
logicStateMachine.addCounter( logicCounter ); logicStateMachine.addCounter( logicCounter );
} }
@ -517,7 +517,7 @@ BOOL CLogic_editorDoc::OnSaveDocument( LPCTSTR fileName )
CLogicCondition logicCondition; CLogicCondition logicCondition;
cConditionToCLogicCondition( *pCondition, logicCondition ); cConditionToCLogicCondition( *pCondition, logicCondition );
// set the logic condition name // set the logic condition name
logicCondition.setName( (LPCSTR)eltName ); logicCondition.setName(tStrToUtf8(eltName));
// add the logic condition // add the logic condition
logicStateMachine.addCondition( logicCondition ); logicStateMachine.addCondition( logicCondition );
} }
@ -532,7 +532,7 @@ BOOL CLogic_editorDoc::OnSaveDocument( LPCTSTR fileName )
CLogicState logicState; CLogicState logicState;
cStateToCLogicState( *pState, logicState ); cStateToCLogicState( *pState, logicState );
// set the logic state's name // set the logic state's name
logicState.setName( (LPCSTR)eltName ); logicState.setName(tStrToUtf8(eltName));
// add the logic state // add the logic state
logicStateMachine.addState( logicState ); logicStateMachine.addState( logicState );
} }
@ -542,14 +542,14 @@ BOOL CLogic_editorDoc::OnSaveDocument( LPCTSTR fileName )
if(pos != NULL) if(pos != NULL)
{ {
m_states.GetNextAssoc( pos, eltName, (void*&)pState ); m_states.GetNextAssoc( pos, eltName, (void*&)pState );
logicStateMachine.setCurrentState( string((LPCSTR)eltName) ); logicStateMachine.setCurrentState(tStrToUtf8(eltName));
} }
else else
{ {
logicStateMachine.setCurrentState( string("") ); logicStateMachine.setCurrentState("");
} }
// set the name of the state machine // set the name of the state machine
logicStateMachine.setName( string(fileName) ); logicStateMachine.setName(tStrToUtf8(fileName));
// Check exceptions // Check exceptions
@ -559,7 +559,7 @@ BOOL CLogic_editorDoc::OnSaveDocument( LPCTSTR fileName )
COFile file; COFile file;
// Open the file // Open the file
file.open (fileName); file.open (tStrToUtf8(fileName));
// Create the XML stream // Create the XML stream
COXml output; COXml output;
@ -625,7 +625,7 @@ BOOL CLogic_editorDoc::load( LPCTSTR fileName )
CIFile file; CIFile file;
// Open the file // Open the file
file.open (fileName); file.open (tStrToUtf8(fileName));
// Create the XML stream // Create the XML stream
CIXml xmlfileIn; CIXml xmlfileIn;