Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Remove the last uses of template class ListNode<T> which was a cheap replacement of std::list<T> 

* Remove some commented out functions from heightmap.cpp which where duplicated (i.e. functions with the same name and parameter prototypes existed elsewhere in the file) and used ListNode<T>
 * Replace usage of ListNode<T> with std::list<T> usage; actually I replaced it with std::list<T>::iterator or std::list<T>::const_iterator since all code that still used ListNode<T> was code iterating over an instance of ListNode<T>
 * Remove listtemp.h which contained template class ListNode<T>

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2451 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2007-09-08 11:42:30 +00:00
parent ce19900dbe
commit c0c7c6fa51
4 changed files with 122 additions and 517 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/editworld/src/EditWorld.dsp
View File

@ -358,10 +358,6 @@ SOURCE=.\limitsdialog.hpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\listtemp.h
# End Source File
# Begin Source File
SOURCE=.\macros.h SOURCE=.\macros.h
# End Source File # End Source File
# Begin Source File # Begin Source File

389
tools/editworld/src/heightmap.cpp
View File

@ -6860,67 +6860,6 @@ void CHeightMap::SetUniqueIDs()
} }
/*
// Write the object list.
//
BOOL CHeightMap::WriteObjectList(FILE *Stream,UWORD StartX,UWORD StartY,UWORD Width,UWORD Height)
{
ListNode<C3DObjectInstance> *TmpNode;
C3DObjectInstance *Data;
C3DObject *Object;
char FeatureSet[256];
fprintf(Stream,"ObjectList {\n");
#ifdef WRITENAMEDOBJECTS
fprintf(Stream," Version %d\n",CURRENT_OBJECTLIST_VERSION);
#endif
if(m_FeatureSet) {
StripPath(FeatureSet,m_FeatureSet);
fprintf(Stream," FeatureSet %s\n",FeatureSet);
} else {
fprintf(Stream," FeatureSet %s\n",NULL);
}
fprintf(Stream," NumObjects %d\n",m_TotalInstances);
fprintf(Stream," Objects {\n");
TmpNode = m_Objects;
while(TmpNode!=NULL) {
Data = TmpNode->GetData();
#ifdef WRITENAMEDOBJECTS
Object = &m_3DObjects[Data->ObjectID];
fprintf(Stream," %d ",Data->UniqueID);
fprintf(Stream,"%d ",Object->TypeID);
if(Object->TypeID == IMD_STRUCTURE) {
fprintf(Stream,"\"%s\" ",m_Structures[Object->StructureID].StructureName);
fprintf(Stream,"%d ",Object->PlayerID);
} else {
if(Object->Description) {
fprintf(Stream,"\"%s\" ",Object->Description);
fprintf(Stream,"%d ",0);
} else {
fprintf(Stream,"\"NONAME\" ");
fprintf(Stream,"%d ",Data->ObjectID);
}
}
#else
fprintf(Stream," %d ",Data->ObjectID);
#endif
fprintf(Stream,"%.2f %.2f %.2f ",Data->Position.x,Data->Position.y,Data->Position.z);
fprintf(Stream,"%.2f %.2f %.2f\n",Data->Rotation.x,Data->Rotation.y,Data->Rotation.z);
TmpNode = TmpNode->GetNextNode();
}
fprintf(Stream," }\n");
fprintf(Stream,"}\n");
return TRUE;
}
*/
// Read the object list. // Read the object list.
// //
BOOL CHeightMap::ReadObjectList(FILE *Stream) BOOL CHeightMap::ReadObjectList(FILE *Stream)
@ -7425,57 +7364,55 @@ BOOL CHeightMap::WriteDeliveranceMap(FILE *Stream)
} }
//BOOL CHeightMap::ReadDeliveranceFeatures(FILE *Stream) #if 0
//{ BOOL CHeightMap::ReadDeliveranceFeatures(FILE *Stream)
// ListNode<C3DObjectInstance> *TmpNode; {
// C3DObjectInstance *Data; FEATURE_SAVEHEADER Header;
// SAVE_FEATURE Feature;
// FEATURE_SAVEHEADER Header;
// SAVE_FEATURE Feature; fread(&Header, 1, FEATURE_HEADER_SIZE, Stream);
//
// fread(&Header,1,FEATURE_HEADER_SIZE,Stream); if (Header.aFileType[0] != 'f'
// || Header.aFileType[1] != 'e'
// if( (Header.aFileType[0] != 'f') || || Header.aFileType[2] != 'a'
// (Header.aFileType[1] != 'e') || || Header.aFileType[3] != 't')
// (Header.aFileType[2] != 'a') || return FALSE;
// (Header.aFileType[3] != 't') ) {
// return FALSE; if(Header.version != 1)
// } return FALSE;
//
// if(Header.version != 1) {
// return FALSE; for(int Index = 0; Index<Header.quantity; Index++) {
// } fread(&Feature,1,sizeof(Feature),Stream);
//
// for(int Index = 0; Index<Header.quantity; Index++) { C3DObject *Object = &m_3DObjects[Feature.featureInc];
// fread(&Feature,1,sizeof(Feature),Stream);
// D3DVECTOR Position;
// C3DObject *Object = &m_3DObjects[Feature.featureInc]; D3DVECTOR Rotation={0.0F,0.0F,0.0F};
//
// D3DVECTOR Position; Rotation.y = (float)Feature.direction;
// D3DVECTOR Rotation={0.0F,0.0F,0.0F}; Position.y = 0.0F;
//
// Rotation.y = (float)Feature.direction; #ifdef ADJUSTFEATURECOORDS
// Position.y = 0.0F; Position.x = (float)Feature.x - (float)(m_MapWidth*m_TileWidth/2);
// Position.x += (abs(Object->Largest.x - Object->Smallest.x) / m_TileWidth ) * m_TileWidth / 2;
//#ifdef ADJUSTFEATURECOORDS
// Position.x = (float)Feature.x - (float)(m_MapWidth*m_TileWidth/2); Position.z = (float)Feature.y - (float)(m_MapHeight*m_TileHeight/2);
// Position.x += (abs(Object->Largest.x - Object->Smallest.x) / m_TileWidth ) * m_TileWidth / 2; Position.z += (abs(Object->Largest.z - Object->Smallest.z) / m_TileHeight ) * m_TileHeight / 2;
// Position.z = -Position.z;
// Position.z = (float)Feature.y - (float)(m_MapHeight*m_TileHeight/2); #else
// Position.z += (abs(Object->Largest.z - Object->Smallest.z) / m_TileHeight ) * m_TileHeight / 2; Position.x = (float)Feature.x - (float)(m_MapWidth*m_TileWidth/2);
// Position.z = -Position.z;
//#else Position.z = (float)Feature.y - (float)(m_MapHeight*m_TileHeight/2);
// Position.x = (float)Feature.x - (float)(m_MapWidth*m_TileWidth/2); Position.z = -Position.z;
// #endif
// Position.z = (float)Feature.y - (float)(m_MapHeight*m_TileHeight/2); int ObjID = AddObject(Feature.featureInc,Rotation,Position);
// Position.z = -Position.z; SnapObject(ObjID);
//#endif }
// int ObjID = AddObject(Feature.featureInc,Rotation,Position);
// SnapObject(ObjID); return TRUE;
// } }
// #endif
// return TRUE;
//}
int CHeightMap::CountObjectsOfType(int Type,int Exclude,int Include) int CHeightMap::CountObjectsOfType(int Type,int Exclude,int Include)
@ -7782,52 +7719,50 @@ BOOL CHeightMap::WriteDeliveranceTemplates(FILE *Stream)
//BOOL CHeightMap::WriteNecromancerMap(FILE *Stream) #if 0
//{ BOOL CHeightMap::WriteNecromancerMap(FILE *Stream)
// return WriteDeliveranceMap(Stream); {
//} return WriteDeliveranceMap(Stream);
// }
// #endif
//BOOL CHeightMap::WriteNecromancerObjects(FILE *Stream)
//{
// ListNode<C3DObjectInstance> *TmpNode; #if 0
// C3DObjectInstance *Data; BOOL CHeightMap::WriteNecromancerObjects(FILE *Stream)
// {
// NOB_SAVEHEADER Header; NOB_SAVEHEADER Header;
// NOB_ENTRY Nob;
// Header.aFileType[0] = 'n';
// Header.aFileType[0] = 'n'; Header.aFileType[1] = 'o';
// Header.aFileType[1] = 'o'; Header.aFileType[2] = 'b';
// Header.aFileType[2] = 'b'; Header.aFileType[3] = 'f';
// Header.aFileType[3] = 'f'; Header.version = 1;
// Header.version = 1; Header.quantity = CountObjectsOfType(IMD_OBJECT,-1,-1);
// Header.quantity = CountObjectsOfType(IMD_OBJECT,-1,-1);
// fwrite(&Header,FEATURE_HEADER_SIZE,1,Stream);
// fwrite(&Header,FEATURE_HEADER_SIZE,1,Stream);
// for (std::list<C3DObjectInstance>::const_iterator curNode = m_Objects.begin(); curNode != m_Objects.end(); ++curNode)
// TmpNode = m_Objects; {
// while(TmpNode!=NULL) { const C3DObject& Object = m_3DObjects[curNode->ObjectID];
// Data = TmpNode->GetData();
// if(Object.TypeID == IMD_OBJECT)
// C3DObject *Object = &m_3DObjects[Data->ObjectID]; {
// NOB_ENTRY Nob;
// if(Object->TypeID == IMD_OBJECT) {
// Nob.id = Data->ObjectID; Nob.id = curNode->ObjectID;
// Nob.XPos = (SDWORD)Data->Position.x; Nob.XPos = (SDWORD)curNode->Position.x;
// Nob.YPos = (SDWORD)Data->Position.y; Nob.YPos = (SDWORD)curNode->Position.y;
// Nob.ZPos = (SDWORD)Data->Position.z; Nob.ZPos = (SDWORD)curNode->Position.z;
// Nob.XRot = (SDWORD)Data->Rotation.x; Nob.XRot = (SDWORD)curNode->Rotation.x;
// Nob.YRot = (SDWORD)Data->Rotation.y; Nob.YRot = (SDWORD)curNode->Rotation.y;
// Nob.ZRot = (SDWORD)Data->Rotation.z; Nob.ZRot = (SDWORD)curNode->Rotation.z;
// fwrite(&Nob,sizeof(Nob),1,Stream); fwrite(&Nob, sizeof(Nob), 1, Stream);
// } }
// }
// TmpNode = TmpNode->GetNextNode();
// } return TRUE;
// }
// return TRUE; #endif
//}
//
void CHeightMap::SetTileHeightUndo(int Index,float Height) void CHeightMap::SetTileHeightUndo(int Index,float Height)
@ -8137,36 +8072,35 @@ BOOL CHeightMap::ReadScrollLimits(FILE *Stream)
BOOL CHeightMap::WriteDeliveranceLimits(FILE *Stream) BOOL CHeightMap::WriteDeliveranceLimits(FILE *Stream)
{ {
// LIMITS_SAVEHEADER Header; #if 0
// LIMITS Limit; LIMITS_SAVEHEADER Header;
//
// Header.aFileType[0] = 'l'; Header.aFileType[0] = 'l';
// Header.aFileType[1] = 'm'; Header.aFileType[1] = 'm';
// Header.aFileType[2] = 't'; Header.aFileType[2] = 't';
// Header.aFileType[3] = 's'; Header.aFileType[3] = 's';
// Header.version = CURRENT_GAME_VERSION_NUM; Header.version = CURRENT_GAME_VERSION_NUM;
// Header.quantity = m_NumScrollLimits; Header.quantity = m_NumScrollLimits;
//
// ListNode<CScrollLimits> *TmpNode; if (fwrite(&Header, LIMITS_SAVEHEADER_SIZE, 1, Stream) != 1)
// CScrollLimits *Data; return FALSE;
//
// if( fwrite(&Header,LIMITS_SAVEHEADER_SIZE,1,Stream) != 1) return FALSE; for (std::list<CScrollLimits>::const_iterator curNode = m_ScrollLimits.begin(); curNode != m_ScrollLimits.end(); ++curNode)
// {
// TmpNode = m_ScrollLimits; if(curNode->ScriptName[0])
// while(TmpNode!=NULL) { {
// Data = TmpNode->GetData(); LIMITS Limit;
// if(Data->ScriptName[0]) {
// Limit.LimitID = Data->UniqueID; Limit.LimitID = curNode->UniqueID;
// Limit.MinX = Data->MinX; Limit.MinX = curNode->MinX;
// Limit.MinZ = Data->MinZ; Limit.MinZ = curNode->MinZ;
// Limit.MaxX = Data->MaxX; Limit.MaxX = curNode->MaxX;
// Limit.MaxZ = Data->MaxZ; Limit.MaxZ = curNode->MaxZ;
// fwrite(&Limit,sizeof(Limit),1,Stream); fwrite(&Limit, sizeof(Limit), 1, Stream);
// } }
// }
// TmpNode = TmpNode->GetNextNode(); #endif
// }
//
return TRUE; return TRUE;
} }
@ -8430,85 +8364,6 @@ BOOL CHeightMap::CheckGatewayBlockingTiles(int Index)
} }
/*
// Check no blocking tiles in gateway span.
//
BOOL CHeightMap::CheckGatewayBlockingTiles(int Index)
{
ListNode<GateWay> *TmpNode;
GateWay *Data;
int Type;
if(Index < m_NumGateways) {
Data = m_Gateways->GetNthNode(Index)->GetData();
if(Data->x0 == Data->x1) { // Vertical
// // First check tile above top is blocking.
// Type = GetTileType(Data->x0,Data->y0-1);
// if((Type != TF_TYPEWATER) && (Type != TF_TYPECLIFFFACE)) {
// return FALSE;
// }
//
// // Now check tile below bottom is blocking.
// Type = GetTileType(Data->x0,Data->y1+1);
// if((Type != TF_TYPEWATER) && (Type != TF_TYPECLIFFFACE)) {
// return FALSE;
// }
// Now check tiles to left & right are not blocking and tiles
// along span are not blocking.
for(int y=Data->y0; y <= Data->y1; y++) {
if(TileIsBlockingLand(Data->x0,y)) {
return FALSE;
}
// Type = GetTileType(Data->x0+1,y);
// if((Type == TF_TYPEWATER) || (Type == TF_TYPECLIFFFACE)) {
// return FALSE;
// }
// Type = GetTileType(Data->x0-1,y);
// if((Type == TF_TYPEWATER) || (Type == TF_TYPECLIFFFACE)) {
// return FALSE;
// }
}
} else { // Horizontal.
// First check tile to left is blocking.
// Type = GetTileType(Data->x0-1,Data->y0);
// if((Type != TF_TYPEWATER) && (Type != TF_TYPECLIFFFACE)) {
// return FALSE;
// }
//
// // Now check tile to right is blocking.
// Type = GetTileType(Data->x1+1,Data->y0);
// if((Type != TF_TYPEWATER) && (Type != TF_TYPECLIFFFACE)) {
// return FALSE;
// }
// Now check tiles above and below are not blocking and tiles
// along span are not blocking.
for(int x=Data->x0; x <= Data->x1; x++) {
if(TileIsBlockingLand(x,Data->y0)) {
return FALSE;
}
// Type = GetTileType(x,Data->y0-1);
// if((Type == TF_TYPEWATER) || (Type == TF_TYPECLIFFFACE)) {
// return FALSE;
// }
// Type = GetTileType(x,Data->y0+1);
// if((Type == TF_TYPEWATER) || (Type == TF_TYPECLIFFFACE)) {
// return FALSE;
// }
}
}
}
return TRUE;
}
*/
// Check a gateway dos'nt overlap any others. // Check a gateway dos'nt overlap any others.
// //
BOOL CHeightMap::CheckGatewayOverlap(int CurIndex,int x0,int y0,int x1,int y1) BOOL CHeightMap::CheckGatewayOverlap(int CurIndex,int x0,int y0,int x1,int y1)

1
tools/editworld/src/heightmap.h
View File

@ -28,7 +28,6 @@
#include "pcxhandler.h" #include "pcxhandler.h"
#include "bmphandler.h" #include "bmphandler.h"
#include "grdland.h" #include "grdland.h"
#include "listtemp.h"
#include <list> #include <list>
#include "chnkio.h" #include "chnkio.h"
#include "devmap.h" #include "devmap.h"

245
tools/editworld/src/listtemp.h
View File

@ -1,245 +0,0 @@
/*
This file is part of Warzone 2100.
Copyright (C) 1999-2004 Eidos Interactive
Copyright (C) 2005-2007 Warzone Resurrection Project
Warzone 2100 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
Warzone 2100 is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Warzone 2100; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
$Revision$
$Id$
$HeadURL$
*/
#ifndef __INCLUDED_LISTTEMP__
#define __INCLUDED_LISTTEMP__
#include <cassert>
template<class T>
class ListNode
{
public:
ListNode() :
PrevNode(NULL),
NextNode(NULL),
Data(new T)
{
}
~ListNode()
{
// DebugPrint("DeleteNode\n");
delete Data;
}
T* GetData()
{
return Data;
}
void AppendNode(ListNode<T>* RootNode)
{
ListNode<T>* TmpNode = RootNode->GetLastNode(); // Find the end of the list.
TmpNode->NextNode = this; // Append the new node to the list.
PrevNode = TmpNode;
NextNode = NULL;
}
void InsertAfterNode(ListNode<T>* Node)
{
PrevNode = Node;
NextNode = Node->NextNode;
Node->NextNode = this;
if(NextNode != NULL)
NextNode->PrevNode = this;
}
void InsertBeforeNode(ListNode<T>* Node)
{
PrevNode = Node->PrevNode;
Node->PrevNode = this;
NextNode = Node;
if(PrevNode != NULL)
PrevNode->NextNode = this;
}
ListNode<T>* GetNextNode()
{
return NextNode;
}
ListNode<T>* GetPrevNode()
{
return PrevNode;
}
ListNode<T>* GetFirstNode()
{
ListNode* TmpNode = this; // Get address of this node.
while(TmpNode->PrevNode != NULL) // Find the start of the list.
{
TmpNode = TmpNode->PrevNode;
}
return TmpNode;
}
ListNode<T>* GetLastNode()
{
ListNode<T>* TmpNode = this; // Get address of this node.
while(TmpNode->NextNode != NULL) // Find the end of the list.
{
TmpNode = TmpNode->NextNode;
}
return TmpNode;
}
ListNode<T>* GetNthNode(size_t NodeNum)
{
ListNode<T>* TmpNode = GetFirstNode(); // Find the start of the list.
while (TmpNode != NULL)
{
if(NodeNum == 0)
return TmpNode;
TmpNode = TmpNode->NextNode;
--NodeNum;
}
return NULL;
}
ListNode<T>* RemoveNode(ListNode<T>* RootNode)
{
// DebugPrint("* Removing node @ %p\n",this);
if(this == RootNode)
{
RootNode = RootNode->GetNextNode();
// DebugPrint("* Root changed %p\n",RootNode);
}
if(PrevNode != NULL)
PrevNode->NextNode = NextNode;
if(NextNode != NULL)
NextNode->PrevNode = PrevNode;
return RootNode;
}
void DeleteList()
{
ListNode<T>* TmpNode = GetFirstNode(); // Find the start of the list.
ListNode<T>* TmpNode2;
while(TmpNode != NULL) // Delete all items in the list.
{
TmpNode2 = TmpNode;
TmpNode = TmpNode->NextNode;
delete TmpNode2;
}
}
size_t CountNodes()
{
ListNode<T>* TmpNode = GetFirstNode(); // Find the start of the list.
size_t count = 0;
// Walk to the end of the list and count all encountered nodes
while(TmpNode != NULL)
{
TmpNode = TmpNode->NextNode;
++count;
}
return count;
}
class iterator
{
public:
iterator(ListNode<T>* ptr = NULL) :
_nodePtr(ptr)
{}
iterator(const iterator& rhs) :
_nodePtr(rhs._nodePtr)
{}
iterator& operator=(const iterator& rhs)
{
_nodePtr = rhs._nodePtr;
return *this;
}
bool operator==(const iterator& rhs) const
{
return _nodePtr == rhs._nodePtr;
}
bool operator!=(const iterator& rhs) const
{
return !(*this == rhs);
}
T& operator*() const
{
assert(_nodePtr != NULL && _nodePtr->GetData() != NULL);
return *_nodePtr->GetData();
}
T* operator->() const
{
assert(_nodePtr != NULL && _nodePtr->GetData() != NULL);
return _nodePtr->GetData();
}
iterator& operator++()
{
_nodePtr = _nodePtr->GetNextNode();
return *this;
}
iterator operator++(int)
{
iterator tmp(*this);
++(*this);
return tmp;
}
void goToBegin()
{
_nodePtr = _nodePtr->GetFirstNode();
}
private:
ListNode<T>* _nodePtr;
};
protected:
ListNode<T>* PrevNode;
ListNode<T>* NextNode;
T* Data;
};
#endif