# HG changeset patch # User Shinji KONO # Date 1297062055 -32400 # Node ID f953f01c58bf3cc012fdef73acb6fa5e443f0f33 # Parent 2dcc784d62e0a0b4002affea10505adb7ea4f059 expand diff -r 2dcc784d62e0 -r f953f01c58bf paper/dandy.tex --- a/paper/dandy.tex Mon Feb 07 15:47:01 2011 +0900 +++ b/paper/dandy.tex Mon Feb 07 16:00:55 2011 +0900 @@ -100,9 +100,9 @@ if(p->y + 96 < jiki->y && p->y + 128 > jiki->y) { - p->vy = 2; - p->vx = ((jiki->x > p->x) ? 4 : -4); - p->state_task = STATE0; + p->vy = 2; + p->vx = ((jiki->x > p->x) ? 4 : -4); + p->state_task = STATE0; } else p->state_task = STATE6; @@ -140,25 +140,25 @@ if((p->dt1 > 60) && (p->dt1 <= 70)) { if(p->dt1 % 2 == 1) - { + { // Puttama は弾丸オブジェクトを生成する - Puttama(0, rinkx - 16, rinky); - Puttama(0, rinkx, rinky); - Puttama(0, rinkx + 16, rinky); - } + Puttama(0, rinkx - 16, rinky); + Puttama(0, rinkx, rinky); + Puttama(0, rinkx + 16, rinky); + } } if((p->dt1 > 180) && (p->dt1 <= 240)) { if(p->dt1 % 2 == 1) - { - rinkf2 = 1; - Puttama(2, rinkx - 16, p->y - 32); - Puttama(3, rinkx + 32 - 16, p->y - 32); - } + { + rinkf2 = 1; + Puttama(2, rinkx - 16, p->y - 32); + Puttama(3, rinkx + 32 - 16, p->y - 32); + } else - { - rinkf2 = 2; - } + { + rinkf2 = 2; + } } \end{verbatim} diff -r 2dcc784d62e0 -r f953f01c58bf paper/early.tex --- a/paper/early.tex Mon Feb 07 15:47:01 2011 +0900 +++ b/paper/early.tex Mon Feb 07 16:00:55 2011 +0900 @@ -286,8 +286,8 @@ p->y += p->vy; p->x += p->vx; if ((p->y < jiki->y) && (p->y + 16 > jiki->y)) { - p->vy = -2; - p->vx = ((jiki->x > p->x) ? 4 : -4); + p->vy = -2; + p->vx = ((jiki->x > p->x) ? 4 : -4); } *q = *p; return 0; diff -r 2dcc784d62e0 -r f953f01c58bf paper/result.tex --- a/paper/result.tex Mon Feb 07 15:47:01 2011 +0900 +++ b/paper/result.tex Mon Feb 07 16:00:55 2011 +0900 @@ -203,27 +203,27 @@ int sf = rand1 % 4; if((sf == 0) || (sf == 1)) { - p->x = -35; - p->y = rand2 % (120 - 35); - p->vx = (rand3 % 4 + 1); - p->vy = rand4 % 3 + 1; - p->state_task = STATE23; + p->x = -35; + p->y = rand2 % (120 - 35); + p->vx = (rand3 % 4 + 1); + p->vy = rand4 % 3 + 1; + p->state_task = STATE23; } if((sf == 2)) { - p->x = rand2 % 290; - p->y = -30; - p->vx = rand3 % 3 - 1; - p->vy = (rand4 % 4 + 1); - p->state_task = STATE23; + p->x = rand2 % 290; + p->y = -30; + p->vx = rand3 % 3 - 1; + p->vy = (rand4 % 4 + 1); + p->state_task = STATE23; } if(sf == 3) { - p->x = 320; - p->y = rand2 % (120 - 35); - p->vx = (rand3 % 4 + 1) * -1; - p->vy = rand4 % 3 -1; - p->state_task = STATE23; + p->x = 320; + p->y = rand2 % (120 - 35); + p->vx = (rand3 % 4 + 1) * -1; + p->vy = rand4 % 3 -1; + p->state_task = STATE23; } smanager->swap(); diff -r 2dcc784d62e0 -r f953f01c58bf paper/unittest.tex --- a/paper/unittest.tex Mon Feb 07 15:47:01 2011 +0900 +++ b/paper/unittest.tex Mon Feb 07 16:00:55 2011 +0900 @@ -80,7 +80,7 @@ ... sg_root = sg_root->brother; } else { - ... + ... \end{verbatim} このテストの結果、全てのオブジェクトの初期位置と状態遷移した値が正しいことが