Bugfix to CLEAR when start==end.

Improved documentation in Makefile.inc.
Fixed DiscImage writes so that they are written to the correct DFS directory.

src/Makefile.inc

@@ -61,7 +61,8 @@ PLATFORM_LIST	+=		mingw-gcc4
 
 ifndef PLATFORM
 # Do checks with $(shell uname -s) and/or $(OSTYPE) here to try to automatically determine
-# the appropriate platform type
+# the appropriate platform type.  Ultimately, the goal is to automatically set the make
+# variable $(PLATFORM) to one of the values in PLATFORM_LIST, above.
 endif
 
 

src/discimage.cpp

@@ -168,7 +168,13 @@ DiscImage::~DiscImage()
 /*************************************************************************************************/
 void DiscImage::AddFile( const char* pName, const unsigned char* pAddr, int load, int exec, int len )
 {
-	(void)pAddr;
+	char dirName = '$';
+
+	if ( strlen( pName ) > 2 && pName[ 1 ] == '.' )
+	{
+		dirName = pName[ 0 ];
+		pName += 2;
+	}
 
 	if ( strlen( pName ) > 7 )
 	{
@@ -256,7 +262,7 @@ void DiscImage::AddFile( const char* pName, const unsigned char* pAddr, int load
 
 	// Write directory name
 
-	m_aCatalog[ 15 ] = '$';
+	m_aCatalog[ 15 ] = dirName;
 
 	// Write load address
 

src/objectcode.cpp

@@ -304,10 +304,16 @@ void ObjectCode::SetGuard( int addr )
 /*************************************************************************************************/
 void ObjectCode::Clear( int start, int end, bool bAll )
 {
-	assert( start < end );
+	assert( start <= end );
 	assert( start >= 0 && start < 0x10000 );
 	assert( end > 0 && end <= 0x10000 );
 
+	// Nothing to do if start == end
+	if ( start == end )
+	{
+		return;
+	}
+
 	if ( bAll )
 	{
 		// via CLEAR command