TempleOSCD_140715.ISO

Apps/AfterEgypt/AfterEgypt.CPP

@@ -1,8 +1,7 @@
 I64 num_people=100;
 
-
 U0 SongTask(I64)
-{ //Song by the Holy Spirit
+{//Song by the Holy Spirit
   Fs->task_end_cb=&SndTaskEndCB;
   MusicSettingsRst;
   while (TRUE) {
@@ -21,7 +20,7 @@ U0 HoldCourt()
   FlushMsgs;
   DocDblBufStart;
 
-  NewLine;
+  '\n';
   accused=RandU32%3;
   "%s",LstSub(accused,"A man \0A woman \0A child \0");
 
@@ -37,8 +36,7 @@ U0 HoldCourt()
     ", again!";
   else
     '.';
-  NewLine(4);
-
+  "\n\n\n\n"
   "$$LM,4$$"
   "\n\n$$BT,\"Show Mercy\",LE=0$$\n\n"
   "\n\n$$BT,\"Punish\",LE=1$$\n\n"
@@ -63,7 +61,6 @@ U0 HoldCourt()
 #define T_HELP		9
 #define T_QUIT		10
 
-
 Bool TakeTurn()
 {
   I64 i;
@@ -129,7 +126,7 @@ Bool TakeTurn()
 	ViewComics;
 	break;
       case T_HELP:
-	PopUp("Ed(\"::/Adam/God/HSNotes.TXT.Z\");",Fs);
+	PopUpEd("::/Adam/God/HSNotes.TXT.Z",Fs);
 	PopUpOk("Add your own story-line...\nLike old school toys.\n");
 	break;
     }
@@ -189,7 +186,7 @@ U0 AfterEgypt()
   WinMax;
   PopUp("Trailer;",Fs);
   WordStat;
-  try //This is to catch <CTRL-ALT-C>.
+  try //Catch <CTRL-ALT-c>.
     while (TakeTurn);
   catch
     PutExcept;

Apps/AfterEgypt/Comics.CPP

@@ -21,6 +21,6 @@ U0 ViewComics()
       break;
   }
   DocDel(doc);
-  DirLstDel(tempde1);
+  DirTreeDel(tempde1);
 }
 

Apps/AfterEgypt/Horeb2MP.CPP

@@ -37,12 +37,12 @@ U0 MPDrawHoreb(CDC *dc2)
       }
       Sprite3B(dc,s*tempo->x1+cx,s*tempo->y1+h,tempo->z1,imgs[tempo->type]);
       dc->flags&=~(DCF_SYMMETRY|DCF_JUST_MIRROR);
-      if (tempo==&objs[O_BURNING_BUSH]) { //draw burning bush
+      if (tempo==&objs[O_BURNING_BUSH]) {//draw burning bush
 	dc->x=s*tempo->x1+cx;
 	dc->y=s*tempo->y1+h;
 	dc->z=tempo->z1;
 	dc->pen_width=1;
-	dc->color=win_updates&15;
+	dc->color=winmgr.updates&15;
 	for (j=0;j<45;j++) {
 	  m=Sqr(Rand); a=2*ã*Rand;
 	  P2R(&x1,&y1,m,a);

Apps/AfterEgypt/Horeb2SP.CPP

@@ -59,13 +59,13 @@ U0 DrawHoreb(CTask *task,CDC *dc)
     }
     Sprite3B(dc,s*tempo->x1+cx,s*tempo->y1+h,0,imgs[tempo->type]);
     dc->flags&=~(DCF_SYMMETRY|DCF_JUST_MIRROR);
-    if (o_sort[i]==&objs[O_BURNING_BUSH]) { //draw burning bush
+    if (o_sort[i]==&objs[O_BURNING_BUSH]) {//draw burning bush
       dc->x=s*tempo->x1+cx;
       dc->y=s*tempo->y1+h;
       dc->z=0;
 
       dc->pen_width=1;
-      dc->color=win_updates&15;
+      dc->color=winmgr.updates&15;
       for (j=0;j<45;j++) {
 	m=Sqr(Rand); a=2*ã*Rand;
 	P2R(&x1,&y1,m,a);

Apps/AfterEgypt/Horeb3.CPP

@@ -1,5 +1,5 @@
 U0 AnimateTask(I64)
-{ //Preemption is off after Spawn
+{//Preemption is off after Spawn
   I64 i;
   F64 t;
   Obj *tempo;
@@ -86,7 +86,7 @@ U0 Horeb()
   "Play {"
   "  Restart(,'\n');"
   "  Fwd(,,SC_CURSOR_UP);"
-  "  Backward(,,SC_CURSOR_DOWN);"
+  "  Bwd(,,SC_CURSOR_DOWN);"
   "  Left(,,SC_CURSOR_LEFT);"
   "  Right(,,SC_CURSOR_RIGHT);"
       "}"
@@ -94,15 +94,15 @@ U0 Horeb()
   SettingsPush(Fs,TSF_SAME_SONG); //See $LK,"SettingsPush",A="MN:SettingsPush"$
   try {
     Fs->text_attr=YELLOW<<4+BLUE;
-    Fs->win_inhibit=WIG_TASK_DFT-WIF_FOCUS-WIF_GRAB_SCROLL-WIF_MENU;
+    Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS-WIF_SELF_GRAB_SCROLL-WIF_FOCUS_TASK_MENU;
     WordStat;
     WinMax;
     WinBorder;
     Preempt(OFF);
 
     DocClear;
-    "$$BG,LTCYAN$$"; NewLine(6);
-    "$$BG,YELLOW$$"; NewLine(30);
+    "$$BG,LTCYAN$$%h6c",'\n';
+    "$$BG,YELLOW$$%h30c",'\n';
     BibleVerse(,"Exodus,3:1",21);
     Init;
     Fs->animate_task=Spawn(&AnimateTask,NULL,"Animate",,Fs);

Apps/AfterEgypt/Map.CPP

@@ -16,10 +16,10 @@ U0 DrawMap(CTask *,CDC *dc)
   last_x=x;
 }
 
-#define A1_MIN	0.02
-#define A1_MAX	0.05
-#define A2_MIN	0.15
-#define A2_MAX	0.30
+#define AE1_MIN	0.02
+#define AE1_MAX	0.05
+#define AE2_MIN	0.15
+#define AE2_MAX	0.30
 
 U0 AEMap()
 {
@@ -30,31 +30,31 @@ U0 AEMap()
       *r=NULL,
       x1=0,y1=0,z1=0,
       x_last=x1,y_last=y1;
-  F64 a,a1=(A1_MAX+A1_MIN)/2,a2=(A2_MAX+A2_MIN)/2,a2_total=a2,
+  F64 a,a1=(AE1_MAX+AE1_MIN)/2,a2=(AE2_MAX+AE2_MIN)/2,a2_total=a2,
       x_scale=ToF64(cx)/c_min,y_scale=ToF64(cy)/c_min;
   CDC *dc=DCAlias;
 
   SettingsPush(Fs,TSF_SAME_SONG); //See $LK,"SettingsPush",A="MN:SettingsPush"$
   Fs->text_attr=YELLOW<<4+BLUE;
   DocClear;
-  "$$BG,YELLOW$$"; NewLine(TEXT_ROWS);
+  "$$BG,YELLOW$$%h*c",TEXT_ROWS,'\n';
   BibleVerse(,"Exodus,16:35",3);
   Fs->draw_it=&DrawMap;
   try {
     while (!ScanChar) {
       dc->color=BLACK;
-      a1=Clamp(Wrap(a1+(A1_MAX+A1_MIN)/5.0*(Rand-0.5)),-A1_MAX,A1_MAX);
+      a1=Clamp(Wrap(a1+(AE1_MAX+AE1_MIN)/5.0*(Rand-0.5)),-AE1_MAX,AE1_MAX);
       a=a1;
-      if ( 0.0<=a<=A1_MIN) a=A1_MIN;
-      if (-A1_MIN<=a<=0.0) a=-A1_MIN;
+      if ( 0.0<=a<=AE1_MIN) a=AE1_MIN;
+      if (-AE1_MIN<=a<=0.0) a=-AE1_MIN;
       Free(r);
       r=GrRotZNew(a);
       GrRot(r,&x1,&y1,&z1);
 
-      a2=Clamp(Wrap(a2+(A2_MAX+A2_MIN)/5.0*(Rand-0.5)),-A2_MAX,A2_MAX);
+      a2=Clamp(Wrap(a2+(AE2_MAX+AE2_MIN)/5.0*(Rand-0.5)),-AE2_MAX,AE2_MAX);
       a=a2;
-      if ( 0.0<=a<=A2_MIN) a=A2_MIN;
-      if (-A2_MIN<=a<=0.0) a=-A2_MIN;
+      if ( 0.0<=a<=AE2_MIN) a=AE2_MIN;
+      if (-AE2_MIN<=a<=0.0) a=-AE2_MIN;
       a2_total+=a;
 
       x1=ClampI64(x1+6.0*Cos(a2_total),-c_min+10,c_min-10);