zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Daveo 2001-05-01 16:54:13 +00:00
parent 1a9ca66995
commit ebdb695b89
5 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Utils/MapEdit/Core.cpp
View file

@ -83,8 +83,8 @@ int Width,Height;
AddLayer(LAYER_TYPE_TILE,LAYER_SUBTYPE_ACTION, Width, Height); AddLayer(LAYER_TYPE_TILE,LAYER_SUBTYPE_ACTION, Width, Height);
#ifdef _DEBUG #ifdef _DEBUG
// AddLayer(LAYER_TYPE_SHADE,LAYER_SUBTYPE_NONE, Width, Height); // AddLayer(LAYER_TYPE_SHADE,LAYER_SUBTYPE_NONE, Width, Height);
AddLayer(LAYER_TYPE_TRIGGER,LAYER_SUBTYPE_NONE, Width, Height); // AddLayer(LAYER_TYPE_TRIGGER,LAYER_SUBTYPE_NONE, Width, Height);
// AddLayer(LAYER_TYPE_PLATFORM,LAYER_SUBTYPE_NONE, Width, Height); AddLayer(LAYER_TYPE_PLATFORM,LAYER_SUBTYPE_NONE, Width, Height);
// AddLayer(LAYER_TYPE_HAZARD,LAYER_SUBTYPE_NONE, Width, Height); // AddLayer(LAYER_TYPE_HAZARD,LAYER_SUBTYPE_NONE, Width, Height);
// AddLayer(LAYER_TYPE_FX,LAYER_SUBTYPE_NONE, Width, Height); // AddLayer(LAYER_TYPE_FX,LAYER_SUBTYPE_NONE, Width, Height);
// AddLayer(LAYER_TYPE_ACTOR,LAYER_SUBTYPE_NONE, Width, Height); // AddLayer(LAYER_TYPE_ACTOR,LAYER_SUBTYPE_NONE, Width, Height);
@ -98,7 +98,7 @@ int Width,Height;
ActiveLayer=FindLayer(LAYER_TYPE_TILE,LAYER_SUBTYPE_ACTION); ActiveLayer=FindLayer(LAYER_TYPE_TILE,LAYER_SUBTYPE_ACTION);
#ifdef _DEBUG #ifdef _DEBUG
ActiveLayer=FindLayer(LAYER_TYPE_TRIGGER,LAYER_SUBTYPE_NONE); ActiveLayer=FindLayer(LAYER_TYPE_PLATFORM,LAYER_SUBTYPE_NONE);
if (ActiveLayer<0) ActiveLayer=0; if (ActiveLayer<0) ActiveLayer=0;
#endif #endif
CurrentLayer=Layer[ActiveLayer]; CurrentLayer=Layer[ActiveLayer];

8
Utils/MapEdit/Export.cpp
View file

@ -162,17 +162,17 @@ void CExport::ExportTile3d(CCore *Core,CElem &ThisTile,sExpTile &OutTile)
} }
/*****************************************************************************/ /*****************************************************************************/
void CExport::ExportElem3d(CCore *Core,CElem &ThisTile,int &TriStart,int &TriCount) void CExport::ExportElem3d(CCore *Core,CElem &ThisElem,int &TriStart,int &TriCount)
{ {
CTexCache &TexCache=Core->GetTexCache(); CTexCache &TexCache=Core->GetTexCache();
std::vector<sTriFace> &TileTriList=ThisTile.GetTriList(); std::vector<sTriFace> &ElemTriList=ThisElem.GetTriList();
TriStart=TriList.size(); TriStart=TriList.size();
TriCount=TileTriList.size(); TriCount=ElemTriList.size();
for (int T=0; T<TriCount; T++) for (int T=0; T<TriCount; T++)
{ {
sTriFace &InTri=TileTriList[T]; sTriFace &InTri=ElemTriList[T];
sExpTri OutTri; sExpTri OutTri;
GString TexName=TexCache.GetTexFilename(InTri.Mat); GString TexName=TexCache.GetTexFilename(InTri.Mat);
OutTri.TexID=TexNames.Add(TexName); OutTri.TexID=TexNames.Add(TexName);

4
Utils/MapEdit/GUIResize.cpp
View file

@ -30,9 +30,9 @@ void CGUIResize::DoDataExchange(CDataExchange* pDX)
CDialog::DoDataExchange(pDX); CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CGUIResize) //{{AFX_DATA_MAP(CGUIResize)
DDX_Text(pDX, IDC_MAPSIZE_HEIGHT, m_Height); DDX_Text(pDX, IDC_MAPSIZE_HEIGHT, m_Height);
DDV_MinMaxUInt(pDX, m_Height, 34, 1024); DDV_MinMaxUInt(pDX, m_Height, 24, 32000);
DDX_Text(pDX, IDC_MAPSIZE_WIDTH, m_Width); DDX_Text(pDX, IDC_MAPSIZE_WIDTH, m_Width);
DDV_MinMaxUInt(pDX, m_Width, 24, 1024); DDV_MinMaxUInt(pDX, m_Width, 34, 32000);
//}}AFX_DATA_MAP //}}AFX_DATA_MAP
} }

38
Utils/MapEdit/MapEdit.clw
View file

@ -37,26 +37,26 @@ Class25=CMapEditDoc
Class26=CMapEditView Class26=CMapEditView
ResourceCount=21 ResourceCount=21
Resource1=IDD_LAYER_COLLISION Resource1=IDR_MAINFRAME (English (U.S.))
Resource2=IDR_MAPEDITYPE (English (U.S.)) Resource2=IDR_MAPEDITYPE (English (U.S.))
Resource3=IDD_ELEMLIST Resource3=IDD_ABOUTBOX (English (U.S.))
Resource4=IDD_MULTIBAR (English (U.S.)) Resource4=IDD_ELEMLIST
Resource5=IDD_LAYER_THING Resource5=IDD_LAYER_LIST
Resource6=IDD_NEWMAP Resource6=IDD_TOOLBAR
Resource7=IDD_LAYER_PLATFORM Resource7=IDD_NEWMAP
Resource8=IDD_LAYER_TRIGGER Resource8=IDD_ADDLAYER
Resource9=IDD_TILEBANK Resource9=IDD_LAYER_TRIGGER
Resource10=IDR_TOOLBAR (English (U.S.)) Resource10=IDD_LAYER_THING_POS
Resource11=IDR_MAINFRAME (English (U.S.)) Resource11=IDD_LAYER_SHADE
Resource12=IDD_ABOUTBOX (English (U.S.)) Resource12=IDD_LAYER_COLLISION
Resource13=IDD_LAYER_ACTOR Resource13=IDD_MULTIBAR (English (U.S.))
Resource14=IDD_LAYER_LIST Resource14=IDD_LAYER_ACTOR
Resource15=IDD_RESIZE Resource15=IDD_LAYER_THING
Resource16=IDD_LAYER_THING_POS Resource16=IDD_RESIZE
Resource17=IDD_ADDLAYER Resource17=IDD_LAYER_PLATFORM
Resource18=IDD_LAYER_FX Resource18=IDD_TILEBANK
Resource19=IDD_TOOLBAR Resource19=IDD_LAYER_FX
Resource20=IDD_LAYER_SHADE Resource20=IDR_TOOLBAR (English (U.S.))
Resource21=IDD_LAYER_HAZARD Resource21=IDD_LAYER_HAZARD
[CLS:CChildFrame] [CLS:CChildFrame]

4
Utils/MapEdit/TexCache.cpp
View file

@ -31,7 +31,7 @@ GFName FName=Filename;
int Idx=GetTexIdx(NewTex); // Is already loaded? int Idx=GetTexIdx(NewTex); // Is already loaded?
if (Idx!=-1) return(Idx); if (Idx!=-1) return(Idx);
TRACE1("Loading Texture %s\n",NewTex.Filename); // TRACE1("Loading Texture %s\n",NewTex.Filename);
if (!LoadBMP(NewTex.Filename,ThisRGB)) if (!LoadBMP(NewTex.Filename,ThisRGB))
{ {
@ -210,7 +210,7 @@ void CTexCache::Purge()
{ {
int ListSize=TexList.size(); int ListSize=TexList.size();
TRACE1("Purging %i textures\n",ListSize); // TRACE1("Purging %i textures\n",ListSize);
for (int i=0; i<ListSize; i++) for (int i=0; i<ListSize; i++)
{ {