diff TaskDandy.cc @ 49:f4140672ef9f

fix.
author koba <koba@cr.ie.u-ryukyu.ac.jp>
date Fri, 21 Jan 2011 22:18:28 +0900
parents e01948ce859a
children 2e123c4bf5ca
line wrap: on
line diff
--- a/TaskDandy.cc	Sat Jan 15 19:13:03 2011 +0900
+++ b/TaskDandy.cc	Fri Jan 21 22:18:28 2011 +0900
@@ -33,8 +33,8 @@
 #include "state_task.h"
 
 static int use_keybord = 0;
-static int cdp[20] = { 16, 16, 16, 17, 18, 0 };
-static int d, i;
+//static int cdp[20] = { 16, 16, 16, 17, 18, 0 };
+static int i;
 
 static int rswait = 0;
 static int cf = 0;
@@ -355,15 +355,18 @@
 	//charpatern();
 	//bosguage();
     
-	count++;
+	//count++;
 	//PutSprite(count, 0, 960 - 96, 10);
 	/*インフレゲージ */
-	count++;
+	//count++;
 	//PutSprite(count, 0, 0, 48);
 
 	obj_draw();
 	gamef = game_pause(gamef);
 
+	filpcount++;
+	count = 0;
+
 	KeyAssign(runmode, t_buff, joy, pad);
 
 	return gamef;
@@ -378,6 +381,10 @@
     } else if (runmode == 2) {
 	PadfileClose(first);
     }
+    SDL_Event usr_event;
+    usr_event.type = SDL_QUIT;
+
+    SDL_PushEvent(&usr_event);
 
     //_______________________________________________
     // SDL_mixerの後始末
@@ -446,8 +453,8 @@
     count++;
     PutSprite(count, 224, 776, 119); //  put `super dandy'
     count++;
-    //    PutSprite(count, 200, 64, 190);
-    //    PutSpriteEx(count, 8192, 8192, 0);
+    //PutSprite(count, 200, 64, 190);
+    //PutSpriteEx(count, 8192, 8192, 0);
     PutSpriteEx(190, 800, 264, 2, 2, 5);
     count++;
     PutSprite(count, 396, 432, 191);
@@ -456,7 +463,7 @@
     PutSprite(count, 640, 640, 192);
     //PutSpriteEx(count, 8192, 8192, 0);
 
-    if (pad[0].st > 1) {
+    if ((pad[0].st > 1)||(runmode == 2)) {
 	jiki.bf = TRUE;
 	
 	//CdPlay(1,&cdp[0],0);                                          
@@ -475,7 +482,6 @@
 static int
 game_pause(int gamef)
 {
-    gamef = 3;
     if (jiki.zanki != 0 && jiki.bf != FALSE) {
 	if (pad[0].se == 1) {
 	    //Mix_Pause(BGM);
@@ -531,7 +537,7 @@
 		}
 		SDL_Delay(100);
 		PutSprite(1, 640, 640, 29 - cc / 60);
-		//      	PutSpriteEx(1, 409 * ((cc % 60) + 1), 409 * ((cc % 60) + 1), 0);
+		//PutSpriteEx(1, 409 * ((cc % 60) + 1), 409 * ((cc % 60) + 1), 0);
 
 		Pad(joy);
 		flip();  // this is not correct