BOOL -> bool; additional fixes in constructors/destructors

15 files changed, 167 insertions, 167 deletions

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 1c92a2a..1d56e8a 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -65,27 +65,27 @@ void CEvent::MakeEvent(Event &event, EventMsg msg)
 

 // Adds an event in the FIFO.

 

-BOOL CEvent::AddEvent(const Event &event)

+bool CEvent::AddEvent(const Event &event)

 {

-	if ( m_total >= MAXEVENT )  return FALSE;

+	if ( m_total >= MAXEVENT )  return false;

 

 	m_fifo[m_head++] = event;

 	if ( m_head >= MAXEVENT )  m_head = 0;

 	m_total ++;

 

-	return TRUE;

+	return true;

 }

 

 // Removes an event from the FIFO.

 

-BOOL CEvent::GetEvent(Event &event)

+bool CEvent::GetEvent(Event &event)

 {

-	if ( m_head == m_tail )  return FALSE;

+	if ( m_head == m_tail )  return false;

 

 	event = m_fifo[m_tail++];

 	if ( m_tail >= MAXEVENT )  m_tail = 0;

 	m_total --;

 

-	return TRUE;

+	return true;

 }

 

diff --git a/src/common/event.h b/src/common/event.h
index b9690e4..e2ec120 100644
--- a/src/common/event.h
+++ b/src/common/event.h
@@ -617,8 +617,8 @@ public:
 

 	void	Flush();

 	void	MakeEvent(Event &event, EventMsg msg);

-	BOOL	AddEvent(const Event &event);

-	BOOL	GetEvent(Event &event);

+	bool	AddEvent(const Event &event);

+	bool	GetEvent(Event &event);

 

 protected:

 

diff --git a/src/common/iman.cpp b/src/common/iman.cpp
index b98c393..c6313e0 100644
--- a/src/common/iman.cpp
+++ b/src/common/iman.cpp
@@ -88,11 +88,11 @@ void CInstanceManager::Flush(ClassType classType)
 

 // Adds a new instance of a class.

 

-BOOL CInstanceManager::AddInstance(ClassType classType, void* pointer, int max)

+bool CInstanceManager::AddInstance(ClassType classType, void* pointer, int max)

 {

 	int		i;

 

-	if ( classType < 0 || classType >= CLASS_MAX )  return FALSE;

+	if ( classType < 0 || classType >= CLASS_MAX )  return false;

 

 	if ( m_table[classType].classPointer == 0 )

 	{

@@ -101,20 +101,20 @@ BOOL CInstanceManager::AddInstance(ClassType classType, void* pointer, int max)
 		m_table[classType].totalUsed     = 0;

 	}

 

-	if ( m_table[classType].totalUsed >= m_table[classType].totalPossible )  return FALSE;

+	if ( m_table[classType].totalUsed >= m_table[classType].totalPossible )  return false;

 

 	i = m_table[classType].totalUsed++;

 	m_table[classType].classPointer[i] = pointer;

-	return TRUE;

+	return true;

 }

 

 // Deletes an instance of a class.

 

-BOOL CInstanceManager::DeleteInstance(ClassType classType, void* pointer)

+bool CInstanceManager::DeleteInstance(ClassType classType, void* pointer)

 {

 	int		i;

 

-	if ( classType < 0 || classType >= CLASS_MAX )  return FALSE;

+	if ( classType < 0 || classType >= CLASS_MAX )  return false;

 

 	for ( i=0 ; i<m_table[classType].totalUsed ; i++ )

 	{

@@ -125,7 +125,7 @@ BOOL CInstanceManager::DeleteInstance(ClassType classType, void* pointer)
 	}

 

 	Compress(classType);

-	return TRUE;

+	return true;

 }

 

 // Seeking an existing instance. Returns 0 if it does not exist.

diff --git a/src/common/iman.h b/src/common/iman.h
index b484e30..b41305f 100644
--- a/src/common/iman.h
+++ b/src/common/iman.h
@@ -41,8 +41,8 @@ public:
 

 	void	Flush();

 	void	Flush(ClassType classType);

-	BOOL	AddInstance(ClassType classType, void* pointer, int max=1);

-	BOOL	DeleteInstance(ClassType classType, void* pointer);

+	bool	AddInstance(ClassType classType, void* pointer, int max=1);

+	bool	DeleteInstance(ClassType classType, void* pointer);

 	void*	SearchInstance(ClassType classType, int rank=0);

 

 

diff --git a/src/common/language.h b/src/common/language.h
index 9d5bdb9..33c7465 100644
--- a/src/common/language.h
+++ b/src/common/language.h
@@ -19,23 +19,23 @@
 #pragma once

 

 

-#define _FULL			TRUE		// CoLoBoT

-#define _SCHOOL			FALSE		// CeeBot-A or Teen

-  #define _TEEN			FALSE		// FALSE for CeeBot-A, TRUE for CeeBot-Teen

-  #define _EDU			FALSE

-  #define _PERSO		FALSE

-  #define _CEEBOTDEMO	FALSE

-#define _NET			FALSE

-#define _DEMO			FALSE		// DEMO only CoLoBoT (with _Full = FALSE)!

-

-#define _FRENCH			TRUE

-#define _ENGLISH		FALSE

-#define _GERMAN			FALSE

-#define _WG				FALSE

-#define _POLISH			FALSE

-

-#define _NEWLOOK		FALSE		// FALSE for CoLoBoT, TRUE for all CeeBot

-#define _SOUNDTRACKS	FALSE		// always FALSE since InitAudioTrackVolume crop in Vista

+#define _FULL			true		// CoLoBoT

+#define _SCHOOL			false		// CeeBot-A or Teen

+  #define _TEEN			false		// false for CeeBot-A, true for CeeBot-Teen

+  #define _EDU			false

+  #define _PERSO		false

+  #define _CEEBOTDEMO	false

+#define _NET			false

+#define _DEMO			false		// DEMO only CoLoBoT (with _Full = false)!

+

+#define _FRENCH			true

+#define _ENGLISH		false

+#define _GERMAN			false

+#define _WG				false

+#define _POLISH			false

+

+#define _NEWLOOK		false		// false for CoLoBoT, true for all CeeBot

+#define _SOUNDTRACKS	false		// always false since InitAudioTrackVolume crop in Vista

 

 

 // Verifications

diff --git a/src/common/metafile.cpp b/src/common/metafile.cpp
index 63c8e0b..74bcc3d 100644
--- a/src/common/metafile.cpp
+++ b/src/common/metafile.cpp
@@ -138,8 +138,8 @@ CMetaFile::CMetaFile()
 		m_list[i].headers = 0;

 	}

 

-	m_bMeta  = FALSE;

-	m_bOpen  = FALSE;

+	m_bMeta  = false;

+	m_bOpen  = false;

 	m_start  = 0;

 	m_pos    = 0;

 	m_len    = 0;

@@ -156,7 +156,7 @@ CMetaFile::~CMetaFile()
 

 // Test if a file exists.

 

-BOOL CMetaFile::IsExist(char *metaname, char *filename)

+bool CMetaFile::IsExist(char *metaname, char *filename)

 {

 	FILE*	file;

 	int		index, i;

@@ -164,9 +164,9 @@ BOOL CMetaFile::IsExist(char *metaname, char *filename)
 	if ( metaname[0] == 0 )

 	{

 		file = fopen(filename, "rb");

-		if ( file == NULL )  return FALSE;

+		if ( file == NULL )  return false;

 		fclose(file);

-		return TRUE;

+		return true;

 	}

 	else

 	{

@@ -177,10 +177,10 @@ BOOL CMetaFile::IsExist(char *metaname, char *filename)
 		{

 			if ( strcmp(m_list[index].headers[i].name, filename) == 0 )

 			{

-				return TRUE;

+				return true;

 			}

 		}

-		return FALSE;

+		return false;

 	}

 }

 

@@ -199,8 +199,8 @@ int CMetaFile::Open(char *metaname, char *filename)
 	{

 		m_stream = fopen(filename, "rb");

 		if ( m_stream == 0 )  return 1;

-		m_bOpen = TRUE;

-		m_bMeta = FALSE;

+		m_bOpen = true;

+		m_bMeta = false;

 		return 0;

 	}

 	else

@@ -215,8 +215,8 @@ int CMetaFile::Open(char *metaname, char *filename)
 				m_stream = m_list[index].stream;

 				m_start  = m_list[index].headers[i].start;

 				m_len    = m_list[index].headers[i].len;

-				m_bOpen = TRUE;

-				m_bMeta = TRUE;

+				m_bOpen = true;

+				m_bMeta = true;

 				Seek(0);

 				return 0;

 			}

@@ -328,7 +328,7 @@ int CMetaFile::Close()
 	{

 		fclose(m_stream);

 	}

-	m_bOpen = FALSE;

+	m_bOpen = false;

 	m_stream = 0;

 

 	return 0;

diff --git a/src/common/metafile.h b/src/common/metafile.h
index 7d7ec3e..c580f6a 100644
--- a/src/common/metafile.h
+++ b/src/common/metafile.h
@@ -49,7 +49,7 @@ public:
 	CMetaFile();

 	~CMetaFile();

 

-	BOOL	IsExist(char *metaname, char *filename);

+	bool	IsExist(char *metaname, char *filename);

 	int		Open(char *metaname, char *filename);

 	int		RetLength();

 	int		Seek(int offset);

@@ -65,8 +65,8 @@ protected:
 

 protected:

 	MetaFile	m_list[METAMAX];		// metafile open

-	BOOL		m_bOpen;			// open file

-	BOOL		m_bMeta;			// metafile open

+	bool		m_bOpen;			// open file

+	bool		m_bMeta;			// metafile open

 	FILE*		m_stream;			// channel

 	int		m_start;			// position from the beginning

 	int		m_pos;				// current position

diff --git a/src/common/misc.cpp b/src/common/misc.cpp
index e73238f..f58527f 100644
--- a/src/common/misc.cpp
+++ b/src/common/misc.cpp
@@ -40,7 +40,7 @@
 CMetaFile	g_metafile;

 

 static EventMsg		g_uniqueEventMsg = EVENT_USER;

-static BOOL			g_bUserDir = FALSE;

+static bool			g_bUserDir = false;

 static char			g_userDir[100] = "";

 

 

@@ -264,7 +264,7 @@ void TimeToAscii(time_t time, char *buffer)
 

 // Makes a copy of a file.

 

-BOOL Xfer(char* src, char* dst)

+bool Xfer(char* src, char* dst)

 {

 	FILE	*fs, *fd;

 	char	*buffer;

@@ -273,19 +273,19 @@ BOOL Xfer(char* src, char* dst)
 	fs = fopen(src, "rb");

 	if ( fs == 0 )

 	{

-		return FALSE;

+		return false;

 	}

 

 	fd = fopen(dst, "wb");

 	if ( fd == 0 )

 	{

 		fclose(fs);

-		return FALSE;

+		return false;

 	}

 

 	buffer = (char*)malloc(10000);

 

-	while ( TRUE )

+	while ( true )

 	{

 		len = fread(buffer, 1, 10000, fs);

 		if ( len == 0 )  break;

@@ -295,12 +295,12 @@ BOOL Xfer(char* src, char* dst)
 	free(buffer);

 	fclose(fs);

 	fclose(fd);

-	return TRUE;

+	return true;

 }

 

 // Copy a file into the temporary folder.

 

-BOOL CopyFileToTemp(char* filename)

+bool CopyFileToTemp(char* filename)

 {

 	char	src[100];

 	char	dst[100];

@@ -314,15 +314,15 @@ BOOL CopyFileToTemp(char* filename)
 	strcpy(g_userDir, save);

 

 	_mkdir("temp");

-	if ( !Xfer(src, dst) )  return FALSE;

+	if ( !Xfer(src, dst) )  return false;

 

 	strcpy(filename, dst);

-	return TRUE;

+	return true;

 }

 

 // Copy a list of numbered files into the temporary folder.

 

-BOOL CopyFileListToTemp(char* filename, int* list, int total)

+bool CopyFileListToTemp(char* filename, int* list, int total)

 {

 	char	name[100];

 	char	ext[10];

@@ -355,7 +355,7 @@ BOOL CopyFileListToTemp(char* filename, int* list, int total)
 	strcpy(filename, file);

 	strcpy(g_userDir, save);

 

-	return TRUE;

+	return true;

 }

 

 

@@ -370,7 +370,7 @@ void AddExt(char* filename, char* ext)
 

 // Specifies the user folder.

 

-void UserDir(BOOL bUser, char* dir)

+void UserDir(bool bUser, char* dir)

 {

 	g_bUserDir = bUser;

 	strcpy(g_userDir, dir);

diff --git a/src/common/misc.h b/src/common/misc.h
index fb1938e..93b57de 100644
--- a/src/common/misc.h
+++ b/src/common/misc.h
@@ -227,10 +227,10 @@ extern char RetToLower(char letter);
 

 extern void TimeToAscii(time_t time, char *buffer);

 

-extern BOOL CopyFileToTemp(char* filename);

-extern BOOL CopyFileListToTemp(char* filename, int* list, int total);

+extern bool CopyFileToTemp(char* filename);

+extern bool CopyFileListToTemp(char* filename, int* list, int total);

 extern void AddExt(char* filename, char* ext);

-extern void UserDir(BOOL bUser, char* dir);

+extern void UserDir(bool bUser, char* dir);

 extern void UserDir(char* buffer, char* dir, char* def);

 

 extern char RetLanguageLetter();

diff --git a/src/common/modfile.cpp b/src/common/modfile.cpp
index 3e1c997..a7bfeab 100644
--- a/src/common/modfile.cpp
+++ b/src/common/modfile.cpp
@@ -64,7 +64,7 @@ CModFile::~CModFile()
 

 // Creates a triangle in the internal structure.

 

-BOOL CModFile::CreateTriangle(D3DVECTOR p1, D3DVECTOR p2, D3DVECTOR p3,

+bool CModFile::CreateTriangle(D3DVECTOR p1, D3DVECTOR p2, D3DVECTOR p3,

 							  float min, float max)

 {

 	D3DVECTOR	n;

@@ -73,15 +73,15 @@ BOOL CModFile::CreateTriangle(D3DVECTOR p1, D3DVECTOR p2, D3DVECTOR p3,
 	if ( m_triangleUsed >= MAX_VERTICES )

 	{

 		OutputDebugString("ERROR: CreateTriangle::Too many triangles\n");

-		return FALSE;

+		return false;

 	}

 

 	i = m_triangleUsed++;

 

 	ZeroMemory(&m_triangleTable[i], sizeof(ModelTriangle));

 

-	m_triangleTable[i].bUsed = TRUE;

-	m_triangleTable[i].bSelect = FALSE;

+	m_triangleTable[i].bUsed = true;

+	m_triangleTable[i].bSelect = false;

 

 	n = ComputeNormal(p3, p2, p1);

 	m_triangleTable[i].p1 = D3DVERTEX2( p1, n);

@@ -98,42 +98,42 @@ BOOL CModFile::CreateTriangle(D3DVECTOR p1, D3DVECTOR p2, D3DVECTOR p3,
 	m_triangleTable[i].min = min;

 	m_triangleTable[i].max = max;

 

-	return TRUE;

+	return true;

 }

 

 // Reads a DXF file.

 

-BOOL CModFile::ReadDXF(char *filename, float min, float max)

+bool CModFile::ReadDXF(char *filename, float min, float max)

 {

 	FILE*		file = NULL;

 	char		line[100];

 	int			command, rankSommet, nbSommet, nbFace;

 	D3DVECTOR	table[MAX_VERTICES];

-	BOOL		bWaitNbSommet;

-	BOOL		bWaitNbFace;

-	BOOL		bWaitSommetX;

-	BOOL		bWaitSommetY;

-	BOOL		bWaitSommetZ;

-	BOOL		bWaitFaceX;

-	BOOL		bWaitFaceY;

-	BOOL		bWaitFaceZ;

+	bool		bWaitNbSommet;

+	bool		bWaitNbFace;

+	bool		bWaitSommetX;

+	bool		bWaitSommetY;

+	bool		bWaitSommetZ;

+	bool		bWaitFaceX;

+	bool		bWaitFaceY;

+	bool		bWaitFaceZ;

 	float		x,y,z;

 	int			p1,p2,p3;

 

 	file = fopen(filename, "r");

-	if ( file == NULL )  return FALSE;

+	if ( file == NULL )  return false;

 

 	m_triangleUsed = 0;

 

 	rankSommet = 0;

-	bWaitNbSommet = FALSE;

-	bWaitNbFace   = FALSE;

-	bWaitSommetX  = FALSE;

-	bWaitSommetY  = FALSE;

-	bWaitSommetZ  = FALSE;

-	bWaitFaceX    = FALSE;

-	bWaitFaceY    = FALSE;

-	bWaitFaceZ    = FALSE;

+	bWaitNbSommet = false;

+	bWaitNbFace   = false;

+	bWaitSommetX  = false;

+	bWaitSommetY  = false;

+	bWaitSommetZ  = false;

+	bWaitFaceX    = false;

+	bWaitFaceY    = false;

+	bWaitFaceZ    = false;

 

 	while ( fgets(line, 100, file) != NULL )

 	{

@@ -142,16 +142,16 @@ BOOL CModFile::ReadDXF(char *filename, float min, float max)
 

 		if ( command == 66 )

 		{

-			bWaitNbSommet = TRUE;

+			bWaitNbSommet = true;

 		}

 

 		if ( command == 71 && bWaitNbSommet )

 		{

-			bWaitNbSommet = FALSE;

+			bWaitNbSommet = false;

 			sscanf(line, "%d", &nbSommet);

 			if ( nbSommet > MAX_VERTICES )  nbSommet = MAX_VERTICES;

 			rankSommet = 0;

-			bWaitNbFace = TRUE;

+			bWaitNbFace = true;

 

 //?			sprintf(s, "Waiting for %d sommets\n", nbSommet);

 //?			OutputDebugString(s);

@@ -159,9 +159,9 @@ BOOL CModFile::ReadDXF(char *filename, float min, float max)
 

 		if ( command == 72 && bWaitNbFace )

 		{

-			bWaitNbFace = FALSE;

+			bWaitNbFace = false;

 			sscanf(line, "%d", &nbFace);

-			bWaitSommetX = TRUE;

+			bWaitSommetX = true;

 

 //?			sprintf(s, "Waiting for %d faces\n", nbFace);

 //?			OutputDebugString(s);

@@ -169,21 +169,21 @@ BOOL CModFile::ReadDXF(char *filename, float min, float max)
 

 		if ( command == 10 && bWaitSommetX )

 		{

-			bWaitSommetX = FALSE;

+			bWaitSommetX = false;

 			sscanf(line, "%f", &x);

-			bWaitSommetY = TRUE;

+			bWaitSommetY = true;

 		}

 

 		if ( command == 20 && bWaitSommetY )

 		{

-			bWaitSommetY = FALSE;

+			bWaitSommetY = false;

 			sscanf(line, "%f", &y);

-			bWaitSommetZ = TRUE;

+			bWaitSommetZ = true;

 		}

 

 		if ( command == 30 && bWaitSommetZ )

 		{

-			bWaitSommetZ = FALSE;

+			bWaitSommetZ = false;

 			sscanf(line, "%f", &z);

 

 			nbSommet --;

@@ -191,36 +191,36 @@ BOOL CModFile::ReadDXF(char *filename, float min, float max)
 			{

 				D3DVECTOR p(x,z,y);  // permutation of Y and Z!

 				table[rankSommet++] = p;

-				bWaitSommetX = TRUE;

+				bWaitSommetX = true;

 

 //?				sprintf(s, "Sommet[%d]=%f;%f;%f\n", rankSommet, p.x,p.y,p.z);

 //?				OutputDebugString(s);

 			}

 			else

 			{

-				bWaitFaceX = TRUE;

+				bWaitFaceX = true;

 			}

 		}

 

 		if ( command == 71 && bWaitFaceX )

 		{

-			bWaitFaceX = FALSE;

+			bWaitFaceX = false;

 			sscanf(line, "%d", &p1);

 			if ( p1 < 0 )  p1 = -p1;

-			bWaitFaceY = TRUE;

+			bWaitFaceY = true;

 		}

 

 		if ( command == 72 && bWaitFaceY )

 		{

-			bWaitFaceY = FALSE;

+			bWaitFaceY = false;

 			sscanf(line, "%d", &p2);

 			if ( p2 < 0 )  p2 = -p2;

-			bWaitFaceZ = TRUE;

+			bWaitFaceZ = true;

 		}

 

 		if ( command == 73 && bWaitFaceZ )

 		{

-			bWaitFaceZ = FALSE;

+			bWaitFaceZ = false;

 			sscanf(line, "%d", &p3);

 			if ( p3 < 0 )  p3 = -p3;

 

@@ -228,7 +228,7 @@ BOOL CModFile::ReadDXF(char *filename, float min, float max)
 			if ( nbFace >= 0 )

 			{

 				CreateTriangle( table[p3-1], table[p2-1], table[p1-1], min,max );

-				bWaitFaceX = TRUE;

+				bWaitFaceX = true;

 

 //?				sprintf(s, "Face=%d;%d;%d\n", p1,p2,p3);

 //?				OutputDebugString(s);

@@ -238,7 +238,7 @@ BOOL CModFile::ReadDXF(char *filename, float min, float max)
 	}

 

 	fclose(file);

-	return TRUE;

+	return true;

 }

 

 

@@ -266,7 +266,7 @@ void ChangeBMPtoTGA(char *filename)
 

 // Reads a MOD file.

 

-BOOL CModFile::AddModel(char *filename, int first, BOOL bEdit, BOOL bMeta)

+bool CModFile::AddModel(char *filename, int first, bool bEdit, bool bMeta)

 {

 	FILE*		file;

 	InfoMOD		info;

@@ -276,7 +276,7 @@ BOOL CModFile::AddModel(char *filename, int first, BOOL bEdit, BOOL bMeta)
 

 	if ( m_engine->RetDebugMode() )

 	{

-		bMeta = FALSE;

+		bMeta = false;

 	}

 

 	if ( bMeta )

@@ -298,12 +298,12 @@ BOOL CModFile::AddModel(char *filename, int first, BOOL bEdit, BOOL bMeta)
 			err = g_metafile.Open("colobot2.dat", p+1);

 #endif

 		}

-		if ( err != 0 )  bMeta = FALSE;

+		if ( err != 0 )  bMeta = false;

 	}

 	if ( !bMeta )

 	{

 		file = fopen(filename, "rb");

-		if ( file == NULL )  return FALSE;

+		if ( file == NULL )  return false;

 	}

 

 	if ( bMeta )

@@ -477,12 +477,12 @@ BOOL CModFile::AddModel(char *filename, int first, BOOL bEdit, BOOL bMeta)
 	{

 		fclose(file);

 	}

-	return TRUE;

+	return true;

 }

 

 // Reads a MOD file.

 

-BOOL CModFile::ReadModel(char *filename, BOOL bEdit, BOOL bMeta)

+bool CModFile::ReadModel(char *filename, bool bEdit, bool bMeta)

 {

 	m_triangleUsed = 0;

 	return AddModel(filename, 0, bEdit, bMeta);

@@ -491,15 +491,15 @@ BOOL CModFile::ReadModel(char *filename, BOOL bEdit, BOOL bMeta)
 

 // Writes a MOD file.

 

-BOOL CModFile::WriteModel(char *filename)

+bool CModFile::WriteModel(char *filename)

 {

 	FILE*		file;

 	InfoMOD		info;

 

-	if ( m_triangleUsed == 0 )  return FALSE;

+	if ( m_triangleUsed == 0 )  return false;

 

 	file = fopen(filename, "wb");

-	if ( file == NULL )  return FALSE;

+	if ( file == NULL )  return false;

 

 	ZeroMemory(&info, sizeof(InfoMOD));

 	info.rev   = 1;

@@ -510,13 +510,13 @@ BOOL CModFile::WriteModel(char *filename)
 	fwrite(m_triangleTable, sizeof(ModelTriangle), m_triangleUsed, file);

 

 	fclose(file);

-	return TRUE;

+	return true;

 }

 

 

 // Creates the object in the 3D engine.

 

-BOOL CModFile::CreateEngineObject(int objRank, int addState)

+bool CModFile::CreateEngineObject(int objRank, int addState)

 {

 #if 0

 	char	texName2[20];

@@ -556,9 +556,9 @@ BOOL CModFile::CreateEngineObject(int objRank, int addState)
 							  state+addState,

 							  m_triangleTable[i].texName, texName2,

 							  m_triangleTable[i].min,

-							  m_triangleTable[i].max, FALSE);

+							  m_triangleTable[i].max, false);

 	}

-	return TRUE;

+	return true;

 #else

 	char	texName1[20];

 	char	texName2[20];

@@ -604,9 +604,9 @@ BOOL CModFile::CreateEngineObject(int objRank, int addState)
 							  state+addState,

 							  texName1, texName2,

 							  m_triangleTable[i].min,

-							  m_triangleTable[i].max, FALSE);

+							  m_triangleTable[i].max, false);

 	}

-	return TRUE;

+	return true;

 #endif

 }

 

diff --git a/src/common/modfile.h b/src/common/modfile.h
index 8c11101..c6fc43b 100644
--- a/src/common/modfile.h
+++ b/src/common/modfile.h
@@ -29,8 +29,8 @@ class CInstanceManager;
 

 typedef struct

 {

-	char			bUsed;		// TRUE -> using

-	char			bSelect;	// TRUE -> selected

+	char			bUsed;		// true -> using

+	char			bSelect;	// true -> selected

 	D3DVERTEX		p1;

 	D3DVERTEX		p2;

 	D3DVERTEX		p3;

@@ -43,8 +43,8 @@ OldModelTriangle1;		// length = 196 bytes
 

 typedef struct

 {

-	char			bUsed;		// TRUE -> used

-	char			bSelect;	// TRUE -> selected

+	char			bUsed;		// true -> used

+	char			bSelect;	// true -> selected

 	D3DVERTEX		p1;

 	D3DVERTEX		p2;

 	D3DVERTEX		p3;

@@ -62,8 +62,8 @@ OldModelTriangle2;
 

 typedef struct

 {

-	char			bUsed;		// TRUE -> used

-	char			bSelect;	// TRUE -> selected

+	char			bUsed;		// true -> used

+	char			bSelect;	// true -> selected

 	D3DVERTEX2		p1;

 	D3DVERTEX2		p2;

 	D3DVERTEX2		p3;

@@ -88,12 +88,12 @@ public:
 	CModFile(CInstanceManager* iMan);

 	~CModFile();

 

-	BOOL			ReadDXF(char *filename, float min, float max);

-	BOOL			AddModel(char *filename, int first, BOOL bEdit=FALSE, BOOL bMeta=TRUE);

-	BOOL			ReadModel(char *filename, BOOL bEdit=FALSE, BOOL bMeta=TRUE);

-	BOOL			WriteModel(char *filename);

+	bool			ReadDXF(char *filename, float min, float max);

+	bool			AddModel(char *filename, int first, bool bEdit=false, bool bMeta=true);

+	bool			ReadModel(char *filename, bool bEdit=false, bool bMeta=true);

+	bool			WriteModel(char *filename);

 

-	BOOL			CreateEngineObject(int objRank, int addState=0);

+	bool			CreateEngineObject(int objRank, int addState=0);

 	void			Mirror();

 

 	void			SetTriangleUsed(int total);

@@ -104,7 +104,7 @@ public:
 	float			RetHeight(D3DVECTOR pos);

 

 protected:

-	BOOL			CreateTriangle(D3DVECTOR p1, D3DVECTOR p2, D3DVECTOR p3, float min, float max);

+	bool			CreateTriangle(D3DVECTOR p1, D3DVECTOR p2, D3DVECTOR p3, float min, float max);

 

 protected:

 	CInstanceManager* m_iMan;

diff --git a/src/common/profile.cpp b/src/common/profile.cpp
index 864cc22..ab7904b 100644
--- a/src/common/profile.cpp
+++ b/src/common/profile.cpp
@@ -33,24 +33,24 @@ static char g_filename[100];
 

 

 

-BOOL InitCurrentDirectory()

+bool InitCurrentDirectory()

 {

 #if _SCHOOL

 	_fullpath(g_filename, "ceebot.ini", 100);

 #else

 	_fullpath(g_filename, "colobot.ini", 100);

 #endif

-	return TRUE;

+	return true;

 }

 

 

-BOOL SetProfileString(char* section, char* key, char* string)

+bool SetProfileString(char* section, char* key, char* string)

 {

 	WritePrivateProfileString(section, key, string, g_filename);

-	return TRUE;

+	return true;

 }

 

-BOOL GetProfileString(char* section, char* key, char* buffer, int max)

+bool GetProfileString(char* section, char* key, char* buffer, int max)

 {

 	int		nb;

 

@@ -58,22 +58,22 @@ BOOL GetProfileString(char* section, char* key, char* buffer, int max)
 	if ( nb == 0 )

 	{

 		buffer[0] = 0;

-		return FALSE;

+		return false;

 	}

-	return TRUE;

+	return true;

 }

 

 

-BOOL SetProfileInt(char* section, char* key, int value)

+bool SetProfileInt(char* section, char* key, int value)

 {

 	char	s[20];

 

 	sprintf(s, "%d", value);

 	WritePrivateProfileString(section, key, s, g_filename);

-	return TRUE;

+	return true;

 }

 

-BOOL GetProfileInt(char* section, char* key, int &value)

+bool GetProfileInt(char* section, char* key, int &value)

 {

 	char	s[20];

 	int		nb;

@@ -82,23 +82,23 @@ BOOL GetProfileInt(char* section, char* key, int &value)
 	if ( nb == 0 )

 	{

 		value = 0;

-		return FALSE;

+		return false;

 	}

 	sscanf(s, "%d", &value);

-	return TRUE;

+	return true;

 }

 

 

-BOOL SetProfileFloat(char* section, char* key, float value)

+bool SetProfileFloat(char* section, char* key, float value)

 {

 	char	s[20];

 

 	sprintf(s, "%.2f", value);

 	WritePrivateProfileString(section, key, s, g_filename);

-	return TRUE;

+	return true;

 }

 

-BOOL GetProfileFloat(char* section, char* key, float &value)

+bool GetProfileFloat(char* section, char* key, float &value)

 {

 	char	s[20];

 	int		nb;

@@ -107,10 +107,10 @@ BOOL GetProfileFloat(char* section, char* key, float &value)
 	if ( nb == 0 )

 	{

 		value = 0.0f;

-		return FALSE;

+		return false;

 	}

 	sscanf(s, "%f", &value);

-	return TRUE;

+	return true;

 }

 

 

diff --git a/src/common/profile.h b/src/common/profile.h
index aaf25a7..3a2d870 100644
--- a/src/common/profile.h
+++ b/src/common/profile.h
@@ -23,12 +23,12 @@
 #define D3D_OVERLOADS

 

 

-extern BOOL	InitCurrentDirectory();

-extern BOOL	SetProfileString(char* section, char* key, char* string);

-extern BOOL	GetProfileString(char* section, char* key, char* buffer, int max);

-extern BOOL	SetProfileInt(char* section, char* key, int value);

-extern BOOL	GetProfileInt(char* section, char* key, int &value);

-extern BOOL	SetProfileFloat(char* section, char* key, float value);

-extern BOOL	GetProfileFloat(char* section, char* key, float &value);

+extern bool	InitCurrentDirectory();

+extern bool	SetProfileString(char* section, char* key, char* string);

+extern bool	GetProfileString(char* section, char* key, char* buffer, int max);

+extern bool	SetProfileInt(char* section, char* key, int value);

+extern bool	GetProfileInt(char* section, char* key, int &value);

+extern bool	SetProfileFloat(char* section, char* key, float value);

+extern bool	GetProfileFloat(char* section, char* key, float &value);

 

 

diff --git a/src/common/restext.cpp b/src/common/restext.cpp
index 42fd438..34c91f2 100644
--- a/src/common/restext.cpp
+++ b/src/common/restext.cpp
@@ -84,7 +84,7 @@ static KeyDesc keyTable[22] =
 

 // Seeks a key.

 

-BOOL SearchKey(char *cmd, KeyRank &key)

+bool SearchKey(char *cmd, KeyRank &key)

 {

 	int		i;

 

@@ -93,10 +93,10 @@ BOOL SearchKey(char *cmd, KeyRank &key)
 		if ( strstr(cmd, keyTable[i].name) == cmd )

 		{

 			key = keyTable[i].key;

-			return TRUE;

+			return true;

 		}

 	}

-	return FALSE;

+	return false;

 }

 

 // Replaces the commands "\key name;" in a text.

@@ -143,24 +143,24 @@ void PutKeyName(char* dst, char* src)
 

 // Returns the text of a resource.

 

-BOOL GetResource(ResType type, int num, char* text)

+bool GetResource(ResType type, int num, char* text)

 {

 	char	buffer[100];

 

 	if ( !GetResourceBase(type, num, buffer) )

 	{

 		text[0] = 0;

-		return FALSE;

+		return false;

 	}

 

 	PutKeyName(text, buffer);

-	return TRUE;

+	return true;

 }

 

 

 // Returns the text of a resource.

 

-BOOL GetResourceBase(ResType type, int num, char* text)

+bool GetResourceBase(ResType type, int num, char* text)

 {

 	text[0] = 0;

 

diff --git a/src/common/restext.h b/src/common/restext.h
index 3e57d20..2bcbb3d 100644
--- a/src/common/restext.h
+++ b/src/common/restext.h
@@ -149,9 +149,9 @@ static char			g_gamerName[100];
 

 extern void		SetEngine(CD3DEngine *engine);

 extern void		SetGlobalGamerName(char *name);

-extern BOOL		SearchKey(char *cmd, KeyRank &key);

+extern bool		SearchKey(char *cmd, KeyRank &key);

 extern void		PutKeyName(char* dst, char* src);

-extern BOOL		GetResource(ResType type, int num, char* text);

-extern BOOL		GetResourceBase(ResType type, int num, char* text);

+extern bool		GetResource(ResType type, int num, char* text);

+extern bool		GetResourceBase(ResType type, int num, char* text);