From 18616c6b0c62293b45cd2e0f8769dfbd7d8cee1b Mon Sep 17 00:00:00 2001 From: TempleOS-bot Date: Tue, 31 Jan 2017 07:27:27 -0500 Subject: [PATCH] Nightly update (ISO SHA-1 9be53ed) --- TempleOSCD/0000Boot/0000Kernel.BIN.C | Bin 192080 -> 192080 bytes TempleOSCD/Adam/ADefine.HC | 2 +- TempleOSCD/Apps/Budget/BgtAccts.HC | 4 ++-- TempleOSCD/Apps/Budget/BgtFile.HC | 8 ++++---- TempleOSCD/Apps/Budget/BgtMain.HC | 10 ++++++++-- TempleOSCD/Apps/Budget/Budget.HC | 6 +++--- TempleOSCD/Compiler/Compiler.BIN | Bin 192920 -> 192920 bytes TempleOSCD/Compiler/CompilerB.HH | 1 + TempleOSCD/Demo/AcctExample/PersonalMenu.DD | 2 +- TempleOSCD/Demo/AcctExample/Registry.HC | 2 +- TempleOSCD/Demo/AcctExample/TOS/TOSDistro.HC | 1 - TempleOSCD/Demo/AcctExample/TOS/TOSToHtml.HC | 1 - TempleOSCD/Doc/ChgLog.DD | 2 +- 13 files changed, 22 insertions(+), 17 deletions(-) diff --git a/TempleOSCD/0000Boot/0000Kernel.BIN.C b/TempleOSCD/0000Boot/0000Kernel.BIN.C index ca2938ffc6c52d5deb635068c101c0a60d5e3acf..d32d4a3223e2cce80cb315c0512df42fa3f9fd3c 100644 GIT binary patch delta 214 zcmca`hx@`E?g=LBUZ*>%uh?>LUdVEhc{2~o%Q!}z&EJypWEn4PPHlL`%3{qY%Q#)3 zfKhyMTH6H{hK$VO$yV(%S!6Y387IegDo*~-YyH?QbO zW`s#GCT@=D@(yIQ*u3I4OFGkx3)|N@G0x*>ES~Ng#8?mFp9^B-69+NwWimb$W=!3F zq?Xa$pD}ei&soNLc9w;oWEdwm#)@oTe1-9N0Aum?Y*nUzCX5W*v!a;99U0ecZ<@_? GE(ic74N#;2 delta 214 zcmca`hx@`E?g=LB)uxTbS8TaAFJ!sMyqSmPWgMf$=5I-PvWyour#3ueWpUw?Wt^^1 zz$iXBt?dF!d7d7_WUKa>ESj3KjFaO#6(|2_H)fXls4-cu!!next; } - StrFileWrite(BGT_STRINGS_FILE,table); + StrFileWrite(bgt_string_file,table); StrFileDel(table); size=sizeof(I64)*2+cnt1*BE_SIZE+cnt2*(BT_SIZE+BE_SIZE); @@ -112,7 +112,7 @@ U0 BgtDataWrite() tmpt=tmpt->next; } - FileWrite(BGT_DATA_FILE,buf,size); + FileWrite(bgt_data_file,buf,size); Free(buf); } diff --git a/TempleOSCD/Apps/Budget/BgtMain.HC b/TempleOSCD/Apps/Budget/BgtMain.HC index 05f6493..4c0ea73 100644 --- a/TempleOSCD/Apps/Budget/BgtMain.HC +++ b/TempleOSCD/Apps/Budget/BgtMain.HC @@ -50,7 +50,7 @@ Bool BgtPutKey(CDoc *doc,U8 *,I64 ch,I64 sc) PopUpOk( "Set the name and color of your accounts.\n" "To delete accounts, manually edit\n" "$$GREEN$$~/Budget/Accts.DD.Z$$FG$$."); - if (PopUpEd(BGT_ACCTS_FILE,Fs)) { + if (PopUpEd(bgt_accts_file,Fs)) { BgtAcctsRead; BgtRegen; } @@ -167,9 +167,15 @@ U0 BgtRegen() doc->user_put_key=&BgtPutKey; } -U0 Budget() +U0 Budget(U8 *dirname="~/Budget") { CDoc *pdoc,*ddoc,*old_put,*old_display; + + Cd(dirname); + bgt_string_file =FileNameAbs("Strs.DD.Z"); + bgt_accts_file =FileNameAbs("Accts.DD.Z"); + bgt_data_file =FileNameAbs("Bgt.DATA.Z"); + BgtAcctsRead; BgtDataRead; CBgtTemplatesExpand; diff --git a/TempleOSCD/Apps/Budget/Budget.HC b/TempleOSCD/Apps/Budget/Budget.HC index 0cc0d6b..27ca2b0 100644 --- a/TempleOSCD/Apps/Budget/Budget.HC +++ b/TempleOSCD/Apps/Budget/Budget.HC @@ -1,6 +1,6 @@ -#define BGT_STRINGS_FILE "~/Budget/Strs.DD.Z" -#define BGT_ACCTS_FILE "~/Budget/Accts.DD.Z" -#define BGT_DATA_FILE "~/Budget/Bgt.DATA.Z" +U8 *bgt_string_file; +U8 *bgt_accts_file; +U8 *bgt_data_file; #define BE_NORMAL 0 #define BE_GAS 1 diff --git a/TempleOSCD/Compiler/Compiler.BIN b/TempleOSCD/Compiler/Compiler.BIN index dd892dc175bcae74dd63f642480d9cd00371edb3..a7dd275cfda8648877535df903e7b3abb715df98 100644 GIT binary patch delta 124 zcmbR7n0v-!?hOTsOo`Vv7b!kF#OSd(^2vNg)|AYA2EEOHpDs^hP12NQWSCqyM|k@l zAI1bmMuqLNevAz)OljY?&kth!RK()iz{oH?K!!n0k>( gWO~6rMwacOLQH3rSQ#1k*%>Eok=XvvglX0u0PM>yzyJUM delta 129 zcmbR7n0v-!?hOTsObiU0ixi(7Vhr9K`D8vLOJ+Vp>U72iCXvko&!(iY=4r|@GE6R< zBfNc&4`Tu&qt13&KgI?YrWqOA=La!