# HG changeset patch
# User Atuto SHIROMA <e095729@ie.u-ryukyu.ac.jp>
# Date 1306998900 -32400
# Node ID afddacdf30ddcfb79e5b67b69e995d810a4ef125
# Parent  0b65ca27f113285727439617075d42787221187a
compile on Mac OS X -no Warning

diff -r 0b65ca27f113 -r afddacdf30dd .#game.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.#game.h	Thu Jun 02 16:15:00 2011 +0900
@@ -0,0 +1,1 @@
+e095729@takeuMac.local.92524
\ No newline at end of file
diff -r 0b65ca27f113 -r afddacdf30dd .#ps2util.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.#ps2util.h	Thu Jun 02 16:15:00 2011 +0900
@@ -0,0 +1,1 @@
+e095729@takeuMac.local.92524
\ No newline at end of file
diff -r 0b65ca27f113 -r afddacdf30dd car.h
--- a/car.h	Thu Jun 02 14:56:11 2011 +0900
+++ b/car.h	Thu Jun 02 16:15:00 2011 +0900
@@ -25,6 +25,6 @@
 void car_swerve(CarPtr, int);
 
 // ここで宣言したらgame.hと相互にincludeしちゃうからschedule.hのほうに書いてしまいました
-// void car_update( Game *game, CarPtr car );
+//void car_update( Game *game, CarPtr car );
 
 #endif
diff -r 0b65ca27f113 -r afddacdf30dd main.c
--- a/main.c	Thu Jun 02 14:56:11 2011 +0900
+++ b/main.c	Thu Jun 02 16:15:00 2011 +0900
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include "game.h"
-//#include "libps2.h"
-//#include "ps2util.h"
+#include "libps2.h"
+#include "ps2util.h"
 
 FILE *main_fp;
 
diff -r 0b65ca27f113 -r afddacdf30dd ps2util.c
--- a/ps2util.c	Thu Jun 02 14:56:11 2011 +0900
+++ b/ps2util.c	Thu Jun 02 16:15:00 2011 +0900
@@ -267,7 +267,7 @@
 
 #define PS2_GS_XYZ3 1 // なにかわからん定数だから適当に作りました
 
-inline void
+void
 sprite_disappear( SPRITE* sprite )
 {
   int i;
@@ -368,7 +368,7 @@
   printf("ps2util_sprite_Draw()\n");
 }
 
-void ps2util_graphic_Finish( void )
+void ps2util_graphic_Finish()
 {
   printf("ps2util_graphic_Finish()\n");
 }
diff -r 0b65ca27f113 -r afddacdf30dd ps2util.h
--- a/ps2util.h	Thu Jun 02 14:56:11 2011 +0900
+++ b/ps2util.h	Thu Jun 02 16:15:00 2011 +0900
@@ -26,7 +26,7 @@
   絶対にあっていない。
 */
 typedef struct ps2sprite{
-  SPRITE* attribute;
+  SPRITE attribute;
 } ps2utilSprite;
 
 
@@ -98,9 +98,10 @@
 void ps2util_sprite_Draw();
 
 //ps2 依存関係の sprite.c より
-inline void sprite_disappear( SPRITE *sprite );
+//inline
+void sprite_disappear( SPRITE *sprite );
 
-void ps2util_graphic_Finish( void );
+void ps2util_graphic_Finish();
 
 // title.cに書いてた
 void ps2util_sprite_Use_alpha( ps2utilSprite *title );
diff -r 0b65ca27f113 -r afddacdf30dd schedule.c
--- a/schedule.c	Thu Jun 02 14:56:11 2011 +0900
+++ b/schedule.c	Thu Jun 02 16:15:00 2011 +0900
@@ -43,8 +43,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);
@@ -140,8 +140,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
@@ -154,22 +154,22 @@
  * ので cut する。
  */
 
-
+/* linda を使用しないのでカットした
 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)
 {
@@ -184,6 +184,7 @@
  WAIT_READY:
   return;
 }
+ */
 
 
 void
diff -r 0b65ca27f113 -r afddacdf30dd test_vector.c
--- a/test_vector.c	Thu Jun 02 14:56:11 2011 +0900
+++ b/test_vector.c	Thu Jun 02 16:15:00 2011 +0900
@@ -8,6 +8,11 @@
 void output_FMATRIX(FMATRIX m);
 void all_init(FVECTOR v0, FVECTOR v1, FMATRIX m0, FMATRIX m1, float num);
 
+
+/*
+  ps2util.c にある、vector 計算のテスト用処理です。
+*/
+
 int main(){
 
   FVECTOR resultV;