mirror of
https://github.com/kevinbentley/Descent3.git
synced 2025-01-22 11:28:56 +00:00
more windows editor fixes
This commit is contained in:
parent
87f19acc2f
commit
b8949f292d
@ -3470,7 +3470,6 @@ void ReadTerrainChunks(CFILE *fp, int version) {
|
||||
UpdateTerrainLightmaps();
|
||||
|
||||
#if (defined(EDITOR) || defined(NEWEDITOR))
|
||||
|
||||
memset(TerrainSelected, 0, TERRAIN_WIDTH * TERRAIN_DEPTH);
|
||||
Num_terrain_selected = 0;
|
||||
#endif
|
||||
|
@ -685,7 +685,6 @@ void GameToEditor(bool set_viewer_from_player)
|
||||
}
|
||||
|
||||
// this uses information defined above
|
||||
io_info.use_lo_res_time = (bool)(FindArg("-lorestimer")!=0);
|
||||
io_info.key_emulation = true; //(bool)(FindArg("-slowkey")!=0);
|
||||
io_info.joy_emulation = (bool)((FindArg("-alternatejoy")==0) && (FindArg("-directinput")==0));
|
||||
|
||||
@ -898,7 +897,6 @@ void EditorToGame()
|
||||
|
||||
// Initialize IO System for child window
|
||||
io_info.obj = Descent;
|
||||
io_info.use_lo_res_time = (bool)(FindArg("-lorestimer")!=0);
|
||||
io_info.key_emulation = true; //(bool)(FindArg("-slowkey")!=0);
|
||||
io_info.joy_emulation = (bool)((FindArg("-alternatejoy")==0) && (FindArg("-directinput")==0));
|
||||
ddio_Init(&io_info);
|
||||
|
@ -167,6 +167,9 @@ void Int3MessageBox(const char *file, int line);
|
||||
// prints out a standard OS messagebox
|
||||
void OutrageMessageBox(const char *str, ...);
|
||||
int OutrageMessageBox(int type, const char *str, ...);
|
||||
#else
|
||||
void OutrageMessageBox(const char *str, ...) {};
|
||||
int OutrageMessageBox(int type, const char *str, ...) {};
|
||||
#endif
|
||||
// Sets the title for future OutrageMessageBox() dialogs
|
||||
void SetMessageBoxTitle(const char *title);
|
||||
|
@ -239,6 +239,7 @@ void SetMessageBoxTitle(const char *title) { strncpy(Messagebox_title, title, si
|
||||
|
||||
#define BUF_LEN 1024
|
||||
|
||||
#ifndef RELEASE
|
||||
// Pops up a dialog box to display a message
|
||||
void OutrageMessageBox(const char *str, ...) {
|
||||
char buf[BUF_LEN];
|
||||
@ -283,3 +284,4 @@ int OutrageMessageBox(int type, const char *str, ...) {
|
||||
|
||||
return Debug_MessageBox(os_flags, Messagebox_title, buf);
|
||||
}
|
||||
#endif // RELEASE
|
Loading…
Reference in New Issue
Block a user