Mercurial > hg > Members > koba > t_dandy

comparison state_task.cc @ 53:b31bed246abd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
52:150e832193fe 53:b31bed246abd
82 updateState(SchedTask *s, void *chara, void *arg) 82 updateState(SchedTask *s, void *chara, void *arg)
83 { 83 {
84 CHARACTER *p = (CHARACTER*)chara; 84 CHARACTER *p = (CHARACTER*)chara;
85 85
86 int num = GetStateNum(p->task); 86 int num = GetStateNum(p->task);
87 p->state = state_list[num]; 87 p->state = state_list[num].state;
88 } 88 }
89 89
90 90
91 void 91 void
92 PrintCoordinate(SchedTask *s, void *chara, void *arg) 92 PrintCoordinate(SchedTask *s, void *chara, void *arg)
93 { 93 {
94 CHARACTER *p = (CHARACTER*)chara; 94 CHARACTER *p = (CHARACTER*)chara;
95 printf("x = %f, y = %f, vx = %f, vy = %f\n",p->x, p->y, p->vx, p->vy); 95 printf("x = %f, y = %f, vx = %f, vy = %f\n",p->x, p->y, p->vx, p->vy);
96 96
97 int num = GetStateNum(p->task); 97 int num = GetStateNum(p->task);
98 p->state = state_list[num]; 98 p->state = state_list[num].state;
99 } 99 }
100 100
101 101
102 void 102 void
103 freeObject(SchedTask *s, void *chara, void *obj) 103 freeObject(SchedTask *s, void *chara, void *obj)
105 free(obj); 105 free(obj);
106 106
107 CHARACTER *p = (CHARACTER*)chara; 107 CHARACTER *p = (CHARACTER*)chara;
108 108
109 int num = GetStateNum(p->task); 109 int num = GetStateNum(p->task);
110 p->state = state_list[num]; 110 p->state = state_list[num].state;
111 } 111 }
112 112
113 113
114 void 114 void
115 checkContainer(SchedTask *s, void *chara, void *obj) 115 checkContainer(SchedTask *s, void *chara, void *obj)
132 Puttama(obj_data->tama_type, obj_data->x, obj_data->y); 132 Puttama(obj_data->tama_type, obj_data->x, obj_data->y);
133 break; 133 break;
134 case Enemy: { 134 case Enemy: {
135 int task_num = GetStateNum(obj_data->task); 135 int task_num = GetStateNum(obj_data->task);
136 Putenemy(obj_data->charano, obj_data->x, obj_data->y, 136 Putenemy(obj_data->charano, obj_data->x, obj_data->y,
137 obj_data->vx, obj_data->vy, state_list[task_num]); 137 obj_data->vx, obj_data->vy, state_list[task_num].state);
138 break; 138 break;
139 } 139 }
140 case Def: 140 case Def:
141 ReDefSprite(obj_data->number, obj_data->w, obj_data->h, obj_data->color); 141 ReDefSprite(obj_data->number, obj_data->w, obj_data->h, obj_data->color);
142 break; 142 break;
152 break; 152 break;
153 } 153 }
154 } 154 }
155 } 155 }
156 int num = GetStateNum(p->task); 156 int num = GetStateNum(p->task);
157 p->state = state_list[num]; 157 p->state = state_list[num].state;
158 158
159 free(new_obj); 159 free(new_obj);
160 } 160 }
161 161
162 162
594 594
595 595
596 CHARACTER* 596 CHARACTER*
597 delete_chara(CHARACTER *p) 597 delete_chara(CHARACTER *p)
598 { 598 {
599 if (p->tama == FALSE) { 599 if (p->tama == FALSE) {
600 printf("F%d: DELETE [NAME]%s_%d [VIT]%lf [COORD]x= %f y= %f vx= %f vy= %f\n", 600 printf("F%d: DELETE [NAME]%s_%d [COORD]x= %f y= %f vx= %f vy= %f\n",
601 filpcount, dtable[p->charano].name, p->chara_id, p->vit, 601 filpcount, dtable[p->charano].name, p->chara_id,
602 p->x, p->y, p->vx, p->vy); 602 p->x, p->y, p->vx, p->vy);
603 } 603 printf(" [TAMA]lv1 = %d, lv2 = %d [LASER]lv1 = %d\n",
604 604 tama_lv1_end, tama_lv2_end, laser_lv1_end);
605 CHARACTER *parent = p; 605 }
606 p->f = FALSE; 606
607 p->state = noaction; 607 CHARACTER *parent = p;
608 p->collision = noaction; 608 p->f = FALSE;
609 return parent; 609 p->state = noaction;
610 p->collision = noaction;
611 return parent;
610 } 612 }
611 613
612 614
613 CHARACTER* 615 CHARACTER*
614 chara_state0(CHARACTER *p) 616 chara_state0(CHARACTER *p)
774 rinkf1 = 0; 776 rinkf1 = 0;
775 rinkf2 = 0; 777 rinkf2 = 0;
776 p->task = STATE25; 778 p->task = STATE25;
777 779
778 int num = GetStateNum(p->task); 780 int num = GetStateNum(p->task);
779 p->state = state_list[num]; 781 p->state = state_list[num].state;
780 return p; 782 return p;
781 } 783 }
782 784
783 CHARACTER* 785 CHARACTER*
784 chara_state25(CHARACTER *p) 786 chara_state25(CHARACTER *p)
911 { 913 {
912 kyeenemyno = p; 914 kyeenemyno = p;
913 p->task = STATE411; 915 p->task = STATE411;
914 916
915 int num = GetStateNum(p->task); 917 int num = GetStateNum(p->task);
916 p->state = state_list[num]; 918 p->state = state_list[num].state;
917 return p; 919 return p;
918 } 920 }
919 921
920 922
921 CHARACTER* 923 CHARACTER*