# HG changeset patch
# User Atuto SHIROMA <e095729@ie.u-ryukyu.ac.jp>
# Date 1311256197 -32400
# Node ID 00d7de7fe9df019ec7fe77b45e6bcfcbe90870f5
# Parent  a32551423d64acfed1883e8702b0595d0a01db76
fix collision

diff -r a32551423d64 -r 00d7de7fe9df .#schedule.cc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.#schedule.cc	Thu Jul 21 22:49:57 2011 +0900
@@ -0,0 +1,1 @@
+e095729@takeuMac.local.18325
\ No newline at end of file
diff -r a32551423d64 -r 00d7de7fe9df car.cc
--- a/car.cc	Thu Jul 21 22:14:50 2011 +0900
+++ b/car.cc	Thu Jul 21 22:49:57 2011 +0900
@@ -310,14 +310,14 @@
   car->body->xyz[2] = -car->location[2];
 
   // いまちょっとコメントアウト
-  /*
+  
   // 壁にぶつかった時の処理
   if (car_field_check(game,car) == false) {
   // 壁にぶつかったら計算前の前フレームの座標にしてsppedは半分
   ps2_vu0_copy_vector(car->location, prev_location);
   car->speed = car->speed*0.5;
   }
-  */
+  
 }
 
 
diff -r a32551423d64 -r 00d7de7fe9df car/car.dat~
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/car/car.dat~	Thu Jul 21 22:49:57 2011 +0900
@@ -0,0 +1,8 @@
+n 1
+t car/asurada_gsx.xml car/a.png 0.02 2.01 2.0 0.04
+n 2
+t car/kart_cp.xml car/a.png 0.01 3.01 1.8 0.03
+n 3
+t car/asurada.xml car/a.png 0.03 2.51 2.0 0.03
+n 4
+t car/kuruma2.xml car/a.png 0.03 2.51 2.0 0.03	
\ No newline at end of file
diff -r a32551423d64 -r 00d7de7fe9df field.cc
--- a/field.cc	Thu Jul 21 22:14:50 2011 +0900
+++ b/field.cc	Thu Jul 21 22:49:57 2011 +0900
@@ -86,7 +86,7 @@
   fprintf(main_fp, "malloc fieldNode addr = %x(free), %x(obj)\n", (int)free_addr, (int)self);
 #endif
 
-  //col_init(&self->colface, colImg);
+  col_init(&self->colface, colImg);
 
 #ifdef DEBUG
   fprintf(main_fp, "       facenum = %d\n", self->colface.facenum);
diff -r a32551423d64 -r 00d7de7fe9df ps2util.cc
--- a/ps2util.cc	Thu Jul 21 22:14:50 2011 +0900
+++ b/ps2util.cc	Thu Jul 21 22:49:57 2011 +0900
@@ -348,7 +348,7 @@
 int malloc_align16(void *free, void *aligned, int size)
 {
   char *index;
-  unsigned int *f=(unsigned int *)free, *a=(unsigned int *)aligned;
+  unsigned long *f=(unsigned long *)free, *a=(unsigned long *)aligned;
 
   if (free == NULL || aligned == NULL || size <= 0) return(-1);