comparison src/editlev.cc @ 80:2f1ecc1c5f72

Huge cleanup -- move some global variables into a struct.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 26 Sep 2011 17:39:49 +0300
parents e6175d0a667b
children 002bc70a3982
comparison
equal deleted inserted replaced
79:0602d9bf474a 80:2f1ecc1c5f72
52 52
53 void EditLevel(const char *levelname, bool newlevel) 53 void EditLevel(const char *levelname, bool newlevel)
54 { 54 {
55 ReadWTextureNames(); 55 ReadWTextureNames();
56 ReadFTextureNames(); 56 ReadFTextureNames();
57 patch_dir.refresh(MasterDir); 57 patch_dir.refresh(cfg.MasterDir);
58 if (InitGfx()) 58 if (InitGfx())
59 return; 59 return;
60 /* Call init_input_status() as shortly as possible after the creation 60 /* Call init_input_status() as shortly as possible after the creation
61 of the window to minimize the risk of calling get_input_status(), 61 of the window to minimize the risk of calling get_input_status(),
62 get_key(), have_key(), etc. with <is> still uninitialized. */ 62 get_key(), have_key(), etc. with <is> still uninitialized. */
80 } 80 }
81 else // "edit <level_name>" or "edit" 81 else // "edit <level_name>" or "edit"
82 { 82 {
83 #if 0 83 #if 0
84 if (levelname == 0 || !levelname2levelno(levelname) 84 if (levelname == 0 || !levelname2levelno(levelname)
85 || !FindMasterDir(MasterDir, levelname)) 85 || !FindMasterDir(cfg.MasterDir, levelname))
86 levelname = SelectLevel(atoi(levelname)); /* returns "" on Esc */ 86 levelname = SelectLevel(atoi(levelname)); /* returns "" on Esc */
87 if (levelname2levelno(levelname)) 87 if (levelname2levelno(levelname))
88 { 88 {
89 #endif 89 #endif
90 ClearScreen(); 90 ClearScreen();
141 WriteYadexLog(file_name, levelname, &t0, &t1); 141 WriteYadexLog(file_name, levelname, &t0, &t1);
142 } 142 }
143 } 143 }
144 done: 144 done:
145 TermGfx(); 145 TermGfx();
146 if (!Registered) 146 if (!cfg.Registered)
147 printf("Please register the game" 147 printf("Please register the game"
148 " if you want to be able to save your changes.\n"); 148 " if you want to be able to save your changes.\n");
149 149
150 ForgetLevelData(); 150 ForgetLevelData();
151 /* forget the level pointer */ 151 /* forget the level pointer */