Mercurial > hg > Members > koba > t_dandy

diff Character.c @ 34:7aaaaf5dde40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add new task.
author koba <koba@cr.ie.u-ryukyu.ac.jp>
date Fri, 07 Jan 2011 23:19:05 +0900
parents 39e643fc4f90
children 2c85322348cf
line wrap: on
line diff
--- a/Character.c	Wed Jan 05 14:41:26 2011 +0900
+++ b/Character.c	Fri Jan 07 23:19:05 2011 +0900
@@ -145,11 +145,9 @@
   CHARACTER *p;
   for(p = active_chara_list->next; p!=NULL;p = p->next)
     {
-      //      if((p->state != chara_state8) && (p->state != chara_state9)
-      //	 && (p->collision != noaction))
-      //	{
+      if((p->state != chara_state8) && (p->state != chara_state9)) {
 	  p=(*p->collision)(p);
-	  //	}
+      }
     }
 }
 
@@ -170,8 +168,8 @@
   CHARACTER *p;
   for(p = active_chara_list->next; p!=NULL; p = p->next)
     {
-      //      if((p->state != chara_state8) && (p->state != chara_state9))
-      //      {
+      if((p->state != chara_state8) && (p->state != chara_state9))
+	{
 	  if ((p->y > 964 + 32)
 	      || (p->x > 1688 + 50)
 	      || (p->y < 0 - 128)
@@ -181,6 +179,6 @@
 	      p->state = delete_chara;
 	      p->collision = noaction;
 	    }
-	  //	}
+	}
     }
 }