Nightly update (ISO SHA-1 54758c6)

This commit is contained in:
TempleOS-bot committed 2017-03-15 00:27:25 -04:00
1 parent 4f77433555
commit f9fe277d40
59 files changed
+212 -200

No files matched your search

+1 -1
View File
@@ -308,7 +308,7 @@ U0 DrawIt(CTask *task,CDC *dc)
dc->ls.y*=d;
dc->ls.z*=d;
dc->pen_width=2;
dc->thick=2;
dc->color=RED;
GrBorder(dc,COURT_BORDER,COURT_BORDER,
task->pix_width -1-COURT_BORDER,
+1 -1
View File
@@ -19,7 +19,7 @@ F64 base_compression_strength,base_tensile_strength,
base_const,base_cost;
CColorROPU32 color;
I32 pen_width;
I32 thick;
};
CMathODE *ode=NULL;
+8 -8
View File
@@ -33,7 +33,7 @@ U0 DrawIt(CTask *task,CDC *dc)
while (tmps!=&ode->next_spring) {
if (!(tmps->flags&SSF_INACTIVE)) {
dc->color=tmps->color;
dc->pen_width=tmps->pen_width;
dc->thick=tmps->thick;
GrLine3(dc,tmps->end1->x,tmps->end1->y,0,
tmps->end2->x,tmps->end2->y,0);
}
@@ -42,7 +42,7 @@ U0 DrawIt(CTask *task,CDC *dc)
if (cursor_mass) {
dc->color=RED;
dc->pen_width=2;
dc->thick=2;
GrLine3(dc,ms.pos.x-task->pix_left-task->scroll_x,
ms.pos.y-task->pix_top-task->scroll_y,0,
cursor_mass->x,cursor_mass->y,0);
@@ -137,15 +137,15 @@ U0 DrawSpring(CDC *dc,MyMass *tmpm,I64 x,I64 y)
switch (mode_bttn.state) {
case MD_CONCRETE:
dc->color=LTGRAY;
dc->pen_width=2;
dc->thick=2;
break;
case MD_STEEL:
dc->color=DKGRAY;
dc->pen_width=2;
dc->thick=2;
break;
case MD_WIRE:
dc->color=RED;
dc->pen_width=1;
dc->thick=1;
break;
}
GrLine3(dc,tmpm->x,tmpm->y,0,x,y,0);
@@ -164,7 +164,7 @@ U0 PlaceSpring(MyMass *tmpm1,MyMass *tmpm2)
tmps->base_cost = 0.30*COST_SCALE;
NullSpring(tmps,1.0);
tmps->color=LTGRAY;
tmps->pen_width=2;
tmps->thick=2;
break;
case MD_STEEL:
tmps->base_const = 1.00*SPRING_SCALE;
@@ -173,7 +173,7 @@ U0 PlaceSpring(MyMass *tmpm1,MyMass *tmpm2)
tmps->base_cost = 1.00*COST_SCALE;
NullSpring(tmps,1.0);
tmps->color=DKGRAY;
tmps->pen_width=2;
tmps->thick=2;
break;
case MD_WIRE:
tmps->base_const = 0.25*SPRING_SCALE;
@@ -182,7 +182,7 @@ U0 PlaceSpring(MyMass *tmpm1,MyMass *tmpm2)
tmps->base_cost = 0.10*COST_SCALE;
NullSpring(tmps,WIRE_PERCENT);
tmps->color=RED;
tmps->pen_width=1;
tmps->thick=1;
tmps->flags|=SSF_NO_COMPRESSION;
break;
}
+1 -1
View File
@@ -339,7 +339,7 @@ U0 DrawIt(CTask *task,CDC *dc)
Sprite3(dc,ls[i].x,yy,0,ls[i].img);
}
dc->pen_width=3;
dc->thick=3;
dc->color=BROWN;
GrLine3(dc,0, (finish_line-scroll_y)&(MAP_HEIGHT-1),0,
GR_WIDTH,(finish_line-scroll_y)&(MAP_HEIGHT-1),0);
Binary file not shown.
+3 -3
View File
@@ -150,10 +150,10 @@ U0 DrawRivers()
rivers[r][c]) {
RowCol2XY(&x2,&y2,r,c);
map_dc->color=LTBLUE;
map_dc->pen_width=4;
map_dc->thick=4;
GrLine3(map_dc,x1,y1,0,x2,y2,0);
map_dc->color=BLUE;
map_dc->pen_width=2;
map_dc->thick=2;
GrLine3(map_dc,x1,y1,0,x2,y2,0);
}
}
@@ -166,7 +166,7 @@ U0 DrawRoads()
I64 i,j,k,r,c;
F64 x1,y1,x2,y2;
map_dc->color=RED;
map_dc->pen_width=3;
map_dc->thick=3;
for (j=0;j<map_rows;j++)
for (i=0;i<map_cols;i++) {
if (roads[j][i]) {