Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 1377 → Rev 1378

/demos/trunk/astro/rock.c
17,7 → 17,7
int kill_rock;
rock_pos rocks[ROCK_NMAX];
 
extern volatile int shark_running;
extern PID shutdown_task_PID;
 
void draw_rock(int x, int y, int r, int c)
{
272,7 → 272,7
pid_RC = task_create("RockCreator", rock_creator, &ms, NULL);
if (pid_RC == NIL) {
sys_shutdown_message("Could not create task <RockCreator>\n");
shark_running = 0;
task_activate(shutdown_task_PID);
return;
} else
task_activate(pid_RC);
/demos/trunk/astro/astro.c
24,7 → 24,7
 
rock_ini rock_new;
 
extern volatile int shark_running;
extern PID shutdown_task_PID;
 
TASK shot(int i)
{
374,7 → 374,7
pid = task_create("Astro", astro, &ms, NULL);
if (pid == NIL) {
sys_shutdown_message("Could not create task <astro>\n");
shark_running = 0;
task_activate(shutdown_task_PID);
return;
} else
task_activate(pid);
387,7 → 387,7
pid = task_create("Taken", look, &mp, NULL);
if (pid == NIL) {
sys_shutdown_message("Could not create task <Taken>\n");
shark_running = 0;
task_activate(shutdown_task_PID);
return;
} else
task_activate(pid);
403,7 → 403,7
pid_TL = task_create("TurnLeft", turn, &mp, NULL);
if (pid_TL == NIL) {
sys_shutdown_message("Could not create task <Turn L>\n");
shark_running = 0;
task_activate(shutdown_task_PID);
return;
}
 
418,7 → 418,7
pid_TR = task_create("TurnRight", turn, &mp, NULL);
if (pid_TR == NIL) {
sys_shutdown_message("Could not create task <Turn R>\n");
shark_running = 0;
task_activate(shutdown_task_PID);
return;
}
 
433,7 → 433,7
pid_SU = task_create("SpeedUP", speed, &mp, NULL);
if (pid_SU == NIL) {
sys_shutdown_message("Could not create task <Speed UP>\n");
shark_running = 0;
task_activate(shutdown_task_PID);
return;
}
 
448,7 → 448,7
pid_SD = task_create("SpeedDOWN", speed, &mp, NULL);
if (pid_SD == NIL) {
sys_shutdown_message("Could not create task <Speed DOWN>\n");
shark_running = 0;
task_activate(shutdown_task_PID);
return;
}
 
463,7 → 463,7
pid_SZ = task_create("SpeedZERO", speed, &mp, NULL);
if (pid_SZ == NIL) {
sys_shutdown_message("Could not create task <Speed ZERO>\n");
shark_running = 0;
task_activate(shutdown_task_PID);
return;
}
 
475,7 → 475,7
pid = task_create("MoveAstro", move, &mp, NULL);
if (pid == NIL) {
sys_shutdown_message("Could not create task <MoveAstro>\n");
shark_running = 0;
task_activate(shutdown_task_PID);
return;
} else
task_activate(pid);
492,7 → 492,7
pid_FL = task_create("FlipAstro", turn, &mp, NULL);
if (pid_FL == NIL) {
sys_shutdown_message("Could not create task <Flip Astro>\n");
shark_running = 0;
task_activate(shutdown_task_PID);
return;
}
#endif
/demos/trunk/astro/asteroid.c
16,7 → 16,7
sem_t mx_mat, mx_grf, mx_pos, mx_vel, mx_xy, mx_rk, mx_rn; /* mutex semaphores */
sem_t mx_st_nrg, mx_st_scr, mx_st_kil, mx_st_liv; /* mutex semaphores */
 
volatile int shark_running = 1;
PID shutdown_task_PID = -1;
 
double dist_xy(int x1, int y1, int x2, int y2)
{
65,7 → 65,7
 
void end_func(KEY_EVT *k) {
 
shark_running = 0;
task_activate(shutdown_task_PID);
 
}
 
106,11 → 106,39
 
}
 
TASK shutdown_task_body(void *arg) {
 
device_drivers_close();
 
sys_shutdown_message("-- S.Ha.R.K. Closed --\n");
 
sys_end();
 
return NULL;
 
}
 
void set_shutdown_task() {
 
NRT_TASK_MODEL nrt;
 
nrt_task_default_model(nrt);
 
shutdown_task_PID = task_create("Shutdown Task",shutdown_task_body,&nrt,NULL);
if (shutdown_task_PID == NIL) {
sys_shutdown_message("Error: Cannot create shutdown task\n");
sys_end();
}
 
}
 
int main(int argc, char **argv)
{
KEY_EVT k;
TIME seme;
 
set_shutdown_task();
 
device_drivers_init();
 
k.flag = CNTR_BIT;
146,14 → 174,6
init_astro();
init_rock();
 
while(shark_running);
 
device_drivers_close();
 
sys_shutdown_message("-- S.Ha.R.K. Closed --\n");
 
sys_end();
 
return 0;
 
}
/demos/trunk/astro/stat.c
19,7 → 19,7
int lives; /* current player lives */
int crash; /* astro vs. rock */
 
extern volatile int shark_running;
extern PID shutdown_task_PID;
 
TASK stat_write()
{
131,7 → 131,7
pid = task_create("StatWrite", stat_write, &ms, NULL);
if (pid == NIL) {
sys_shutdown_message("Could not create task <StatWrite>\n");
shark_running = 0;
task_activate(shutdown_task_PID);
return;
} else
task_activate(pid);