diff state_task.cc @ 53:b31bed246abd

fix code and add log.
author koba <koba@cr.ie.u-ryukyu.ac.jp>
date Tue, 25 Jan 2011 17:43:30 +0900
parents 150e832193fe
children 3acdeb3dc3e8
line wrap: on
line diff
--- a/state_task.cc	Sun Jan 23 19:01:34 2011 +0900
+++ b/state_task.cc	Tue Jan 25 17:43:30 2011 +0900
@@ -84,7 +84,7 @@
     CHARACTER *p = (CHARACTER*)chara;
 
     int num = GetStateNum(p->task);
-    p->state = state_list[num];
+    p->state = state_list[num].state;
 }
 
 
@@ -95,7 +95,7 @@
     printf("x = %f, y = %f, vx = %f, vy = %f\n",p->x, p->y, p->vx, p->vy);
 
     int num = GetStateNum(p->task);
-    p->state = state_list[num];
+    p->state = state_list[num].state;
 }
 
 
@@ -107,7 +107,7 @@
     CHARACTER *p = (CHARACTER*)chara;
 
     int num = GetStateNum(p->task);
-    p->state = state_list[num];
+    p->state = state_list[num].state;
 }
 
 
@@ -134,7 +134,7 @@
 	    case Enemy: {
 		int task_num = GetStateNum(obj_data->task);
 		Putenemy(obj_data->charano, obj_data->x, obj_data->y,
-			 obj_data->vx, obj_data->vy, state_list[task_num]);
+			 obj_data->vx, obj_data->vy, state_list[task_num].state);
 		break;
 	    }
 	    case Def:
@@ -154,7 +154,7 @@
 	}
     }
     int num = GetStateNum(p->task);
-    p->state = state_list[num];
+    p->state = state_list[num].state;
     
     free(new_obj);
 }
@@ -596,17 +596,19 @@
 CHARACTER*
 delete_chara(CHARACTER *p)
 {
-  if (p->tama == FALSE) {
-    printf("F%d: DELETE  [NAME]%s_%d  [VIT]%lf  [COORD]x= %f  y= %f  vx= %f  vy= %f\n",
-	   filpcount, dtable[p->charano].name, p->chara_id, p->vit,
-	   p->x, p->y, p->vx, p->vy);
-  }
+    if (p->tama == FALSE) {
+	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",
+	       tama_lv1_end, tama_lv2_end, laser_lv1_end);
+    }
 
-  CHARACTER *parent = p;
-  p->f = FALSE;
-  p->state = noaction;
-  p->collision = noaction;
-  return parent;
+    CHARACTER *parent = p;
+    p->f = FALSE;
+    p->state = noaction;
+    p->collision = noaction;
+    return parent;
 }
 
 
@@ -776,7 +778,7 @@
     p->task = STATE25;
 
     int num = GetStateNum(p->task);
-    p->state = state_list[num];
+    p->state = state_list[num].state;
     return p;
 }
 
@@ -913,7 +915,7 @@
     p->task = STATE411;
     
     int num = GetStateNum(p->task);
-    p->state = state_list[num];
+    p->state = state_list[num].state;
     return p;
 }