remove constants to separate file; replace content with constat

Author: GSoftwareDevelopment

smm-conv/src/inc/load_smm.inc

@@ -30,7 +30,7 @@ Var
 Begin
   If f.getByte(noteTabId) Then exit;
   // read ID
-  If noteTabId>maxNoteTables-1 Then haltError('Bad index of note table definition');
+  If noteTabId>maxNoteTables-1 Then haltError(ERR_SMMFILE_NOTETABLE_BAD_ID);
 
   f.getBlock(IOBuf,NOTETABnameLength+64);
   // read data
@@ -54,31 +54,31 @@ Begin
 
   If (isSFX) Then
     Begin
-      If id>maxSFXs-1 Then haltError('Bad index of SFX definition');
+      If id>maxSFXs-1 Then haltError(ERR_SMMFILE_SFX_BAD_ID);
 
       If f.getByte(_sfxMode) Then exit;
       // read SFX Modulation Type
-      If _sfxMode>3 Then haltError('');
+      If _sfxMode>3 Then haltError(ERR_SMMFILE_SFX_MOD_BAD_ID);
 
       sfxmodes[id] := _sfxMode;
 
       If f.getByte(_sfxNoteTabOfs) Then exit;
       // read SFX note table index
-      If _sfxNoteTabOfs>3 Then haltError('Bad note table of SFX definition');
+      If _sfxNoteTabOfs>3 Then haltError(ERR_SMMFILE_SFX_NOTETABLE_BAD_ID);
       sfxnote[id] := _sfxNoteTabOfs*$40;
       inc(totalSFX);
     End
   Else
     Begin
-      If id-64>maxTABs-1 Then haltError('');
+      If id-64>maxTABs-1 Then haltError(ERR_SMMFILE_TAB_BAD_ID);
       id := id-64;
 
       inc(totalTAB);
     End;
 
   If f.getBlock(dataSize,2) Then exit;
   // read data size
-  If dataSize>256+nameLength Then haltError('Incorrect length of SFX/TAB data');
+  If dataSize>256+nameLength Then haltError(ERR_SMMFILE_INCORRECT_DATA_LENGTH);
 
   f.getBlock(IOBuf,dataSize);
   // read data
@@ -93,13 +93,15 @@ Begin
       move(IOBuf[0],sfxnames[id][1],len);
       sfxptr[id] := topPtr;
       sfxSizes[id] := dataSize;
+			sfxUsage[id] := id;
     End
   Else
     Begin
       tabnames[id][0] := char(len);
       move(IOBuf[0],tabnames[id][1],len);
       tabptr[id] := topPtr;
       tabSizes[id] := dataSize;
+			tabUsage[id] := id;
     End;
   move(IOBuf[nameLength],data[topPtr],dataSize);
   inc(topPtr,dataSize);
@@ -118,7 +120,7 @@ Begin
 
   If f.getBlock(dataSize,2) Then exit;
   // read data size
-  If dataSize>256 Then haltError('Incorrect song data length');
+  If dataSize>256 Then haltError(ERR_SMMFILE_INCORRECT_SONG_DATA_LENGTH);
 
   f.getBlock(song,dataSize);
   // read data
@@ -138,49 +140,49 @@ Begin
 End;
 
 Begin
-	// TODO: Sprawdź najpierw, czy plik źródłowy istnieje!
-	// TODO: Przerwij z błędem, jeżeli nie istnieje!
-
 	if verbose>0 then
 	begin
-		writeLn(stdout);
-		write(stdout,'Reading `'+fn+'` file...');
+		EOLStdOut;
+		writeStdOut(STDOUT_READING_SMM_FILE,[fn]);
 	end;
+	if not fileExists(fn) then
+    haltError(ERR_SOURCE_NOT_EXIST);
+
   totalSFX := 0;
   totalTAB := 0;
   f.openFile(fRead,fn);
   While (f.IOErr=0) And (Not f.EOF) Do
-    Begin
-      // get tag
-      If (Not f.getBlock(IOBuf,5)) Then
-        Begin
-          If compareTag(section_main) Then
-            loadMain()
-          Else If compareTag(section_NOTE) Then
-								loadNoteTab()
-          Else If compareTag(section_SFX) Then
-								loadDefinition(true,SFXNameLength)
-          Else If compareTag(section_TAB) Then
-								loadDefinition(false,TABNameLength)
-          Else If compareTag(section_SONG) Then
-								loadSONG()
-          Else
-            haltError('Incorrect TAG in source file');
-        End
-      Else
-        haltError('Unexpected end of file');
-      // break;
-    End;
+	Begin
+		// get tag
+		If (Not f.getBlock(IOBuf,5)) Then
+			Begin
+				If compareTag(section_main) Then
+					loadMain()
+				Else If compareTag(section_NOTE) Then
+							loadNoteTab()
+				Else If compareTag(section_SFX) Then
+							loadDefinition(true,SFXNameLength)
+				Else If compareTag(section_TAB) Then
+							loadDefinition(false,TABNameLength)
+				Else If compareTag(section_SONG) Then
+							loadSONG()
+				Else
+					haltError(ERR_SMMFILE_INCORRECT_TAG);
+			End
+		Else
+			haltError(ERR_SMMFiLE_UNEXPECTED_EOF);
+		// break;
+	End;
   If f.IOErr<>0 Then
-    haltError('Unexpected end of file');
+    haltError(ERR_SMMFiLE_UNEXPECTED_EOF);
   f.closeFile();
 
 	if verbose>0 then
 	begin
-		writeLn(stdout);
-		writeLn(stdout,totalSFX,' SFX(s) declared');
-		writeLn(stdout,totalTAB,' TAB(s) declared');
-		writeLn(stdout,'Data (SFXs & TABs) size: ',topPtr,' byte(s)');
-		writeLn(stdout);
+		EOLStdOut(2);
+		writeLnStdOut(STDOUT_SUMMARY_SFX,[totalSFX]);
+		writeLnStdOut(STDOUT_SUMMARY_TAB,[totalTAB]);
+		writeLnStdOut(STDOUT_SUMMARY_DATA_SIZE,[topPtr]);
+		EOLStdOut;
 	end;
 End;

smm-conv/src/inc/optimize.inc

@@ -1,4 +1,4 @@
-procedure SFXScanUsage();
+procedure ReduceSFX();
 var
 	nSFX:byte;
 
@@ -19,13 +19,13 @@ var
 				inc(tabofs);
 				rd2:=data[tabofs]; inc(tabofs);
 				if rd2 and $80<>0 then continue;
-				if rd2 and $3f=SFXCheck then result:=true;
+				if rd2 and $3f=SFXCheck then exit(true); // result:=true;
 			end;
 		end;
 	end;
 
 begin
-	if verbose>0 then Write(stdout,'SFX used: ');
+	writeStdOut(STDOUT_REDUCE_SFX_LIST,[]);
 	usedSFX:=0;
 	for nSFX:=0 to 63 do
 	begin
@@ -35,7 +35,7 @@ begin
 		if checkSFXinTABs(nSFX) then
 		begin
 			SFXUsage[nSFX]:=nSFX;
-			if verbose>0 then Write(stdout,'#',nSFX,' ');
+			writeStdOut(STDOUT_REDUCE_SFX_ID,[nSFX]);
 			inc(usedSFX);
 		end
 		else
@@ -44,14 +44,11 @@ begin
 		end;
 	end;
 
-	if verbose>0 then
-	begin
-		WriteLn(stdout);
-		WriteLn(stdout,'Summary: ',usedSFX,' SFX(s) is used.');
-	end;
+	EOLStdOut();
+	writeLnStdOut(STDOUT_REDUCE_SFX_SUMMARY,[usedSFX]);
 end;
 
-procedure SFXOptimize();
+procedure ReindexSFX();
 var
 	nSFX,newSFX:byte;
 	nTAB:Byte;
@@ -101,7 +98,7 @@ var
 			begin
 				oSFX:=rd2 and $3f;
 				nSFX:=SFXUsage[oSFX];
-				if nSFX=-1 then HaltError('Something goes wrong.');
+				if nSFX=-1 then HaltError(ERR_SFX_REINDEX);
 				rd2:=(rd2 and $c0) or nSFX;
 			end;
 			data[ntopptr]:=rd1; inc(ntopptr);
@@ -134,10 +131,14 @@ begin
 		changeSFXinTAB(nTAB);
 	end;
 	(* move(ndata,data,10240); *) topptr:=ntopptr;
-	if verbose>0 then writeLn(stdOut);
+	if verbose>0 then EOLStdOut();
 end;
 
-procedure TABScanUsage();
+//
+//
+//
+
+procedure ReduceTAB();
 var
 	nTAB:byte;
 
@@ -161,14 +162,14 @@ var
 
 				if se and $40=0 then
 				begin
-					if se and $3f=nTAB then result:=true;
+					if se and $3f=nTAB then exit(true); // result:=true;
 				end;
 			end;
 		until songofs=$100;
 	end;
 
 begin
-	if verbose>0 then Write(stdout,'TAB used: ');
+	writeStdOut(STDOUT_REDUCE_TAB_LIST,[]);
 	usedTAB:=0;
 	for nTAB:=0 to 63 do
 	begin
@@ -177,7 +178,7 @@ begin
 {$ENDIF}
 		if checkTABinSONG(nTAB) then
 		begin
-			if verbose>0 then Write(stdout,'#',nTAB,' ');
+			writeStdOut(STDOUT_REDUCE_TAB_ID,[nTAB]);
 			TABUsage[nTAB]:=nTAB;
 			inc(usedTAB);
 		end
@@ -187,14 +188,11 @@ begin
 		end;
 	end;
 
-	if verbose>0 then
-	begin
-		WriteLn(stdout);
-		WriteLn(stdout,'Summary: ',usedTAB,' TAB(s) is used.');
-	end;
+	EOLStdOut();
+	WriteLnStdOut(STDOUT_REDUCE_TAB_SUMMARY,[usedTAB]);
 end;
 
-procedure TABOptimize();
+procedure ReindexTAB();
 var
 	nSFX,nTAB,newTAB:byte;
 	songofs:word;