Mercurial > hg > old > magoroku_racing.bad
changeset 95:b0249b856488
change_ps2util
| author | Atuto SHIROMA <e095729@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Thu, 26 May 2011 18:13:40 +0900 |
| parents | 30d89b592bc0 |
| children | 0b65ca27f113 |
| files | TAGS gSprite.c gSprite.h libps2.h ps2util.c ps2util.h schedule.c |
| diffstat | 7 files changed, 549 insertions(+), 64 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/TAGS Thu May 26 18:13:40 2011 +0900 @@ -0,0 +1,356 @@ + +camera.h,74 +#define CAMERA_H2,17 +typedef struct camera{camera8,75 +} CAMERA;13,159 + +car.h,74 +#define CAR_H2,14 +typedef struct car 6,50 +} Car, *CarPtr;CarPtr19,471 + +carNode.h,23 +#define CARNODE_H2,18 + +col.h,157 +#define COL_H2,14 +typedef struct detection_face 8,72 +} ColFace, *ColFacePtr;ColFacePtr13,164 +typedef struct col_face_handler 15,189 +} ColFaceHd;19,285 + +controler.h,48 +typedef struct SGO_PAD 7,129 +} SGO_PAD;22,374 + +field.h,225 +#define FIELD_H2,16 +#define EFFECT_TEXTURE_USE 13,300 +#define EFFECT_ALPHABLEND_UNUSE 14,329 +#define EFFECT_SHADING_FLAT 15,363 +#define DEFAULT_SET 17,394 +typedef struct field 18,483 +} Field, *FieldPtr;FieldPtr26,669 + +gSprite.h,112 +#define GSPRITE_H2,18 +#define SPRITE_PRIO_FOREGROUND 5,81 +typedef struct sptable 7,115 +} SpriteTable;12,188 + +game.h,81 +#define GAME_H2,15 +typedef struct game 14,180 +} Game, *GamePtr;GamePtr21,364 + +libps2.h,316 +#define LIBPS2_H2,17 +typedef float FVECTOR[FVECTOR6,49 +typedef float FMATRIX[FMATRIX7,105 +typedef struct texture 11,193 +} TEXTURE;19,599 +typedef struct surface 23,646 +} SURFACE;32,1189 +typedef struct object 36,1242 +} OBJECT;43,1511 +} SPRITE;56,1808 +typedef struct popygon 65,1904 +} PolygonInfo;68,1956 + +linda.h,723 +#define LINDA_H2,16 +#define MODE_INIT 21,547 +#define MODE_WAIT 22,579 +#define MODE_WAIT_READY 23,611 +#define MODE_OPENING 24,643 +#define MODE_SELECT_CAR 25,675 +#define MODE_SELECT_COURSE 26,707 +#define MODE_READY 27,739 +#define MODE_MAIN_INIT 28,771 +#define MODE_MAIN_READY 29,803 +#define MODE_MAIN 30,835 +#define MODE_MAIN_PAUSE 31,867 +#define MODE_MAIN_GOAL 32,899 +#define MODE_MAIN_FINISH 33,931 +#define MODE_FINISH 34,963 +#define PLAYER_1P 36,996 +#define CLIENT_MAX 38,1017 +#define LINDA_ASK_ID 39,1038 +#define LINDA_HOST 40,1065 +#define PKT_MODE_OFFSET 43,1117 +#define PKT_CARID_OFFSET 44,1148 +#define PKT_COURSEID_OFFSET 45,1179 +#define PKT_DATA_OFFSET 46,1210 +#define PKT_HEADER_SIZE 48,1242 + +mytype.h,211 +#define RADIAN(3,18 +#define INIT_VECTOR(4,53 +#define NORM(5,122 +enum { X_AXIS=7,200 +enum { X_AXIS=0, Y_AXIS=7,200 +enum { X_AXIS=0, Y_AXIS=1, Z_AXIS=7,200 +enum { X_AXIS=0, Y_AXIS=1, Z_AXIS=2, W_AXIS=7,200 + +ps2util.h,117 +#define PS2UTIL_H2,18 +#define ALIGN_16BYTE 8,84 +typedef struct ps2sprite{ps2sprite22,350 +} ps2utilSprite;24,397 + +quotanion.h,25 +#define QUOTANION_H2,20 + +schedule.h,24 +#define SCHEDULE_H2,19 + +camera.c,138 +static CAMERA camera,13,216 +static CAMERA camera, def_camera;13,216 +camera_init(17,257 +void set_camera(55,1126 +camera_update(69,1471 + +car.c,342 +#define DEFAULT_SET 13,220 +#define BUFSIZE 14,309 +static FVECTOR location 17,364 +static FVECTOR direction 18,405 +car_create(29,621 +car_new_readCSV(77,1969 +car_init(120,2849 +car_swerve(141,3265 +car_accelerate(161,3830 +car_field_check(179,4441 +car_move(221,5528 +car_axis_rotation(237,5916 +car_update(270,6837 +car_destroy(284,7075 + +carNode.c,99 +static CarPtr car_list;12,195 +carNode_append(15,225 +carNode_draw(29,386 +carNode_destroy(41,509 + +col.c,90 +col_detect_approx(20,430 +col_orthocenter(46,1183 +col_detect(71,1848 +col_init(105,2611 + +controler.c,22 +bool padCheck(13,190 + +field.c,379 +#define BUFSIZE 13,222 +static int field_num_max 18,287 +static int field_num 19,317 +static FieldPtr field_list;21,344 +static FieldPtr field_actual;22,372 +field_create(25,419 +field_new_readCSV(72,1751 +field_init(141,3290 +field_draw(156,3558 +field_update(169,3864 +field_destroy(203,4538 +field_rap_increment(234,5050 +field_set_actual(246,5205 +field_get_actual(252,5270 + +gFont.c,570 +#define DEFOBJ 15,336 +#define SPRITE_COL 16,355 +#define SCREEN_HALF_W 17,379 +#define SCREEN_HALF_H 18,405 +#define CHAR_W_SIZE 19,431 +#define CHAR_H_SIZE 20,454 +static SpriteTable sptable[sptable22,478 +static unsigned int sp_counter;24,593 +static bool flag_spriteInited 25,626 +gFont_Init_Png(30,753 +gFont_Create(48,1116 +gFont_DefSprite(65,1448 +gFont_Init(74,1626 +gFont_PutSprite(92,1898 +gFont_Clear(110,2334 +gFont_Draw_Reset(121,2472 +get_number_char(129,2571 +gFont_SetString(138,2666 +gFont_SetStringInt(154,2927 +gFont_SetFont_OP(163,3069 + +gSprite.c,562 +#define DEFOBJ 8,123 +#define SPRITE_COL 9,142 +#define SCREEN_HALF_W 10,166 +#define SCREEN_HALF_H 11,192 +static SpriteTable sptable[sptable13,219 +static ps2utilSprite sp[sp14,257 +static unsigned int sp_counter;15,330 +static bool flag_spriteInited 16,363 +static TEXTURE *sprite_tex;sprite_tex18,449 +gSprite_DefSprite(21,483 +gSprite_PutSprite(30,671 +gSprite_PutSpriteEx(47,1147 +gSprite_Init_Png(65,1651 +gSprite_Create(86,2006 +gSprite_Init(105,2345 +gSprite_Clear(133,3440 +gSprite_Draw_Reset(146,3574 +gSprite_PutSprite_Pause(156,3668 + +game.c,45 +#define linda_init 18,322 +game_main(22,356 + +game_time.c,169 +int game_time_get_msec(6,67 +int game_time_conv_ms2cs 29,516 +int game_time_conv_ms2sec 34,603 +int game_time_conv_ms2minute 39,672 +void game_time_set_raptime 56,1044 + +linda.c,962 +static int my_id;18,343 +static CarPtr linda_carlist[linda_carlist19,361 +static int linda_seq[linda_seq20,404 +set_header(25,485 +get_header(35,658 +make_packet(49,879 +send_packet(71,1369 +get_packet(99,2012 +linda_set_schedule(119,2566 +static bool linda_sche_wait0(128,2771 +linda_sche_wait1(153,3298 +linda_sche_wait_ready0(168,3583 +linda_sche_wait_ready1(197,4113 +linda_sche_opening0(212,4394 +linda_sche_opening1(236,4876 +linda_sche_select_car0(251,5165 +linda_sche_select_car1(275,5659 +linda_sche_select_course0(290,5959 +linda_sche_select_course1(324,6669 +linda_sche_ready0(343,7056 +linda_sche_ready1(367,7531 +linda_sche_main_init(382,7813 +linda_sche_main_ready0(417,8558 +linda_sche_main_ready1(441,9033 +linda_sche_main(456,9305 +linda_update(502,10462 +linda_jiki_compareLocation(514,10639 +linda_jiki_compare(541,11148 +linda_jiki_update(555,11419 +linda_update(580,11983 +get_id(677,14408 +linda_env_init(695,14761 +linda_init(708,14871 + +main.c,40 +FILE *main_fp;main_fp6,83 +main(9,103 + +mytype.c,139 +static clock_t start;11,139 +static clock_t race_start;12,161 +wait_init(15,194 +wait(25,319 +time_RaceStart(40,495 +time_RaceTime(46,550 + +ps2util.c,1173 +OBJECT *ps2util_obj_Create_fromXML(ps2util_obj_Create_fromXML12,282 +void ps2util_obj_Set_effect(27,551 +void ps2_vu0_copy_vector(33,617 +void ps2util_obj_Renew_transMatrix(39,697 +TEXTURE* read_png_file(47,795 +int ps2util_tex_Set(56,935 +int ps2util_sprite_Create(61,987 +void ps2util_obj_Set_texture(67,1071 +void ps2_vu0_unit_matrix(72,1146 +void ps2_vu0_rot_matrix_y(77,1198 +void ps2_vu0_apply_matrix(83,1281 +void ps2_vu0_scale_vector(89,1365 +void ps2_vu0_add_vector(94,1458 +void ps2_vu0_outer_product(100,1555 +float ps2_vu0_inner_product(106,1648 +void ps2_vu0_mul_matrix(113,1743 +void ps2_vu0_copy_matrix(118,1825 +void ps2util_tex_Exclude(124,1906 +void ps2util_obj_Free(129,1957 +void ps2_vu0_sub_vector(136,2011 +void ps2_vu0_normalize(144,2087 +void xml_free(150,2175 +void ps2util_obj_Draw(156,2221 +void gSprite_Init(162,2274 +void ps2util_sprite_Destroy(168,2309 +void ps2util_sprite_Set_basicAttribute(176,2385 +void ps2util_sprite_Request(186,2691 +void ps2util_sprite_Unuse_alpha(192,2752 +void ps2util_graphic_Init(197,2817 +sprite_disappear(207,2925 +void delete_name_dictionary(229,3325 +void free_texture(262,4002 +int malloc_align16(277,4308 + +quotanion.c,69 +quotanion(11,226 +quotanion_rotmatrix(25,529 +degree2radian(47,1167 + +schedule.c,858 +#define linda_update(26,448 +#define MAXCAR 29,502 +#define MAXFIELD 30,543 +#define MAXRAP 31,587 +#define SP_SEL_CAR 32,622 +#define SP_SEL_COURSE 33,647 +static int start_time,56,1356 +static int start_time,time_count;56,1356 +static int RUNNIG=57,1390 +char raptime[raptime58,1411 +static int ranking 60,1430 +static int i=63,1473 +static int change_state 67,1575 +set_schedule_assumption(69,1616 +unset_schedule(76,1726 +set_schedule(82,1782 +graphic_init(89,1884 +play_init(96,2030 +game_env_init(104,2175 +sche_game_init(121,2388 +sche_game_opening(174,3422 +sche_game_select_car(206,3945 +sche_game_select_course(237,4637 +sche_game_ready(269,5345 +sche_game_main_init(296,5980 +sche_game_main_ready(306,6134 +sche_game_main(313,6275 +sche_game_main_goal(412,8522 +sche_game_main_finish(440,9128 +sche_game_main_finish2(450,9295 +schedule(463,9478 + +title_scene.c,313 + TITLE_INIT,6,82 + TITLE_MAIN,7,98 + TITLE_FINISH8,114 +} TITLE_STATE;9,131 +static ps2utilSprite title_sprite;12,148 +static TEXTURE *title_img;title_img14,184 +#define TITLE_IMG_FILE 16,212 +title_init(20,265 +title_init_call(41,735 +title_finish(47,786 +title_finish_call(55,919 +title_scene(61,968 + +light.c,0 + +title_scene.h,0 + +light.h,0 + +game_time.h,0 + +gFont.h,0
--- a/gSprite.c Thu May 26 15:04:10 2011 +0900 +++ b/gSprite.c Thu May 26 18:13:40 2011 +0900 @@ -29,38 +29,38 @@ void gSprite_PutSprite(int number, int x, int y) { - // ps2utilSprite *p = &sp[sp_counter]; + ps2utilSprite *p = &sp[sp_counter]; - /* ps2util_sprite_Set_basicAttribute( + ps2util_sprite_Set_basicAttribute( p, - (ushort)x, (ushort)y, - (ushort)sptable[number].tw*2, (ushort)sptable[number].th*2, - (ushort)sptable[number].tx, (ushort)sptable[number].ty, - (ushort)sptable[number].tw, (ushort)sptable[number].th, - SPRITE_PRIO_FOREGROUND);*/ + (unsigned short)x, (unsigned short)y, + (unsigned short)sptable[number].tw*2, (unsigned short)sptable[number].th*2, + (unsigned short)sptable[number].tx, (unsigned short)sptable[number].ty, + (unsigned short)sptable[number].tw, (unsigned short)sptable[number].th, + SPRITE_PRIO_FOREGROUND); - // ps2util_sprite_Request(p); + ps2util_sprite_Request(p); sp_counter++; } void gSprite_PutSpriteEx(int number, int x, int y, float w, float h) { - // ps2utilSprite *p = &sp[sp_counter]; + ps2utilSprite *p = &sp[sp_counter]; - /* ps2util_sprite_Set_basicAttribute( + ps2util_sprite_Set_basicAttribute( p, - (ushort)x, (ushort)y, - (ushort)sptable[number].tw*w, (ushort)sptable[number].th*h, - (ushort)sptable[number].tx, (ushort)sptable[number].ty, - (ushort)sptable[number].tw, (ushort)sptable[number].th, - SPRITE_PRIO_FOREGROUND);*/ + (unsigned short)x, (unsigned short)y, + (unsigned short)sptable[number].tw*w, (unsigned short)sptable[number].th*h, + (unsigned short)sptable[number].tx, (unsigned short)sptable[number].ty, + (unsigned short)sptable[number].tw, (unsigned short)sptable[number].th, + SPRITE_PRIO_FOREGROUND); - // ps2util_sprite_Request(p); + ps2util_sprite_Request(p); sp_counter++; } -/* + static void gSprite_Init_Png(char *texname) { @@ -79,9 +79,9 @@ } } -*/ + -/* + static void gSprite_Create() { @@ -99,14 +99,14 @@ flag_spriteInited = false; } -*/ + -/*void +void gSprite_Init() { - // ps2util_graphic_Init(); - // gSprite_Init_Png("img/main2.png"); - // gSprite_Create(); // スプライト生成 + ps2util_graphic_Init(); + gSprite_Init_Png("img/main2.png"); + gSprite_Create(); // スプライト生成 // スプライトの登録 @@ -126,9 +126,9 @@ // 本当は (82, 272,...)です。二つ目のコース絵がないので gSprite_DefSprite(82, 272, 1, 148, 114); -}*/ +} -/* + static void gSprite_Clear() { @@ -139,21 +139,21 @@ } sp_counter = 0; } -*/ + -/* + void gSprite_Draw_Reset() { - if (flag_spriteInited == TRUE) { + if (flag_spriteInited == true) { gSprite_Clear(); } } -*/ + -/* + void gSprite_PutSprite_Pause() { } -*/ +
--- a/gSprite.h Thu May 26 15:04:10 2011 +0900 +++ b/gSprite.h Thu May 26 18:13:40 2011 +0900 @@ -1,6 +1,9 @@ -/* - * $Id$ - */ +#ifndef GSPRITE_H +#define GSPRITE_H + +//スプライトの優先順位らしい ? +#define SPRITE_PRIO_FOREGROUND 1 + typedef struct sptable { int tx; int ty; @@ -8,8 +11,11 @@ int th; } SpriteTable; -//extern void gSprite_Init(); + +extern void gSprite_Init(); extern void gSprite_Draw_Reset(); extern void gSprite_PutSprite(int number, int x, int y); extern void gSprite_PutSpriteEx(int number, int x, int y, float w, float h); extern void gSprite_DefSprite(int number, int tx, int ty, int tw, int th); + +#endif
--- a/libps2.h Thu May 26 15:04:10 2011 +0900 +++ b/libps2.h Thu May 26 18:13:40 2011 +0900 @@ -43,6 +43,21 @@ } OBJECT; +//ps2 依存関係内の libps2.h からもってきた +typedef struct { + //GsSpritePacket* gs_packet; + unsigned char r, g, b, a; + unsigned short cx, cy; + unsigned short x, y, w, h; + unsigned short tex_x, tex_y, tex_w, tex_h; + unsigned long priority; + float scale; + float rot; +} SPRITE; + + + + /* 構造体 PolygonInfo が見当たらないので自作 作りは適当
--- a/ps2util.c Thu May 26 15:04:10 2011 +0900 +++ b/ps2util.c Thu May 26 18:13:40 2011 +0900 @@ -53,9 +53,14 @@ -void ps2util_tex_Set(TEXTURE* tex) +int ps2util_tex_Set(TEXTURE* tex) { - //none + return -1; +} + +int ps2util_sprite_Create(ps2utilSprite sp, TEXTURE *sprite_tex) +{ + return -1; } @@ -64,26 +69,51 @@ //none } -void ps2_vu0_unit_matrix(FMATRIX rot) +void ps2_vu0_unit_matrix(FMATRIX m) { - //none + m[0][1] = m[0][2] = m[0][3] = 0; + m[1][0] = m[1][2] = m[1][3] = 0; + m[2][0] = m[2][1] = m[2][3] = 0; + m[3][0] = m[3][1] = m[3][2] = 0; + m[0][0] = m[1][1] = m[2][2] = m[3][3] = 1.0; } -void ps2_vu0_rot_matrix_y(FMATRIX rot1, FMATRIX rot2, float radian) +void ps2_vu0_rot_matrix_y(FMATRIX result, FMATRIX m, float radian) { - //none + FMATRIX rot; + m[0][1] = m[0][2] = m[0][3] = 0; + m[1][0] = m[1][2] = m[1][3] = 0; + m[2][0] = m[2][1] = m[2][3] = 0; + m[3][0] = m[3][1] = m[3][2] = 0; + m[0][0] = m[1][1] = m[2][2] = m[3][3] = 1.0; + + m[0][0] = fsign(radian); + m[2][2] = fsign(radian); + m[0][2] = -fcos(radian); + m[2][0] = fcos(radian); + + FMATRIX m1 = m; + + ps2_vu0_mul_matrix(result, m1, m); + } -void ps2_vu0_apply_matrix(FVECTOR direction, FMATRIX rot, FVECTOR v) +void ps2_vu0_apply_matrix(FVECTOR result, FMATRIX m, FVECTOR v) { - //none + result[0] = m[0][0] * v[0] + m[0][1] * v[1] + m[0][2] * v[2] + m[0][3] * v[3] ; + result[1] = m[1][0] * v[0] + m[1][1] * v[1] + m[1][2] * v[2] + m[1][3] * v[3] ; + result[2] = m[2][0] * v[0] + m[2][1] * v[1] + m[2][2] * v[2] + m[2][3] * v[3] ; + result[3] = m[3][0] * v[0] + m[3][1] * v[1] + m[3][2] * v[2] + m[3][3] * v[3] ; } void ps2_vu0_scale_vector(FVECTOR mov, FVECTOR car_direction, float car_speed) { - //none + mov[0] = car_direction[0] * car_speed ; + mov[1] = car_direction[1] * car_speed ; + mov[2] = car_direction[2] * car_speed ; + mov[3] = car_direction[3]; } void ps2_vu0_add_vector(FVECTOR car_location1, FVECTOR car_location2,FVECTOR mov) @@ -92,16 +122,18 @@ } -void ps2_vu0_outer_product(FVECTOR rotaxis, FVECTOR car_vertical, FVECTOR yd) +void ps2_vu0_outer_product(FVECTOR result, FVECTOR v0, FVECTOR v1) { - //none + result[0] = v0[1] * v1[2] - v0[2] * v1[1] ; + result[1] = v0[0] * v1[2] - v0[2] * v1[0] ; + result[2] = v0[0] * v1[1] - v0[1] * v1[0] ; + result[3] = 1; } -float ps2_vu0_inner_product(FVECTOR yd, FVECTOR car_vertical) +float ps2_vu0_inner_product(FVECTOR v0, FVECTOR v1) { - float ret; - return ret; + return v0[0] * v1[0] + v0[1] * v1[1] + v0[2] * v1[2]; } @@ -110,9 +142,9 @@ //none } -void ps2_vu0_copy_matrix(FMATRIX car_body_transfer, FMATRIX pose) +void ps2_vu0_copy_matrix(FMATRIX from, FMATRIX to) { - //none + to = from; } @@ -121,9 +153,9 @@ //none } -void ps2util_obj_Free(OBJECT* p_body) +void ps2util_obj_Free(OBJECT* obj) { - //none + free(obj); } @@ -136,9 +168,13 @@ -void ps2_vu0_normalize(FVECTOR colface_normal1, FVECTOR colface_normal2) +void ps2_vu0_normalize(FVECTOR result, FVECTOR v) { - //none + float d = fsqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]); + result[0] = v[0] / d; + result[1] = v[1] / d; + result[2] = v[2] / d; + result[3] = 1; } @@ -168,6 +204,51 @@ +void ps2util_sprite_Set_basicAttribute(ps2utilSprite *p, + unsigned short x, unsigned short y, + unsigned short sptable_tw1, unsigned short sptable_th1, + unsigned short sptable_tx, unsigned short sptable_ty, + unsigned short sptable_tw2, unsigned short sptable_th2, + int sprite_prio_foreground) +{ + //none +} + +void ps2util_sprite_Request(ps2utilSprite *p) +{ + //none +} + + +void ps2util_sprite_Unuse_alpha(ps2utilSprite *sp) +{ + //none +} + +void ps2util_graphic_Init() +{ + //none +} + + +/* + ps2 依存関係の sprite.c より引用。 +*/ +inline void +sprite_disappear( SPRITE* sprite ) +{ + + int i; + GsSpritePacket* packet = sprite->gs_packet; + for (i=0; i<SPRITE_HAS_4VERTEXIS; i++) + packet->primData[i].xyz_addr = PS2_GS_XYZ3; + +} + + + + + @@ -223,6 +304,7 @@ /* ps2 依存関係内の、texture.c から拝借 この malloc によるメモリ取得をあちこちで行っているっぽい + cerium にある。 */ int malloc_align16(void *free, void *aligned, int size) {
--- a/ps2util.h Thu May 26 15:04:10 2011 +0900 +++ b/ps2util.h Thu May 26 18:13:40 2011 +0900 @@ -20,7 +20,7 @@ 絶対にあっていない。 */ typedef struct ps2sprite{ - + SPRITE* attribute; } ps2utilSprite; @@ -36,7 +36,7 @@ void ps2util_obj_Renew_transMatrix(OBJECT*); TEXTURE* read_png_file(char *texname); -void ps2util_tex_Set(TEXTURE*); +int ps2util_tex_Set(TEXTURE*); void ps2util_obj_Set_texture(OBJECT*, TEXTURE*); void ps2_vu0_unit_matrix(FMATRIX); void ps2_vu0_rot_matrix_y(FMATRIX , FMATRIX , float); @@ -72,4 +72,24 @@ void ps2util_sprite_Destroy(ps2utilSprite *title_sprite); + +void ps2util_sprite_Set_basicAttribute(ps2utilSprite *p, + unsigned short x, unsigned short y, + unsigned short sptable_tw1, unsigned short sptable_th1, + unsigned short sptable_tx, unsigned short sptable_ty, + unsigned short sptable_tw2, unsigned short sptable_th2, + int sprite_prio_foreground); +void ps2util_sprite_Request(ps2utilSprite *p); + +int ps2util_sprite_Create(ps2utilSprite *sp, TEXTURE *sprite_tex); +void ps2util_sprite_Unuse_alpha(ps2utilSprite *sp); +void ps2util_graphic_Init(); + +//ps2 依存関係の sprite.c より +inline void sprite_disappear( SPRITE *sprite ); + + + + + #endif
--- a/schedule.c Thu May 26 15:04:10 2011 +0900 +++ b/schedule.c Thu May 26 18:13:40 2011 +0900 @@ -35,8 +35,8 @@ static void set_schedule(Game *game); static void sche_game_init(Game *game); -static void sche_game_wait(Game *game); -static void sche_game_wait_ready(Game *game); +//static void sche_game_wait(Game *game); +//static void sche_game_wait_ready(Game *game); static void sche_game_opening(Game *game); static void sche_game_select_car(Game *game); static void sche_game_select_course(Game *game); @@ -112,7 +112,7 @@ ranking = 0; wait_init(); - linda_env_init(); + } @@ -125,8 +125,8 @@ camera_init(); #ifdef LINDA - sche_func = &sche_game_wait; - set_schedule_assumption(sche_game_wait); + //sche_func = &sche_game_wait; + //set_schedule_assumption(sche_game_wait); #else set_schedule_assumption(sche_game_opening); #endif @@ -135,20 +135,25 @@ /** * 通信対戦専用 * 全ユーザが接続するまで待つ + * ・・・だったんだけど、現在 linda を切っているため worning が出る。 + * ので cut する。 */ - +/* static void sche_game_wait(Game *game) { gFont_SetString("WAITING...", 200, 100); set_schedule_assumption(sche_game_wait_ready); } +*/ /** * 通信対戦専用 * 全ユーザの接続を確認したら呼び出す + * こいつも、linda がないので cut */ +/* static void sche_game_wait_ready(Game *game) { @@ -163,6 +168,7 @@ //WAIT_READY: return; } +*/ void sche_game_opening(Game *game)