Mercurial > hg > Members > koba > t_dandy
changeset 7:23d54565aa7b
not working.
| author | koba <koba@cr.ie.u-ryukyu.ac.jp> |
|---|---|
| date | Wed, 15 Dec 2010 17:55:25 +0900 |
| parents | 9a92435eaee6 |
| children | e90c4a8f9dc8 |
| files | Character.c Dandy.cc Makefile TaskDandy.cc collision_task.cc ppe/tobject.h |
| diffstat | 6 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Character.c Tue Dec 14 16:55:39 2010 +0900 +++ b/Character.c Wed Dec 15 17:55:25 2010 +0900 @@ -16,6 +16,7 @@ #include "debug.h" #include "error.h" +#include "state_task.h" #define CHARACTER_MAX_POOL_SIZE 2048 @@ -143,6 +144,7 @@ CHARACTER *p; for(p = active_chara_list->next; p!= NULL ;p = p->next) { + // SimpleStateTask(p); p=(*p->state)(p); } }
--- a/Dandy.cc Tue Dec 14 16:55:39 2010 +0900 +++ b/Dandy.cc Wed Dec 15 17:55:25 2010 +0900 @@ -29,7 +29,6 @@ #include "matrix_calc.h" #include "Character.h" #include "Character_state.h" -#include "property.h" int use_keybord = 0; int cdp[20] = { 16, 16, 16, 17, 18, 0 };
--- a/Makefile Tue Dec 14 16:55:39 2010 +0900 +++ b/Makefile Wed Dec 15 17:55:25 2010 +0900 @@ -28,7 +28,7 @@ dandy: $(OBJS) Dandy.o collision.o $(CC) $(ABI) -o $@ $(OBJS) Dandy.o collision.o $(LIBS) -t_dandy: $(OBJS) $(TASK_OBJS) TaskDandy.o state_task.o collision_task.o +t_dandy: $(OBJS) $(TASK_OBJS) TaskDandy.o state_task.o collision_task.o $(CC) $(ABI) -o $@ $(OBJS) $(TASK_OBJS) TaskDandy.o state_task.o collision_task.o $(LIBS) clean:
--- a/TaskDandy.cc Tue Dec 14 16:55:39 2010 +0900 +++ b/TaskDandy.cc Wed Dec 15 17:55:25 2010 +0900 @@ -585,10 +585,8 @@ get_matrix(object->real_matrix, object->angle, object->xyz, scale, root->real_matrix); } - struct SGO_PAD pad[2]; - /* コントローラ状態の読み込み */ void Pad(SDL_Joystick *joy) {
--- a/collision_task.cc Tue Dec 14 16:55:39 2010 +0900 +++ b/collision_task.cc Wed Dec 15 17:55:25 2010 +0900 @@ -56,7 +56,9 @@ } enemycount += property->enemycount; - jiki = property->jiki; + jiki.bf = property->jiki.bf; + jiki.zanki = property->jiki.zanki; + jiki.muteki = property->jiki.muteki; *character = property->p; tlv3[0] = property->tlv3; infg = property->infg; @@ -72,7 +74,7 @@ } -CHARACTER * atari(CHARACTER *p) +CHARACTER *atari(CHARACTER *p) { int w, h, charno; CollisionPropertyPtr property = get_property(p);
--- a/ppe/tobject.h Tue Dec 14 16:55:39 2010 +0900 +++ b/ppe/tobject.h Wed Dec 15 17:55:25 2010 +0900 @@ -110,6 +110,6 @@ CHARACTER * noaction(CHARACTER *p); CHARACTER * delete_chara(CHARACTER *p); -extern void Bom(int x, int y, int bchar, bomchar *bchar); +void Bom(int x, int y, int bchar, bomchar *bchar); #endif