Mercurial > hg > Members > kono > Cerium

changeset 286:ac5af1ea093c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge 284
author e065746@localhost.localdomain
date Fri, 05 Jun 2009 17:28:54 +0900
parents 6ceb40aec7fb (diff) 181f693be3d5 (current diff)
children 555570edf557
files
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Test/test_render/boss1_action.cpp	Fri Jun 05 17:24:38 2009 +0900
+++ b/TaskManager/Test/test_render/boss1_action.cpp	Fri Jun 05 17:28:54 2009 +0900
@@ -233,7 +233,7 @@
   SceneGraphPtr right_parts;
 
   sgroot->createFromXMLfile("xml_file/boss1.xml");
-  sgroot->createFromXMLfile("xml_file/player.xml");
+  sgroot->createFromXMLfile("xml_file/player1.xml");
   sgroot->createFromXMLfile("xml_file/p_shot.xml");
   sgroot->createFromXMLfile("xml_file/blast.xml");
   
--- a/TaskManager/Test/test_render/viewer.cpp	Fri Jun 05 17:24:38 2009 +0900
+++ b/TaskManager/Test/test_render/viewer.cpp	Fri Jun 05 17:28:54 2009 +0900
@@ -94,6 +94,7 @@
 extern void init_position(int, int);
 extern void vacuum_init(int w, int h);
 extern void untitled_init(void);
+extern void boss1_init(int w, int h);
 void
 Viewer::run_init(const char *xml, int sg_number)
 {
@@ -141,6 +142,9 @@
     case 12:
         untitled_init();
         break;
+    case 13:
+	boss1_init(this->width, this->height);
+	break;
     default:
 	node_init();
 	break;