mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-30 12:50:53 +00:00
Fixed: Don't truncate 64 bits pointers
--HG-- branch : develop
This commit is contained in:
parent
d62c17986d
commit
e69858491c
3 changed files with 13 additions and 13 deletions
code/nel/tools/3d/plugin_max
|
@ -508,37 +508,37 @@ INT_PTR CALLBACK AccelDialogCallback (
|
|||
{
|
||||
for (uint i=0; _MaterialNames[i] != 0; ++i)
|
||||
{
|
||||
SendMessage (GetDlgItem (hwndDlg, IDC_OCC_MODEL), CB_ADDSTRING, 0, (LONG)(_MaterialNames[i]));
|
||||
SendMessage (GetDlgItem (hwndDlg, IDC_OPEN_OCC_MODEL), CB_ADDSTRING, 0, (LONG)(_MaterialNames[i]));
|
||||
SendMessage (GetDlgItem (hwndDlg, IDC_OCC_MODEL), CB_ADDSTRING, 0, (LPARAM)(_MaterialNames[i]));
|
||||
SendMessage (GetDlgItem (hwndDlg, IDC_OPEN_OCC_MODEL), CB_ADDSTRING, 0, (LPARAM)(_MaterialNames[i]));
|
||||
}
|
||||
}
|
||||
{
|
||||
for (uint i =0; _EnvironmentNames[i] != 0; ++i)
|
||||
{
|
||||
SendMessage (GetDlgItem (hwndDlg, IDC_ENV_FX), CB_ADDSTRING, 0, (LONG)(_EnvironmentNames[i]));
|
||||
SendMessage (GetDlgItem (hwndDlg, IDC_ENV_FX), CB_ADDSTRING, 0, (LPARAM)(_EnvironmentNames[i]));
|
||||
}
|
||||
}
|
||||
{
|
||||
std::set<std::string>::iterator first(_KnownSoundGroups.begin()), last(_KnownSoundGroups.end());
|
||||
for (; first != last; ++first)
|
||||
{
|
||||
SendMessage (GetDlgItem (hwndDlg, IDC_SOUND_GROUP), CB_ADDSTRING, 0, (LONG)(first->c_str()));
|
||||
SendMessage (GetDlgItem (hwndDlg, IDC_SOUND_GROUP), CB_ADDSTRING, 0, (LPARAM)(first->c_str()));
|
||||
}
|
||||
}
|
||||
// set the combo and edit box
|
||||
if (SendMessage (GetDlgItem (hwndDlg, IDC_OCC_MODEL), CB_SELECTSTRING, -1, (LONG)(currentParam->OcclusionModel.c_str())) == CB_ERR)
|
||||
if (SendMessage (GetDlgItem (hwndDlg, IDC_OCC_MODEL), CB_SELECTSTRING, -1, (LPARAM)(currentParam->OcclusionModel.c_str())) == CB_ERR)
|
||||
{
|
||||
// nlassert(false);
|
||||
}
|
||||
if (SendMessage (GetDlgItem (hwndDlg, IDC_OPEN_OCC_MODEL), CB_SELECTSTRING, -1, (LONG)(currentParam->OpenOcclusionModel.c_str())) == CB_ERR)
|
||||
if (SendMessage (GetDlgItem (hwndDlg, IDC_OPEN_OCC_MODEL), CB_SELECTSTRING, -1, (LPARAM)(currentParam->OpenOcclusionModel.c_str())) == CB_ERR)
|
||||
{
|
||||
// nlassert(false);
|
||||
}
|
||||
if (SendMessage (GetDlgItem (hwndDlg, IDC_ENV_FX), CB_SELECTSTRING, -1, (LONG)(currentParam->EnvironmentFX.c_str())) == CB_ERR)
|
||||
if (SendMessage (GetDlgItem (hwndDlg, IDC_ENV_FX), CB_SELECTSTRING, -1, (LPARAM)(currentParam->EnvironmentFX.c_str())) == CB_ERR)
|
||||
{
|
||||
// nlassert(false);
|
||||
}
|
||||
if (SendMessage (GetDlgItem (hwndDlg, IDC_SOUND_GROUP), CB_SELECTSTRING, -1, (LONG)(currentParam->SoundGroup.c_str())) == CB_ERR)
|
||||
if (SendMessage (GetDlgItem (hwndDlg, IDC_SOUND_GROUP), CB_SELECTSTRING, -1, (LPARAM)(currentParam->SoundGroup.c_str())) == CB_ERR)
|
||||
{
|
||||
// nlassert(false);
|
||||
}
|
||||
|
@ -1497,7 +1497,7 @@ void lmcCopyFrom(CLodDialogBoxParam *currentParam, HWND parentDlg)
|
|||
|
||||
// **** launch the choosing dialog
|
||||
paramLMCFrom.reset();
|
||||
if (DialogBoxParam (hInstance, MAKEINTRESOURCE(IDD_LMC_CHOOSE_FROM), parentDlg, LMCCopyFromDialogCallback, (long)¶mLMCFrom)==IDOK
|
||||
if (DialogBoxParam (hInstance, MAKEINTRESOURCE(IDD_LMC_CHOOSE_FROM), parentDlg, LMCCopyFromDialogCallback, (LPARAM)¶mLMCFrom)==IDOK
|
||||
&& paramLMCFrom.SelectionDone)
|
||||
{
|
||||
// **** Apply to the current setup
|
||||
|
@ -3050,7 +3050,7 @@ void CNelExport::OnNodeProperties (const std::set<INode*> &listNode)
|
|||
ite++;
|
||||
}
|
||||
|
||||
if (DialogBoxParam (hInstance, MAKEINTRESOURCE(IDD_NODE_PROPERTIES), _Ip->GetMAXHWnd(), LodDialogCallback, (long)¶m)==IDOK)
|
||||
if (DialogBoxParam (hInstance, MAKEINTRESOURCE(IDD_NODE_PROPERTIES), _Ip->GetMAXHWnd(), LodDialogCallback, (LPARAM)¶m)==IDOK)
|
||||
{
|
||||
// Next node
|
||||
ite=listNode.begin();
|
||||
|
|
|
@ -119,7 +119,7 @@ void CProgressBar::initProgressBar( sint32 nNbMesh, Interface &ip)
|
|||
MAKEINTRESOURCE(IDD_CALCULATING),
|
||||
NULL,//ip.GetMAXHWnd(),
|
||||
CalculatingDialogCallback,
|
||||
(long)this );
|
||||
(LPARAM)this );
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------------------------------
|
||||
|
|
|
@ -1171,8 +1171,8 @@ void CExportNel::addSkeletonBindPos (INode& skinedNode, mapBoneBindPos& boneBind
|
|||
|
||||
if (res != MATRIX_RETURNED)
|
||||
{
|
||||
nlwarning("res != MATRIX_RETURNED; res = %i; boneIndex = %i / %i", res, boneIndex, count);
|
||||
nlwarning("bone = %i", (uint32)(void *)bone);
|
||||
nlwarning("res != MATRIX_RETURNED; res = %d; boneIndex = %u / %u", res, boneIndex, count);
|
||||
nlwarning("bone = %p", bone);
|
||||
std::string boneName = getName (*bone);
|
||||
nlwarning("boneName = %s", boneName.c_str());
|
||||
nlassert(false);
|
||||
|
|
Loading…
Reference in a new issue