Mercurial > hg > Members > koba > t_dandy

diff Dandy.cc @ 49:f4140672ef9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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/Dandy.cc	Sat Jan 15 19:13:03 2011 +0900
+++ b/Dandy.cc	Fri Jan 21 22:18:28 2011 +0900
@@ -31,8 +31,8 @@
 #include "Character_state.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;
@@ -354,10 +354,10 @@
 	Putbom();
 	tokuten();
     
-	count++;
+	//count++;
 	//PutSprite(count, 0, 960 - 96, 10);
 	/*インフレゲージ */
-	count++;
+	//count++;
 	//PutSprite(count, 0, 0, 48);
 
 	obj_draw();
@@ -380,6 +380,10 @@
     } else if (runmode == 2) {
 	PadfileClose(first);
     }
+    SDL_Event usr_event;
+    usr_event.type = SDL_QUIT;
+
+    SDL_PushEvent(&usr_event);
 
     //_______________________________________________
     // SDL_mixerの後始末
@@ -458,7 +462,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);                                          
@@ -477,7 +481,6 @@
 static int
 game_pause(int gamef)
 {
-    gamef = 3;
     if (jiki.zanki != 0 && jiki.bf != FALSE) {
 	if (pad[0].se == 1) {
 	    //Mix_Pause(BGM);