Nightly update (ISO SHA-1 8444f23)

This commit is contained in:
TempleOS-bot committed 2017-02-03 00:27:30 -05:00
1 parent aa53888517
commit 7980ccfc60
23 files changed
+1871 -1768

No files matched your search

+2 -2
View File
@@ -215,9 +215,9 @@ U0 AnimateTask(SpanAnimateStruct *a)
a->saved_ode=SpanSave(ode);
}
a->start_wall_t=tS;
ode->flags&=~ODEF_PAUSED;
ODEPause(ode,OFF);
} else {
ode->flags|=ODEF_PAUSED;
ODEPause(ode);
a->elapsed_t+=tS-a->start_wall_t;
}
old_run=run_bttn.state;
+1 -1
View File
@@ -1,7 +1,7 @@
CMathODE *SpanNew()
{
CMathODE *ode=ODENew(0,1e-4,ODEF_HAS_MASSES|ODEF_PAUSED);
ode->derivative=&MyDerivative;
ode->derive=&MyDerivative;
ode->drag_v2=0.002;
ode->drag_v3=0.00001;
ode->acceleration_limit=5e3;
+5 -5
View File
@@ -300,7 +300,7 @@ U0 Init()
next_action_key='1';
zoom=1.0;
ode=ODENew(0,1e-4,ODEF_HAS_MASSES);
ode->derivative=&MyDerivative;
ode->derive=&MyDerivative;
ode->acceleration_limit=5e3;
ode->drag_v2=0.000002;
ode->drag_v3=0.0000001;
@@ -323,7 +323,7 @@ U0 PlayShip()
I64 arg1,arg2;
F64 last_noise=0;
Bool okay;
ode->flags&=~ODEF_PAUSED;
ODEPause(ode,OFF);
MenuPush(
"File {"
" Abort(,CH_SHIFT_ESC);"
@@ -417,7 +417,7 @@ U0 EditShip()
MyMass *tmpm1=NULL,*tmpm2=NULL;
CCtrl *bt_edit_mode=CtrlBttnNew(0,5*FONT_HEIGHT+4,80,,EMD_MODES_NUM,
Define("ST_EDIT_MODES"),edit_mode_colors,&edit_mode_bttn);
ode->flags|=ODEF_PAUSED;
ODEPause(ode);
MenuPush(
"File {"
" Abort(,CH_SHIFT_ESC);"
@@ -534,7 +534,7 @@ U0 EditShip()
CenterMasses;
break;
case 'd':
ode->flags&=~ODEF_PAUSED;
ODEPause(ode,OFF);
ode->drag_v2=0.002;
ode->drag_v3=0.0001;
break;
@@ -572,7 +572,7 @@ U0 EditShip()
case MSG_KEY_UP:
switch (arg1) {
case 'd':
ode->flags|=ODEF_PAUSED;
ODEPause(ode);
ode->drag_v2=0.000002;
ode->drag_v3=0.0000001;
break;
+3 -3
View File
@@ -1317,7 +1317,7 @@ U0 InitLevel()
PlaceShip(ST_ENEMY1);
PlaceShip(ST_ENEMY2);
show_level_msg=TRUE;
ode->flags|=ODEF_PAUSED;
ODEPause(ode);
}
U0 Init()
@@ -1386,7 +1386,7 @@ U0 XCaliber()
Fs->draw_it=&DrawIt;
do {
ode=ODENew(0,0.01,ODEF_HAS_MASSES);
ode->derivative=&MyDerivative;
ode->derive=&MyDerivative;
ode->min_tolerance=1e-9;
ode->drag_v3=0.00001;
Init;
@@ -1492,7 +1492,7 @@ U0 XCaliber()
ch=GetKey(&sc);
if (ch=='\n')
ch=0;
ode->flags&=~ODEF_PAUSED;
ODEPause(ode,OFF);
show_level_msg=FALSE;
} else if (game_over) {
ch=ScanChar;