Mercurial > hg > Papers > 2011 > koba-master

changeset 13:d711f469cdb7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge branches.
author koba <koba@cr.ie.u-ryukyu.ac.jp>
date Tue, 15 Feb 2011 17:58:52 +0900
parents f953f01c58bf (diff) 059cb90dc73a (current diff)
children 19be75493fbb
files paper/dandy.tex paper/result.tex paper/unittest.tex
diffstat 3 files changed, 19 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/paper/dandy.tex	Tue Feb 08 15:17:47 2011 +0900
+++ b/paper/dandy.tex	Tue Feb 15 17:58:52 2011 +0900
@@ -110,9 +110,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;
 
@@ -152,25 +152,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}
 
--- a/paper/early.tex	Tue Feb 08 15:17:47 2011 +0900
+++ b/paper/early.tex	Tue Feb 15 17:58:52 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;
--- a/paper/unittest.tex	Tue Feb 08 15:17:47 2011 +0900
+++ b/paper/unittest.tex	Tue Feb 15 17:58:52 2011 +0900
@@ -80,7 +80,7 @@
 ...
       sg_root = sg_root->brother;
     } else {
-	...
+        ...
 \end{verbatim}
 
 このテストの結果、全てのオブジェクトの初期位置と状態遷移した値が正しいことが