# HG changeset patch # User koba # Date 1296236801 -32400 # Node ID a80422eb44a9f8584b68e54fe435e39453e52dfa # Parent 2c33aa6a4a37524405df3b95f73d228c51aa0a5d bug fix.TODO:print delete message on videoNONE mode. diff -r 2c33aa6a4a37 -r a80422eb44a9 Character.c --- a/Character.c Fri Jan 28 19:05:00 2011 +0900 +++ b/Character.c Sat Jan 29 02:46:41 2011 +0900 @@ -113,9 +113,10 @@ break; } } - - q->chara_id = dtable[charano].count; - dtable[charano].count++; + + int number = enemystate[charano].charano; + q->chara_id = dtable[number].count; + dtable[number].count++; q->state = action; q->collision = atari; @@ -126,14 +127,14 @@ q->tama = tf; q->vit = enemystate[charano].p; q->score = enemystate[charano].sc; - q->charano = enemystate[charano].charano; + q->charano = number; q->s = 0; q->f = TRUE; if (q->tama == FALSE) { printf("F%d: CREATE [NAME]%s_%d [COORD]x= %f y= %f vx= %f vy= %f\n", - filpcount, dtable[q->charano].name, q->chara_id, + filpcount, dtable[number].name, q->chara_id, q->x, q->y, q->vx, q->vy); } diff -r 2c33aa6a4a37 -r a80422eb44a9 StateList.c --- a/StateList.c Fri Jan 28 19:05:00 2011 +0900 +++ b/StateList.c Sat Jan 29 02:46:41 2011 +0900 @@ -35,36 +35,36 @@ SetTaskState(STATE4, chara_state4, "chara_state4"); SetTaskState(STATE5, chara_state5, "chara_state5"); SetTaskState(STATE6, chara_state6, "chara_state6"); - SetTaskState(STATE6, chara_state7, "chara_state7"); - SetTaskState(STATE6, chara_state8, "chara_state8"); - SetTaskState(STATE6, chara_state9, "chara_state9"); - SetTaskState(STATE6, chara_state10, "chara_state10"); - SetTaskState(STATE6, chara_state11, "chara_state11"); - SetTaskState(STATE6, chara_state12, "chara_state12"); - SetTaskState(STATE7, chara_state13, "chara_state13"); + SetTaskState(STATE7, chara_state7, "chara_state7"); + SetTaskState(STATE8, chara_state8, "chara_state8"); + SetTaskState(STATE9, chara_state9, "chara_state9"); + SetTaskState(STATE10, chara_state10, "chara_state10"); + SetTaskState(STATE11, chara_state11, "chara_state11"); + SetTaskState(STATE12, chara_state12, "chara_state12"); + SetTaskState(STATE13, chara_state13, "chara_state13"); SetTaskState(STATE20, chara_state20, "chara_state20"); - SetTaskState(STATE20, chara_state21, "chara_state21"); - SetTaskState(STATE20, chara_state22, "chara_state22"); - SetTaskState(STATE20, chara_state23, "chara_state23"); - SetTaskState(STATE20, chara_state24, "chara_state24"); - SetTaskState(STATE20, chara_state25, "chara_state25"); - SetTaskState(STATE20, chara_state26, "chara_state26"); - SetTaskState(STATE20, chara_state27, "chara_state27"); - SetTaskState(STATE20, chara_state28, "chara_state28"); - SetTaskState(STATE20, chara_state29, "chara_state29"); - SetTaskState(STATE20, chara_state30, "chara_state30"); - SetTaskState(STATE20, chara_state31, "chara_state31"); - SetTaskState(STATE20, chara_state32, "chara_state32"); - SetTaskState(STATE20, chara_state33, "chara_state33"); - SetTaskState(STATE20, chara_state34, "chara_state34"); - SetTaskState(STATE20, chara_state35, "chara_state35"); - SetTaskState(STATE20, chara_state40, "chara_state40"); - SetTaskState(STATE20, chara_state41, "chara_state41"); + SetTaskState(STATE21, chara_state21, "chara_state21"); + SetTaskState(STATE22, chara_state22, "chara_state22"); + SetTaskState(STATE23, chara_state23, "chara_state23"); + SetTaskState(STATE24, chara_state24, "chara_state24"); + SetTaskState(STATE25, chara_state25, "chara_state25"); + SetTaskState(STATE26, chara_state26, "chara_state26"); + SetTaskState(STATE27, chara_state27, "chara_state27"); + SetTaskState(STATE28, chara_state28, "chara_state28"); + SetTaskState(STATE29, chara_state29, "chara_state29"); + SetTaskState(STATE30, chara_state30, "chara_state30"); + SetTaskState(STATE31, chara_state31, "chara_state31"); + SetTaskState(STATE32, chara_state32, "chara_state32"); + SetTaskState(STATE33, chara_state33, "chara_state33"); + SetTaskState(STATE34, chara_state34, "chara_state34"); + SetTaskState(STATE35, chara_state35, "chara_state35"); + SetTaskState(STATE40, chara_state40, "chara_state40"); + SetTaskState(STATE41, chara_state41, "chara_state41"); SetTaskState(STATE400, chara_state400, "chara_state400"); - SetTaskState(STATE400, chara_state401, "chara_state401"); - SetTaskState(STATE400, chara_state402, "chara_state402"); + SetTaskState(STATE401, chara_state401, "chara_state401"); + SetTaskState(STATE402, chara_state402, "chara_state402"); SetTaskState(STATE410, chara_state410, "chara_state410"); SetTaskState(STATE411, chara_state411, "chara_state411"); diff -r 2c33aa6a4a37 -r a80422eb44a9 ppe/chara_state4.cc --- a/ppe/chara_state4.cc Fri Jan 28 19:05:00 2011 +0900 +++ b/ppe/chara_state4.cc Sat Jan 29 02:46:41 2011 +0900 @@ -12,14 +12,13 @@ p->y += p->vy; p->x += p->vx; - if(p->y < jiki->y && p->y + 16 > jiki->y) - { + if ((p->y < jiki->y) && (p->y + 16 > jiki->y)) { p->vy = -2; p->vx = ((jiki->x > p->x) ? 4 : -4); p->task = STATE7; + } else { + p->task = STATE4; } - else p->task = STATE4; - *q = *p; return 0; } diff -r 2c33aa6a4a37 -r a80422eb44a9 state_task.cc --- a/state_task.cc Fri Jan 28 19:05:00 2011 +0900 +++ b/state_task.cc Sat Jan 29 02:46:41 2011 +0900 @@ -44,16 +44,19 @@ static int cpu_counter = SPE_1; -/* output 0~3 */ + static CPU_TYPE get_cpunum() { +/* cpu_counter += 1; if ((cpu_counter % SPE_5) == 0) { cpu_counter = SPE_1; } return (CPU_TYPE)cpu_counter; +*/ + return SPE_1; } static int @@ -605,7 +608,7 @@ printf("F%d: DELETE [NAME]%s_%d [COORD]x= %f y= %f vx= %f vy= %f\n", filpcount, dtable[p->charano].name, p->chara_id, p->x, p->y, p->vx, p->vy); - printf(" [TAMA]lv1 = %d, lv2 = %d [LASER]lv1 = %d\n", + printf(" [TAMA]lv1 = %d, lv2 = %d [LASER]lv1 = %d\n", tama_lv1_end, tama_lv2_end, laser_lv1_end); }