eric
/
Renegade-1.19
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'testing' 

Conflicts:
	SOURCE/BBSLIST.PAS

	modified:   BBSLIST.PAS
	new file:   UPGRADE/BBSLEDT.ASC
	new file:   UPGRADE/BBSLEH.ASC
	new file:   UPGRADE/BBSLEM.ASC
This commit is contained in:
R. Eric Wheeler 2013-07-21 01:10:26 -07:00
parent 2147e6cacd 9afcab2458
commit 22c80ee314
4 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SOURCE/BBSLIST.PAS
View File

@ -626,7 +626,11 @@ BEGIN
ReadBuffer('BBSLEM'); ReadBuffer('BBSLEM');
DisplayBuffer(BBSListMCI,@BBSList,Data2); DisplayBuffer(BBSListMCI,@BBSList,Data2);
NL; NL;
<<<<<<< HEAD
IF (PYNQ(' |03Would you like to edit this BBS Listing? |11',0,TRUE)) THEN IF (PYNQ(' |03Would you like to edit this BBS Listing? |11',0,TRUE)) THEN
=======
IF (PYNQ(' Would you like to edit this BBS Listing? ',0,TRUE)) THEN
>>>>>>> testing
BEGIN BEGIN
BBSListScriptFile(BBSList); BBSListScriptFile(BBSList);
@ -637,7 +641,11 @@ BEGIN
DisplayBuffer(BBSListMCI,@BBSList,Data2); DisplayBuffer(BBSListMCI,@BBSList,Data2);
PrintF('BBSNT'); PrintF('BBSNT');
NL; NL;
<<<<<<< HEAD
IF (PYNQ(' |03Would you like to save this BBS Listing? |11',0,TRUE)) THEN IF (PYNQ(' |03Would you like to save this BBS Listing? |11',0,TRUE)) THEN
=======
IF (PYNQ(' Would you like to save this BBS Listing? ',0,TRUE)) THEN
>>>>>>> testing
BEGIN BEGIN
Seek(BBSListFile,(Edit -1)); Seek(BBSListFile,(Edit -1));
BBSList.DateEdited := GetPackDateTime; BBSList.DateEdited := GetPackDateTime;
@ -731,7 +739,11 @@ BEGIN
PrintF('BBSLET'); PrintF('BBSLET');
NL; NL;
MPL(FileSize(BBSListFile)); MPL(FileSize(BBSListFile));
<<<<<<< HEAD
InputLongIntWOC(' View which BBS? :',Edit,[],1,FileSize(BBSListFile)); InputLongIntWOC(' View which BBS? :',Edit,[],1,FileSize(BBSListFile));
=======
InputLongIntWOC(' View which BBS? ',Edit,[],1,FileSize(BBSListFile));
>>>>>>> testing
Abort := (Edit <> 0 ); Abort := (Edit <> 0 );

4
SOURCE/UPGRADE/BBSLEDT.ASC Normal file
View File

@ -0,0 +1,4 @@
%CL
|03矬闡闡薩闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡醴
逖17|15 Num |16|03逖17|15 BBS Name |11Last Edited |16|03<30>
斂闡闡謐闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡囁

4
SOURCE/UPGRADE/BBSLEH.ASC Normal file
View File

@ -0,0 +1,4 @@
%CL
|03矬闡闡薩闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡醴
逖17|15 Num |16|03逖17|15 BBS Name |11Last Edited |16|03<30>
斂闡闡謐闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡闡囁

2
SOURCE/UPGRADE/BBSLEM.ASC Normal file
View File

@ -0,0 +1,2 @@
|12~RN |15~BN |16%LF