Mercurial > hg > old > magoroku_racing.bad

changeset 62:d71fbefaa9a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author gongo
date Thu, 09 Nov 2006 02:58:37 +0000
parents 39162caa4587
children f23e36bbb060
files ChangeLog schedule.c
diffstat 2 files changed, 29 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Nov 09 01:50:54 2006 +0000
+++ b/ChangeLog	Thu Nov 09 02:58:37 2006 +0000
@@ -1,3 +1,11 @@
+2006-11-09    <j03056@mammaaiuto.cr.ie.u-ryukyu.ac.jp>
+
+	* xml.c
+	<wrn><malloc>not found malloc-shelf has specified addr(~), in
+	xml.c at xml_free, ;ine 238
+	見つけたバグ。てか前からあるんだよなこのライブラリのバグ
+	いずれ直すってことで記録
+
 2006-11-08  Wataru MIYAGUNI  <gongo@cr.ie.u-ryukyu.ac.jp>
 
 	* linda.c: get_packet
--- a/schedule.c	Thu Nov 09 01:50:54 2006 +0000
+++ b/schedule.c	Thu Nov 09 02:58:37 2006 +0000
@@ -18,6 +18,11 @@
 #include "game_time.h"
 #include "schedule.h"
 
+#ifdef LINDA
+extern Bool linda_update(int);
+#else
+#define linda_update(int) TRUE
+#endif
 
 #define MAXCAR   3 // 選択可能機体
 #define MAXFIELD 2 // 選択可能コース
@@ -53,8 +58,8 @@
 
 static int i=0;
 
-static void* (*sche_func_assumption)();
-static void* (*sche_func)() = &sche_game_init;
+static void (*sche_func_assumption)();
+static void (*sche_func)() = &sche_game_init;
 static int change_state = 0;
 static void
 set_schedule_assumption(void *_func)
@@ -64,6 +69,12 @@
 }
 
 static void
+unset_schedule()
+{
+    change_state = 0;
+}
+
+static void
 set_schedule()
 {
     sche_func = sche_func_assumption;
@@ -124,8 +135,7 @@
 sche_game_wait()
 {
     gFont_SetString("WAITING...", 200, 100);
-    if (game.linda_exec() == TRUE)
-	set_schedule_assumption(sche_game_wait_ready);
+    set_schedule_assumption(sche_game_wait_ready);
 }
 
 /**
@@ -141,8 +151,7 @@
 	if (pad.st != 1) { goto WAIT_READY; }
     }
 
-    if (game.linda_exec() == TRUE)
-	set_schedule_assumption(sche_game_opening);
+    set_schedule_assumption(sche_game_opening);
     
 WAIT_READY:
     return;
@@ -161,7 +170,7 @@
 	if (pad.st != 1) { goto OPENING; }
     }
 
-    if (game.linda_exec() == TRUE)
+    
 	set_schedule_assumption(sche_game_select_car);
 
 OPENING:
@@ -204,7 +213,7 @@
     if (game.play_id == 1)
 	if (pad.circle != 1) { goto SELECT_CAR; }
 
-    if (game.linda_exec() == TRUE)
+    
 	set_schedule_assumption(sche_game_select_course);
     
 SELECT_CAR:
@@ -237,7 +246,7 @@
 	if (pad.circle != 1) { goto SELECT_COURSE; }
     }
 
-    if (game.linda_exec() == TRUE)
+    
 	set_schedule_assumption(sche_game_ready);
 
 SELECT_COURSE:
@@ -260,8 +269,7 @@
     }
     blink_count = (blink_count > 70) ? 0 : blink_count + 1;
 
-    if (game.linda_exec() == TRUE)
-	set_schedule_assumption(sche_game_main_init);
+    set_schedule_assumption(sche_game_main_init);
 
 /*
     if (pad.st == 1) {
@@ -433,6 +441,8 @@
     
     if (linda_update(change_state) == TRUE)
 	set_schedule();
+    else
+	unset_schedule();
 
     wait_sync();
     swap_dbuff();