TempleOSCDV5.03.ISO

Demo/Games/CastleFrankenstein.HC

@@ -341,7 +341,7 @@ U0 DrawIt(CTask *task,CDC *dc)
   dc->y=task->pix_height-2*map_height;
   dc->z=0;
   dc->transform=&DCTransform;
-  dc->pen_width=2;
+  dc->thick=2;
   for (i=0;i<map_height;i++)
     for (j=0;j<map_width;j++) {
       dc->color=map[(map_height-1-i)*map_width+j];

Demo/Games/DunGen.HC

@@ -437,9 +437,9 @@ dg_done:
   } catch
     PutExcept;
   SettingsPop;
+  CleanUp;
   MenuPop;
   RegWrite("TempleOS/DunGen","F64 best_score=%5.4f;\n",best_score);
-  CleanUp;
 }
 
 DunGen;

Demo/Games/FlatTops.HC

@@ -844,9 +844,9 @@ nv_done:
     GetMsg(,,1<<MSG_KEY_UP);
   } catch
     PutExcept;
-  MenuPop;
   SettingsPop;
   CleanUp;
+  MenuPop;
 }
 
 FlatTops;

Demo/Games/MassSpring.HC

@@ -80,7 +80,7 @@ U0 PlaceSpring(MyMass *tmpm1,MyMass *tmpm2)
 U0 Init()
 {
   ode=ODENew(0,1e-4,ODEF_HAS_MASSES);
-  ode->derivative=&MyDerivative;
+  ode->derive=&MyDerivative;
   ode->drag_v2=0.002;
   ode->drag_v3=0.00001;
   ode->acceleration_limit=5e3;

Demo/Games/RawHide.HC

@@ -102,7 +102,7 @@ U0 RiverMake()
   for (y=MAP_BORDER;y<MAP_HEIGHT-MAP_BORDER;y++) {
     if (!(waterfall_y-9<y<waterfall_y+WATERFALL_HEIGHT+9)) {
       map_dc->color=YELLOW;
-      map_dc->pen_width=r_width[y]+10;
+      map_dc->thick=r_width[y]+10;
       GrPlot3(map_dc,r_x[y]+x.i32[1],y,0);
     }
     x=ClampI64(x+RandI32,-6*U32_MAX,6*U32_MAX);
@@ -111,7 +111,7 @@ U0 RiverMake()
   //Plot water
   for (y=MAP_BORDER;y<MAP_HEIGHT-MAP_BORDER;y++) {
     map_dc->color=BLUE;
-    map_dc->pen_width=r_width[y];
+    map_dc->thick=r_width[y];
     GrPlot3(map_dc,r_x[y],y,0);
   }
 }
@@ -471,7 +471,7 @@ U0 ReInit()
   //Plot fence
   for (i=FENCE_WIDTH;i>0;i-=16)
     Sprite3(map_dc,i,FENCE_HEIGHT,0,$IB,"<9>",BI=9$);
-  map_dc->pen_width=1;
+  map_dc->thick=1;
   map_dc->color=BROWN;
   for (i=0;i<FENCE_HEIGHT-16;i+=16)
     GrLine(map_dc,FENCE_WIDTH-1,i,FENCE_WIDTH-1,i+7);
@@ -479,7 +479,7 @@ U0 ReInit()
   GrLine(map_dc,FENCE_WIDTH,0,FENCE_WIDTH,FENCE_HEIGHT-6);
   RedrawGate;
 
-  map_dc->pen_width=MAP_BORDER;
+  map_dc->thick=MAP_BORDER;
   map_dc->color=RED;
   GrBorder(map_dc,MAP_BORDER/2,MAP_BORDER/2,
 	MAP_WIDTH-(MAP_BORDER+1)/2,MAP_HEIGHT-(MAP_BORDER+1)/2);
@@ -582,9 +582,9 @@ rh_done:
     GetMsg(,,1<<MSG_KEY_UP);
   } catch
     PutExcept;
-  MenuPop;
   SettingsPop;
   CleanUp;
+  MenuPop;
   RegWrite("TempleOS/RawHide","F64 best_score=%5.4f;\n",best_score);
 }
 

Demo/Games/Talons.HC

@@ -462,14 +462,14 @@ U0 ClawDraw(CDC *dc,I64 x1,I64 y1,I64 x2,I64 y2,I64 w,I64 segments,Bool talon)
 {
   I64 i,j;
   for (i=0,j=segments;i<segments;i++,j--) {
-    dc->pen_width=w;
+    dc->thick=w;
     dc->color=BLACK;
     GrLine3(dc,
 	j*x1/segments+i*x2/segments,
 	j*y1/segments+i*y2/segments,0,
 	(j-1)*x1/segments+(i+1)*x2/segments,
 	(j-1)*y1/segments+(i+1)*y2/segments,0);
-    dc->pen_width=w-2;
+    dc->thick=w-2;
     dc->color=YELLOW;
     GrLine3(dc,
 	j*x1/segments+i*x2/segments,
@@ -907,7 +907,7 @@ U0 Core0Talons()
     }
   }
 
-  dc->pen_width=2;
+  dc->thick=2;
   if (game_tf && fish_left)
     dc->color=WHITE;
   else
@@ -1226,8 +1226,8 @@ U0 Talons()
   SettingsPop;
   CleanUp;
   PostCleanUp;
-  RegWrite("TempleOS/Talons","F64 best_score=%5.4f;\n",best_score);
   MenuPop;
+  RegWrite("TempleOS/Talons","F64 best_score=%5.4f;\n",best_score);
 }
 
 Talons;

Demo/Games/TicTacToe.HC

@@ -4,14 +4,14 @@ I64 board_y[9]={150,150,150,250,250,250,350,350,350};
 
 U0 DrawX(CDC *dc,I64 x,I64 y)
 {
-  dc->pen_width=5;
+  dc->thick=5;
   GrLine3(dc,x-20,y-20,0,x+20,y+20,0);
   GrLine3(dc,x+20,y-20,0,x-20,y+20,0);
 }
 
 U0 DrawO(CDC *dc,I64 x,I64 y)
 {
-  dc->pen_width=5;
+  dc->thick=5;
   GrCircle3(dc,x,y,0,25);
 }
 
@@ -20,7 +20,7 @@ U0 DrawBoard(I64 player)
   I64 i;
   CDC *dc=DCAlias;
   DCFill;
-  dc->pen_width=5;
+  dc->thick=5;
   GrLine3(dc,200,100,0,200,400,0);
   GrLine3(dc,300,100,0,300,400,0);
   GrLine3(dc,100,200,0,400,200,0);

Demo/Games/TreeCheckers.HC

@@ -79,7 +79,7 @@ U0 DrawIt(CTask *task,CDC *dc)
       GrLine(dc,u[i].x,u[i].y,u[u[i].link].x,u[u[i].link].y);
       if (Blink) {
 	dc->color=BLUE;
-	dc->pen_width=6;
+	dc->thick=6;
 	GrPlot3(dc,(u[i].x+u[u[i].link].x)>>1,(u[i].y+u[u[i].link].y)>>1,0);
       }
     }

Demo/Games/Varoom.HC

@@ -313,7 +313,7 @@ U0 InitTrack()
   GrRect(track_map,0,0,track_map->width,track_map->height);
   tmpt=track_head.next;
   track_map->color=YELLOW;
-  track_map->pen_width=3;
+  track_map->thick=3;
   while (tmpt!=&track_head) {
     GrPlot3(track_map,track_map->width-(tmpt->x-t_minx)>>MAP_BITS,
 	  (tmpt->z-t_minz)>>MAP_BITS,0);
@@ -473,7 +473,7 @@ U0 DrawIt(CTask *task,CDC *dc)
   //Map
   GrBlot(dc,w-track_map->width,h-track_map->height,track_map);
 
-  dc->pen_width=2;
+  dc->thick=2;
   for (i=0;i<CARS_NUM;i++) {
     if (i)
       dc->color=LTPURPLE;
@@ -571,7 +571,7 @@ U0 InitBushes()
   Bush *tmpb;
   I64 i,j,x,z;
   track_map->color=LTGREEN;
-  track_map->pen_width=1;
+  track_map->thick=1;
   for (i=0;i<BUSHES_NUM;i++) {
     tmpb=&b[i];
 
@@ -694,8 +694,8 @@ U0 Varoom()
 vr_done: //Don't goto out of try
   } catch
     PutExcept;
-  CleanUp;
   SettingsPop;
+  CleanUp;
   MenuPop;
   RegWrite("TempleOS/Varoom","F64 best_score=%5.4f;\n",best_score);
 }

Demo/Games/Wenceslas.HC

@@ -126,7 +126,7 @@ U0 DrawIt(CTask *task,CDC *dc)
   Peasant *tmpp;
   F64 tt;
 
-  dc->pen_width=1;
+  dc->thick=1;
   for (i=0;i<TREES_NUM;i++) {
     if (trees[i].y<=h/2) {//Draw trees behind house
       if (trees[i].fire_frame_idx) {
@@ -163,14 +163,14 @@ U0 DrawIt(CTask *task,CDC *dc)
       dc->color=DKGRAY;
     else
       dc->color=LTGRAY;
-    dc->pen_width=4;
+    dc->thick=4;
     GrPlot3(dc,tmpst->x,tmpst->y,0);
     tmpst=tmpst->next;
   }
 
   DCDepthBufAlloc(dc);
   dc->flags|=DCF_TRANSFORMATION;
-  dc->pen_width=1;
+  dc->thick=1;
   tmpp=peasant_head.next;
   while (tmpp!=&peasant_head) {
     Mat4x4IdentEqu(r);
@@ -188,7 +188,7 @@ U0 DrawIt(CTask *task,CDC *dc)
     tmpp=tmpp->next;
   }
 
-  dc->pen_width=1;
+  dc->thick=1;
   Mat4x4IdentEqu(r);
   Mat4x4RotY(r,king_é+ã/2);
   Mat4x4RotX(r,ã/6);
@@ -202,7 +202,7 @@ U0 DrawIt(CTask *task,CDC *dc)
     Free(tmps);
   }
 
-  dc->pen_width=1;
+  dc->thick=1;
   dc->color=ROP_MONO|WHITE;
   for (y=snow_y%SNOW_TILE_SIZE-SNOW_TILE_SIZE;y<=h;y+=SNOW_TILE_SIZE)
     for (x=snow_x%SNOW_TILE_SIZE-SNOW_TILE_SIZE;x<=w;x+=SNOW_TILE_SIZE)
@@ -584,8 +584,8 @@ ws_done:
   } catch
     PutExcept;
   SettingsPop;
-  MenuPop;
   CleanUp;
+  MenuPop;
   RegWrite("TempleOS/Wenceslas","F64 best_score=%5.4f;\n",best_score);
 }
 

Demo/Games/Whap.HC

@@ -120,7 +120,7 @@ U0 Whap()
 	"  Exit(,CH_ESC);"
 	"}"
 	);
-  ode->derivative=&MyDerivative;
+  ode->derive=&MyDerivative;
   ode->drag_v2=0.002;
   ode->drag_v3=0.00001;
   ode->acceleration_limit=5e3;