diff Dandy.cc @ 1:b4c797eee72a

task dandy base
author koba <koba@cr.ie.u-ryukyu.ac.jp>
date Mon, 13 Dec 2010 04:56:23 +0900
parents 435ac1cdb64e
children 6382d8f6a973
line wrap: on
line diff
--- a/Dandy.cc	Sat Dec 11 21:25:28 2010 +0900
+++ b/Dandy.cc	Mon Dec 13 04:56:23 2010 +0900
@@ -27,7 +27,7 @@
 #include <SDL_mixer.h>
 #include "error.h"
 #include "matrix_calc.h"
-
+#include "task_dandy.h"
 #include "Character.h"
 #include "Character_state.h"
 
@@ -73,6 +73,8 @@
 
 static Viewer *sgroot;
 
+TaskManager *tmanager;
+
 static    int screen_w;
 static    int screen_h;
 
@@ -82,6 +84,7 @@
     screen_w = w;
     screen_h = h;
     sgroot = sgroot_;
+    tmanager = sgroot->manager;
     return sgroot;
 }
 
@@ -118,7 +121,7 @@
     case 4:    gamef= dandy_closing(gamef); break;
     }
     return next;
-}; 
+};
 
 
 
@@ -148,7 +151,7 @@
 static int light_num = 4;
 
 static void 
-LightSysSwitch(Viewer *sgroot) {
+_LightSysSwitch(Viewer *sgroot) {
   if (light_sysswitch == 1) {
     sgroot->OnLightSysSwitch();
     for (int i = 0; i < light_num; i++) {
@@ -180,7 +183,7 @@
     sgroot->createFromXMLfile("xml/effect.xml");
     sgroot->createFromXMLfile("xml/boss.xml");
 
-    LightSysSwitch(sgroot);
+    _LightSysSwitch(sgroot);
 
 
     init_sprite(0,0,0,0);
@@ -216,7 +219,7 @@
 
     // ボリューム調整
     InitVolume();
-	
+
     // 音出しテスト
     PlaySdlMixer(-1, BGM);
 
@@ -269,7 +272,7 @@
 	flip();
 
 	//SDL_FillRect(screen, NULL, background);
-    
+
 	schedule();
 	enemyfaste = count;