Mercurial > hg > old > magoroku_racing.bad

changeset 32:b5c5ffd4d2f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author gongo
date Sun, 05 Nov 2006 02:48:12 +0000
parents 03ea510aa478
children 8d4fdf454a2f
files field.c schedule.c
diffstat 2 files changed, 8 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/field.c	Sun Nov 05 02:37:26 2006 +0000
+++ b/field.c	Sun Nov 05 02:48:12 2006 +0000
@@ -10,16 +10,12 @@
 #include "field.h"
 #include "car.h"
 #include "quotanion.h"
-#include "game.h"
 
 #define DEFAULT_SET (EFFECT_TEXTURE_USE | EFFECT_ALPHABLEND_UNUSE | EFFECT_SHADING_FLAT)
 #define BUFSIZE 256
 
 /* --- main.c --- */
 extern FILE *main_fp;
-/* --- game.c --- */
-extern Game game;
-
 
 static int field_num_max = 0;
 static int field_num = 1;
@@ -57,7 +53,7 @@
     self->prev   = NULL;
     self->free_addr = free_addr;
 #ifdef DEBUG
-    fprintf(main_fp, "malloc fieldNode addr = %x\n", (int)free_addr);
+    fprintf(main_fp, "malloc fieldNode addr = %x(free)\n, %x(obj)", (int)free_addr, (int)self);
 #endif
     col_init(&self->colface, xml);
 
@@ -67,7 +63,7 @@
 }
 
 static void
-field_new_readCSV(FILE *fp)
+field_new_readCSV(FILE *fp, int id)
 {
     FieldPtr fieldHead = NULL;
     FieldPtr newField  = NULL;
@@ -85,7 +81,7 @@
 	case 'n': // $B%3!<%9(BID$B$NFI$_<h$j(B
 	    if (!flag) {
 		sscanf(bufp, " %d\n", &course_id);
-		if (game.course_id == course_id) {
+		if (id == course_id) {
 		    flag = TRUE;
 		}
 	    } else {
@@ -136,7 +132,7 @@
     $B%3!<%9@hF,$N%]%$%s%?(B
 /---------------------*/
 void
-field_init()
+field_init(int id)
 {
     FILE *fp;
     char *filename = "course/course.dat";
@@ -145,7 +141,7 @@
         fprintf(main_fp, "error read file %s\n", filename);
 	exit(EXIT_FAILURE);
     }
-    field_new_readCSV(fp);
+    field_new_readCSV(fp, id);
     fclose(fp);
 }
 
--- a/schedule.c	Sun Nov 05 02:37:26 2006 +0000
+++ b/schedule.c	Sun Nov 05 02:48:12 2006 +0000
@@ -30,7 +30,7 @@
 /* --- controler.c --- */
 extern SGO_PAD pad;
 /* --- car.c --- */
-extern CarPtr car_init();
+extern CarPtr car_init(int);
 extern void car_accelerate(CarPtr, int);
 extern void car_swerve(CarPtr, int);
 extern void car_update(CarPtr);
@@ -39,7 +39,7 @@
 extern void carNode_draw();
 extern void carNode_destroy();
 /* --- field.c --- */
-extern void field_init();
+extern void field_init(int);
 extern void field_update(CarPtr);
 extern void field_destroy();
 /* --- mytype.c --- */
@@ -81,7 +81,7 @@
 {
     game.jiki = car_init(game.car_id);
     carNode_append(game.jiki);
-    field_init();
+    field_init(game.course_id);
 }
 
 void sche_game_init();