Mercurial > hg > old > magoroku_racing.bad

changeset 110:8a525ec378fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bool.h change stdbool.h
author Atuto SHIROMA <e095729@ie.u-ryukyu.ac.jp>
date Thu, 09 Jun 2011 01:45:25 +0900
parents 165b4d902ca4
children 7600cdfa8779
files Magoroku.cc car.h game.h ps2util.cc schedule.cc
diffstat 5 files changed, 18 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/Magoroku.cc	Thu Jun 09 00:53:50 2011 +0900
+++ b/Magoroku.cc	Thu Jun 09 01:45:25 2011 +0900
@@ -14,9 +14,9 @@
 #include "profile.h"
 #include "syokika.h"
 #include "sankaku.h"
-#include "sgoex.h"
+//#include "sgoex.h"
 #include "sound.h"
-#include "bool.h"
+#include <stdbool.h>
 #include "bom.h"
 #include "count2.h"
 #include "tokuten.h"
@@ -278,7 +278,7 @@
 	//charpatern();
 	//bosguage();
 
-	if (jiki.bf == TRUE) {
+	if (jiki.bf == true) {
 	    Player(0);
 	    count++;
 	    PutSprite(count, jiki.x, jiki.y, jiki.ch);
@@ -332,13 +332,13 @@
     filpcount = 0;
     stage = 0;
     //for (i = 0; i < 300; i++)
-    //enemy[i].f = FALSE;
+    //enemy[i].f = false;
     jiki.zanki = 3;
     jiki.x = 60;
     jiki.y = 200;
     jiki.ch = 3;
     jiki.point = 0;
-    jiki.bf = FALSE;
+    jiki.bf = false;
     jiki.muteki = 120;
     enemycount = 0;
     lg.stg = 4096;
@@ -389,7 +389,7 @@
     //PutSpriteEx(count, 8192, 8192, 0);
 
     if (pad[0].st > 1) {
-	jiki.bf = TRUE;
+	jiki.bf = true;
 	
 	//CdPlay(1,&cdp[0],0);                                          
 	SoundStop();
@@ -408,7 +408,7 @@
 game_pause(int gamef)
 {
     gamef = 3;
-    if (jiki.zanki != 0 && jiki.bf != FALSE) {
+    if (jiki.zanki != 0 && jiki.bf != false) {
 	if (pad[0].se == 1) {
 	    //Mix_Pause(BGM);
 	    PauseSdlMixer(BGM);
@@ -480,7 +480,7 @@
 	PutSprite(1, 480, 480, 19);
 	return gamef;
     }
-    if (jiki.bf == FALSE) {
+    if (jiki.bf == false) {
     f:
 	if (rswait < 80) {
 	    rswait++;
@@ -489,7 +489,7 @@
 	    rswait = 0;
 	    jiki.x = 60;
 	    jiki.y = 200;
-	    jiki.bf = TRUE;
+	    jiki.bf = true;
 
 	    pad[0].st = 0;
 	    lg.stg = 4096;
--- a/car.h	Thu Jun 09 00:53:50 2011 +0900
+++ b/car.h	Thu Jun 09 01:45:25 2011 +0900
@@ -4,7 +4,7 @@
 #define CAR_H
 
 #include "libps2.h"
-#include "game.h"
+//#include "game.h"
 
 typedef struct car {
   FVECTOR direction;    // 向き
@@ -34,7 +34,7 @@
     int rap;
 } Game, *GamePtr;
 
-
+//extern Game *game;
 
 
 CarPtr car_init(int id);
@@ -42,9 +42,10 @@
 void car_swerve(CarPtr, int);
 
 // ここで宣言したらgame.hと相互にincludeしちゃうからschedule.hのほうに書いてしまいました
-void car_update( Game *game, CarPtr car );
+extern void car_update( Game*, CarPtr );
 
 
-
+//自作関数
+void car_id_update(Game*, CarPtr );
 
 #endif
--- a/game.h	Thu Jun 09 00:53:50 2011 +0900
+++ b/game.h	Thu Jun 09 01:45:25 2011 +0900
@@ -15,7 +15,7 @@
 
 extern Game *game;
 
-void schedule(Game *game);
+extern void schedule(Game *game);
 
 #endif
 
--- a/ps2util.cc	Thu Jun 09 00:53:50 2011 +0900
+++ b/ps2util.cc	Thu Jun 09 01:45:25 2011 +0900
@@ -328,7 +328,7 @@
 // miya
 void ps2util_tex_Exclude( TEXTURE* t )
 {
-  const char *test = "test";
+  //const char *test = "test";
 }
 
 void ps2util_sprite_Draw()
--- a/schedule.cc	Thu Jun 09 00:53:50 2011 +0900
+++ b/schedule.cc	Thu Jun 09 01:45:25 2011 +0900
@@ -14,6 +14,7 @@
 #include "controler.h"
 #include "camera.h"
 #include "carNode.h"
+#include "car.h"
 #include "light.h"
 #include "title_scene.h"
 #include "game_time.h"
@@ -72,7 +73,7 @@
 static void (*sche_func)(Game*) = &sche_game_init;
 static int change_state = 0;
 
-// schedule.cで使用してる
+// schedule.ccで使用してる
 void linda_env_init( void );
 
 static void