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-02-02 19:18:13 +00:00
parent 4321a15043
commit adf95894fe
8 changed files with 29 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Utils/Libs/GinLib/gintex.h
View file

@ -269,13 +269,13 @@ BOOL operator==(sUV const &v1)
{ {
return(u==v1.u && v==v1.v); return(u==v1.u && v==v1.v);
} }
/*
void operator=(sUV &Src) inline operator=(sUV const &Src)
{ {
u=Src.u; u=Src.u;
v=Src.v; v=Src.v;
} }
*/
}; };
struct sUVTri struct sUVTri
@ -289,17 +289,15 @@ BOOL operator==(sUVTri const &v1)
} }
return (TRUE); return (TRUE);
} }
/*
inline void operator=(sUVTri &Src) inline operator=(sUVTri const &Src)
{ {
for (int i=0; i<3; i++) for (int i=0; i<3; i++)
{ {
//p[i]=Src.p[i]; p[i]=Src.p[i];
p[i].u=Src.p[i].u;
p[i].v=Src.p[i].v;
} }
} }
*/
}; };
class CUVtri: public GinChunk class CUVtri: public GinChunk

14
Utils/Libs/TexGrab/AllFiles.cpp
View file

@ -34,9 +34,11 @@
properties that the AllFiles object has. properties that the AllFiles object has.
Params: Name of file to add Params: Name of file to add
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
void AllFiles::AddFile(const char * Name) int AllFiles::AddFile(const char * Name)
{ {
int ListSize=AllFileInfos.size();
DoCycle(Name,RecurseFiles); DoCycle(Name,RecurseFiles);
return(ListSize);
} }
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
@ -118,7 +120,7 @@ void AllFiles::FileCallback(char const * FName,int FileNum)
} }
} }
void AllFiles::AddMemFrame(char const * FName,Frame &Frame) int AllFiles::AddMemFrame(char const * FName,Frame &Frame)
{ {
FileInfo MyInfo; FileInfo MyInfo;
bool ThisZeroColZero; bool ThisZeroColZero;
@ -148,10 +150,10 @@ void AllFiles::AddMemFrame(char const * FName,Frame &Frame)
if (ForceOffsets) if (ForceOffsets)
MyInfo.SetForceOffsets(XOff,YOff); MyInfo.SetForceOffsets(XOff,YOff);
int ListSize=AllFileInfos.size();
AllFileInfos.resize(AllFileInfos.size()+1); AllFileInfos.resize(ListSize+1);
AllFileInfos[AllFileInfos.size()-1]=MyInfo; AllFileInfos[ListSize]=MyInfo;
return(ListSize);
} }
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------

4
Utils/Libs/TexGrab/AllFiles.h
View file

@ -76,8 +76,8 @@ public:
void setNoSort(void) {m_noSort=true;} void setNoSort(void) {m_noSort=true;}
void SortOrder(); void SortOrder();
void AddFile(const char * Name); int AddFile(const char * Name);
void AddMemFrame(char const * FName,Frame &Frame); int AddMemFrame(char const * FName,Frame &Frame);
void ReadRepFile(char const * Name); void ReadRepFile(char const * Name);

10
Utils/Libs/TexGrab/TexGrab.cpp
View file

@ -113,13 +113,14 @@ void CTexGrab::Process()
Purpose: Add bitmaps to file list Purpose: Add bitmaps to file list
Params: Name = Filename Params: Name = Filename
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
void CTexGrab::AddFile(const char *Name) int CTexGrab::AddFile(const char *Name)
{ {
GString UpperName(Name); GString UpperName(Name);
UpperName.Upper(); UpperName.Upper();
MyFiles.AddFile(UpperName); int Idx=MyFiles.AddFile(UpperName);
return(Idx);
} }
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
@ -127,13 +128,14 @@ GString UpperName(Name);
Purpose: Purpose:
Params: Params:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
void CTexGrab::AddMemFrame(const char *Name,Frame &Frame) int CTexGrab::AddMemFrame(const char *Name,Frame &Frame)
{ {
GString UpperName(Name); GString UpperName(Name);
UpperName.Upper(); UpperName.Upper();
MyFiles.AddMemFrame(UpperName,Frame); int Idx=MyFiles.AddMemFrame(UpperName,Frame);
return(Idx);
} }
/* /*

4
Utils/Libs/TexGrab/TexGrab.h
View file

@ -55,8 +55,8 @@ public:
CTexGrab(); CTexGrab();
~CTexGrab(); ~CTexGrab();
void AddFile(const char *Name); int AddFile(const char *Name);
void AddMemFrame(const char *Name,Frame &Frame); int AddMemFrame(const char *Name,Frame &Frame);
void Process(); void Process();

3
Utils/MapEdit/Export.cpp
View file

@ -79,11 +79,12 @@ sExpMapElem BlankElem={0,0,0};
{ {
sMapElem &MapElem=Map.Get(X,Y); sMapElem &MapElem=Map.Get(X,Y);
sExpMapElem TileElem; sExpMapElem TileElem;
sExpLayerTile OutElem;
TileElem.Tile=MapElem.Tile; TileElem.Tile=MapElem.Tile;
TileElem.Set=MapElem.Set; TileElem.Set=MapElem.Set;
TileElem.Flags=MapElem.Flags; TileElem.Flags=MapElem.Flags;
sExpLayerTile OutElem;
OutElem.Tile=UsedTileList.Add(TileElem); OutElem.Tile=UsedTileList.Add(TileElem);
OutElem.Flags=MapElem.Flags; OutElem.Flags=MapElem.Flags;
fwrite(&OutElem,sizeof(sExpLayerTile),1,File); fwrite(&OutElem,sizeof(sExpLayerTile),1,File);

3
Utils/MapEdit/ExportHdr.h
View file

@ -73,7 +73,8 @@ struct sExpMapElem
BOOL operator==(sExpMapElem const &v1) // Does Check flags BOOL operator==(sExpMapElem const &v1) // Does Check flags
{ {
return(Set==v1.Set && Tile==v1.Tile && Flags==v1.Flags); return(Set==v1.Set && Tile==v1.Tile);
// return(Set==v1.Set && Tile==v1.Tile && Flags==v1.Flags);
} }
}; };

BIN
tools/MapEdit/MapEdit.exe
View file

Binary file not shown.