Rijn/TempleOS-Rijn
1
1 Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

TempleOS V5.03 Nightly (ISO SHA-1 9d79d10)

Browse Source
This commit is contained in:
Terry A. Davis authored and ohnx's Git Bot committed 2018-09-09 11:35:03 +02:00
1 parent 3b252c61be
commit 93181651aa
20 files changed
+94 -56
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Adam/ADefine.HC
+1 -1
View File
@@ -15,7 +15,7 @@ U0 LoadDocDefines()
//$LK,"DD_BOOT_HIGH_LOC_DVD",A="FF:::/Adam/Opt/Boot/BootDVD.HC,DD_BOOT_HIGH_LOC_DVD"$
$TR,"LineRep"$
$ID,2$DefinePrint("DD_TEMPLEOS_LOC","80,845");
$ID,2$DefinePrint("DD_TEMPLEOS_LOC","80,849");
$ID,-2$
DefinePrint("DD_MP_VECT","%08X",MP_VECT_ADDR);
DefinePrint("DD_MP_VECT_END","%08X",
Adam/ASnd.HC
+5 -8
View File
@@ -275,14 +275,11 @@ per second. It defaults to
ona=ONA_REST;
if (words && (word=LstSub(i++,words)) && StrCmp(word," "))
"%s",word;
d=JIFFY_FREQ*music.note_len/music.tempo;
if (tie) {
on_jiffies =d;
off_jiffies =0;
} else {
on_jiffies =d*music.stacatto_factor;
off_jiffies =d*(1.0-music.stacatto_factor);
}
on_jiffies =d*music.stacatto_factor;
off_jiffies =d*(1.0-music.stacatto_factor);
timeout_val+=on_jiffies;
timeout_val2=timeout_val+off_jiffies;
@@ -291,7 +288,7 @@ per second. It defaults to
SleepUntil(timeout_val);
music.tM_correction+=on_jiffies-ToI64(on_jiffies);
if (!music.mute)
if (!music.mute && !tie)
Snd;
SleepUntil(timeout_val2);
music.tM_correction+=off_jiffies-ToI64(off_jiffies);
Adam/Gr/SpriteEd.HC
+18 -23
View File
@@ -296,38 +296,38 @@ CSprite *SpriteTransformBitMap(I64 *r,CSprite *tmpg)
I64 x,y,z,minx,maxx,miny,maxy,minz,maxz;
CSprite *tmpg1;
x=0; y=0; z=0;
x=tmpg->pwhu.x1; y=tmpg->pwhu.y1; z=0;
Mat4x4MulXYZ(r,&x,&y,&z);
minx=maxx=x;
miny=maxy=y;
minz=maxz=z;
x=0; y=tmpg->pwhu.height; z=0;
x=tmpg->pwhu.x1; y=tmpg->pwhu.y1+tmpg->pwhu.height; z=0;
Mat4x4MulXYZ(r,&x,&y,&z);
if (x<minx) minx=x;
if (x>maxx) maxx=x;
if (y<minx) miny=y;
if (y>maxx) maxy=y;
if (z<minx) minz=z;
if (z>maxx) maxz=z;
if (y<miny) miny=y;
if (y>maxy) maxy=y;
if (z<minz) minz=z;
if (z>maxz) maxz=z;
x=tmpg->pwhu.width; y=0; z=0;
x=tmpg->pwhu.x1+tmpg->pwhu.width; y=tmpg->pwhu.y1; z=0;
Mat4x4MulXYZ(r,&x,&y,&z);
if (x<minx) minx=x;
if (x>maxx) maxx=x;
if (y<minx) miny=y;
if (y>maxx) maxy=y;
if (z<minx) minz=z;
if (z>maxx) maxz=z;
if (y<miny) miny=y;
if (y>maxy) maxy=y;
if (z<minz) minz=z;
if (z>maxz) maxz=z;
x=tmpg->pwhu.width; y=tmpg->pwhu.height; z=0;
x=tmpg->pwhu.x1+tmpg->pwhu.width; y=tmpg->pwhu.y1+tmpg->pwhu.height; z=0;
Mat4x4MulXYZ(r,&x,&y,&z);
if (x<minx) minx=x;
if (x>maxx) maxx=x;
if (y<minx) miny=y;
if (y>maxx) maxy=y;
if (z<minx) minz=z;
if (z>maxx) maxz=z;
if (y<miny) miny=y;
if (y>maxy) maxy=y;
if (z<minz) minz=z;
if (z>maxz) maxz=z;
dc3=DCNew(maxx-minx+1,maxy-miny+1);
@@ -345,8 +345,8 @@ CSprite *SpriteTransformBitMap(I64 *r,CSprite *tmpg)
DCMat4x4Set(dc3,r);
dc3->flags|=DCF_TRANSFORMATION;
dc3->x=-minx;
dc3->y=-miny;
dc3->x=tmpg->pwhu.x1-minx;
dc3->y=tmpg->pwhu.y1-miny;
dc3->z=-minz;
GrBlot3(dc3,0,0,0,img);
Free(img);
@@ -363,11 +363,6 @@ CSprite *SpriteTransformBitMap(I64 *r,CSprite *tmpg)
tmpg1->pwhu.x1=x;
tmpg1->pwhu.y1=y;
x=0; y=0; z=0;
Mat4x4MulXYZ(r,&x,&y,&z);
tmpg1->pwhu.x1+=minx-x;
tmpg1->pwhu.y1+=miny-y;
return tmpg1;
}
Adam/Opt/Utils/TOS.HC
+14 -2
View File
@@ -10,11 +10,17 @@ U0 TOSStaffIns()
"$$PURPLE$$$$TX+CX,\"Complete TOS install from TOS_Staff.ISO\"$$$$FG$$\n\n\n\n";
InsRereg;
"\nDownload TOS_Supplemental1.ISO.C\tfrom http://www.templeos.org\n";
"\nDownload TOS_Supplemental1.ISO.C\tfrom http://www.templeos.org\n"
"Download TOS_Supplemental2.ISO.C\tfrom http://www.templeos.org\n"
"Download TOS_Supplemental3.ISO.C\tfrom http://www.templeos.org\n";
if (PressAKey!=CH_SHIFT_ESC) {
if (HostChgDsk("/home/tad/Downloads/TOS_Supplemental1.ISO.C"))
CopyTree("T:/","~/Sup1");
if (HostChgDsk("/home/tad/Downloads/TOS_Supplemental2.ISO.C"))
CopyTree("T:/","~/Sup2");
if (HostChgDsk("/home/tad/Downloads/TOS_Supplemental3.ISO.C"))
CopyTree("T:/","~/Sup3");
Once("TOSBootHDIns;");
"\nDo you wish to run >$FG,2$TOSRegen;$FG$ to generate\n the "
@@ -41,13 +47,19 @@ public U0 TOSStdIns()
"$$PURPLE$$$$TX+CX,\"Complete TOS install from TOS_Distro.ISO\"$$$$FG$$\n\n\n\n";
InsRereg;
"\nDownload TOS_Supplemental1.ISO.C\tfrom http://www.templeos.org\n";
"\nDownload TOS_Supplemental1.ISO.C\tfrom http://www.templeos.org\n"
"Download TOS_Supplemental2.ISO.C\tfrom http://www.templeos.org\n"
"Download TOS_Supplemental3.ISO.C\tfrom http://www.templeos.org\n";
if (PressAKey!=CH_SHIFT_ESC) {
if (FileFind("/Demo/AcctExample"))
CopyTree("::/Demo/AcctExample","~");
if (HostChgDsk("/home/tad/Downloads/TOS_Supplemental1.ISO.C"))
CopyTree("T:/","~/Sup1");
if (HostChgDsk("/home/tad/Downloads/TOS_Supplemental2.ISO.C"))
CopyTree("T:/","~/Sup2");
if (HostChgDsk("/home/tad/Downloads/TOS_Supplemental3.ISO.C"))
CopyTree("T:/","~/Sup3");
Once("TOSBootHDIns;");
"\nDo you wish to run >$FG,2$TOSRegen;$FG$ to generate\n the distro ISO's ";