Commit 822e2412 authored by D-AIRY's avatar D-AIRY

Removed version 6 models support; Added extended vertex format support to animation; Minor fixes

parent 6adfcfac
This diff is collapsed.
......@@ -78,7 +78,6 @@ protected:
MBERR AppendBones(const ModelFile * mdl, char * root=NULL);
//void BuildHitboxes();
void Load(const char * name);
void Load6(const char * name);
ModelHeader m_hdr;
ModelHeader2 m_hdr2;
......
......@@ -17,10 +17,6 @@ See the license in LICENSE
#ifndef __MODEL_FILE_H
#define __MODEL_FILE_H
/*! Старая версия формата
\todo убрать поддержку старой версии формата моделей
*/
#define SX_MODEL_VERSION_OLD 6
#define SX_MODEL_VERSION 7 /*!< Актуальная версия файла модели */
#define SX_MODEL_MAGICK 30510779525321540 /*!< Магическая константа для определения файла */
......
This diff is collapsed.
......@@ -739,7 +739,7 @@ LRESULT SXLevelEditor_GroupBox_CallWmCommand(HWND hWnd, UINT uiMsg, WPARAM wPara
Array<proptable_t*> aPropTable;
proptable_t *pPropTableParent = pPropTable->pBaseProptable;
while (pPropTable)
while(pPropTableParent)
{
aPropTable.push_back(pPropTableParent);
pPropTableParent = pPropTableParent->pBaseProptable;
......
......@@ -360,21 +360,21 @@ void level_editor::FillListBoxGameObj(int iSelect)
int iCountGameObj = SXGame_EntGetCount();
int iCountGameObj2 = 0;
char szNote[1024];
for (int i = 0; i < iCountGameObj; ++i)
for(int i = 0; i < iCountGameObj; ++i)
{
CBaseEntity *pEntity = SXGame_EntGet(i);
if (pEntity)
if(pEntity && pEntity->getFlags() & EF_LEVEL)
{
sprintf(szNote, "%s / %s", pEntity->getName(), pEntity->getClassName());
level_editor::pListBoxList->addItem(szNote);
level_editor::pListBoxList->setItemData(level_editor::pListBoxList->getItemCount() - 1, i);
++iCountGameObj2;
}
}
}
level_editor::pStaticListValCount->setText(String(iCountGameObj2).c_str());
if (iSelect < 0)
if(iSelect < 0)
{
level_editor::iActiveGroupType = -EDITORS_LEVEL_GROUPTYPE_GAME;
level_editor::idActiveElement = -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment