Mercurial > otakunoraifu

comparison scn2k/scn2k_impl.cc @ 50:35ce1a30f3f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Added va_end where there is a va_start * Used NULL instead of 0 (so it works on 64b)
author thib
date Fri, 17 Apr 2009 18:38:06 +0000
parents 01aa5ddf7dc8
children 15a18fbe6f21
comparison
equal deleted inserted replaced
49:6581f7eccd26 50:35ce1a30f3f9
85 text_exec.InitWindow(); 85 text_exec.InitWindow();
86 grp_exec.InitSel(config); 86 grp_exec.InitSel(config);
87 } 87 }
88 88
89 Scn2k::~Scn2k() { 89 Scn2k::~Scn2k() {
90 if (script_start) delete[] script_start;
90 HideCursor(); 91 HideCursor();
91 SaveSys(); 92 SaveSys();
92 } 93 }
93 94
94 char* Scn2k::OpenScript(int new_scn_number, char*& end, int* call_vec, int& system_version) { 95 char* Scn2k::OpenScript(int new_scn_number, char*& end, int* call_vec, int& system_version) {
748 /* 7d1: == 1 || 14c: == 1 || (15e==1&&161==1&&162==0) || (press_val == 2) : スキップ中？ タイトル画面のアニメーション終了 */ 749 /* 7d1: == 1 || 14c: == 1 || (15e==1&&161==1&&162==0) || (press_val == 2) : スキップ中？ タイトル画面のアニメーション終了 */
749 flag.SetSys(0); 750 flag.SetSys(0);
750 cmd.clear(); 751 cmd.clear();
751 } else if (cmd.cmd3 == 0x4b0) { // 終了 752 } else if (cmd.cmd3 == 0x4b0) { // 終了
752 System::Main::Quit(); 753 System::Main::Quit();
753 script = 0; script_start = 0; script_end = 0; 754 //script = 0; script_start = 0; script_end = 0;
754 cmd.clear(); 755 cmd.clear();
755 cmd.cmd_type = CMD_WAITFRAMEUPDATE; 756 cmd.cmd_type = CMD_WAITFRAMEUPDATE;
756 } else if (cmd.cmd3 == 0x4b4 || cmd.cmd3 == 0x4b5) { // 選択肢巻き戻し 757 } else if (cmd.cmd3 == 0x4b4 || cmd.cmd3 == 0x4b5) { // 選択肢巻き戻し
757 LoadRollback(cmd); 758 LoadRollback(cmd);
758 } else if (cmd.cmd3 == 0x58d) { 759 } else if (cmd.cmd3 == 0x58d) {
1214 flag.Exec(cmd); 1215 flag.Exec(cmd);
1215 text_exec.Exec(cmd); 1216 text_exec.Exec(cmd);
1216 grp_exec.Exec(cmd); 1217 grp_exec.Exec(cmd);
1217 } 1218 }
1218 cmd.clear(); 1219 cmd.clear();
1220
1221 delete[] savedata;
1219 return; 1222 return;
1220 } 1223 }
1221 1224
1222 void Scn2k::SaveImpl(string& save) { 1225 void Scn2k::SaveImpl(string& save) {
1223 char buf[1024]; 1226 char buf[1024];