moving submodule to a separate directory; minor procedure relocations in files

Author: GSoftwareDevelopment

SFXMM.pas

@@ -77,33 +77,37 @@
 {$i modules/io/io_manage.inc}
 {$i modules/io/io_options.inc}
 {$i modules/io/io_dir.inc}
-{$i modules/edit_ctrl.inc}
 {$i modules/vis_piano.inc}
 
 // modules
 {$i modules/gsd/gsd.pas}
 {$i modules/io/io.pas}
+{$i modules/notetune/notetune.pas}
 {$i modules/sfx/sfx.pas}
 {$i modules/tab/tab.pas}
 {$i modules/song/song.pas}
 
 procedure init();
 begin
+	initGraph(DLIST_ADDR,VIDEO_ADDR,SCREEN_BUFFER_ADDR); CHBAS:=CHARSET_PAGE;
 	PMGInit(PMG_BASE);
-	initGraph(DLIST_ADDR,VIDEO_ADDR,SCREEN_BUFFER_ADDR);
-	KRPDEL:=20;	KEYREP:=3; CHBAS:=CHARSET_PAGE;
+	Init_UI(RESOURCES_ADDR);
 
 	getTheme(0,PFCOLS); // set default theme color
 
-	Init_UI(RESOURCES_ADDR);
+// keyboard set
+	KRPDEL:=20;	KEYREP:=3;
+
+// keyboard resources set
 	chars_alphaNum:=resptr[scan_to_scr];
 	keys_alphaNum:=resptr[scan_key_codes];
-	note_names:=resptr[str_NoteNames];
 	keys_notes:=resptr[scan_piano_codes];
+
+// other resources set
+	note_names:=resptr[str_NoteNames];
 	themesNames:=resptr[themes_names_list];
 	octShift:=resptr[octaveShifts];
 
-	clearListBuf();
 	IO_clearAllData();
 
 	reset_pianoVis();
@@ -121,7 +125,6 @@ procedure init();
 	setFilename(defaultSearchPath,searchPath);
 
 	currentMenu:=0;
-
 end;
 
 begin

modules/edit_ctrl.inc

@@ -2,9 +2,9 @@
 	noteSetId:byte;
 	definedNoteTune:array[0..0] of byte;
 
-{$i modules/sfx/notetune_view.inc}
-{$i modules/sfx/notetune_edit.inc}
-{$i modules/sfx/notetune_options.inc}
+{$i modules/notetune/notetune_view.inc}
+{$i modules/notetune/notetune_edit.inc}
+{$i modules/notetune/notetune_options.inc}
 
 procedure setNoteTune();
 var
@@ -28,5 +28,4 @@ procedure setNoteTune();
 			break;
 	until false;
 	currentNoteTableOfs:=$FF;
-	SFXScreen();
 end;

modules/sfx/notetune.pas modules/notetune/notetune.pasmodules/sfx/notetune.pas renamed to modules/notetune/notetune.pas

@@ -1,4 +1,4 @@
-{$i modules/sfx/notetune_io.inc}
+{$i modules/notetune/notetune_io.inc}
 
 procedure NoteTune_setName();
 begin

modules/sfx/notetune_edit.inc modules/notetune/notetune_edit.incmodules/sfx/notetune_edit.inc renamed to modules/notetune/notetune_edit.inc

@@ -1,4 +1,3 @@
-{$i modules/sfx/notetune.pas}
 {$i modules/sfx/sfx_io.inc}
 
 procedure setSFXNoteTable();
@@ -41,7 +40,10 @@ begin
 			1: setSFXNoteTable();
 			2: setSFXModMode();
 			4: if SFXPtr[currentSFX]<>$FFFF then
-					setNoteTune()
+				begin
+					setNoteTune();
+					SFXScreen();
+				end
 				else
 					showError(msg_UnknownDefinition);
 			5: SFX_IO_Options();

modules/sfx/notetune_io.inc modules/notetune/notetune_io.incmodules/sfx/notetune_io.inc renamed to modules/notetune/notetune_io.inc

@@ -1,6 +1,33 @@
-function getResPtr(resId:byte):pointer;
+var
+	ScreenTm,PLYtm,PLYstate:byte;
+
+procedure PlayFlash();
+begin
+	if (timer-PLYtm>=$10) then
+	begin
+		PLYtm:=timer;
+		PLYstate:=2-PLYstate;
+		colorHLine(60,0,4,1+PLYstate);
+//		move(@screen[60],@video[60],4);
+	end;
+end;
+
+procedure controlEditKeys(key:byte; winSize:shortint; max:byte; var _pos,_shift:byte; pcKey,ncKey:byte);
+var step:shortint;
+
 begin
-	result:=resptr[resId];
+	if (key and $80=$80) then
+	begin
+		key:=key and $7f;
+		step:=winSize;
+	end
+	else
+		step:=1;
+	if key=pcKey then
+		moveCursor(-step,winSize,max,_pos,_shift)
+	else
+		if key=ncKey then
+			moveCursor(step,winSize,max,_pos,_shift);
 end;
 
 procedure clearListBuf();