valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

updates for new logging system

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@695
This commit is contained in:
Peter Veenstra 2003-02-27 19:56:22 +00:00
parent dff67638e9
commit f79eaaba75
57 changed files with 405 additions and 416 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/gui/render.cpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2002 The DOSBox Team
* Copyright (C) 2002-2003 The DOSBox Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -111,7 +111,7 @@ static void TakeScreenShot(Bit8u * bitmap) {
/* Find a filename to open */
dir=opendir(snapshots_dir);
if (!dir) {
LOG_WARN("Can't open snapshot dir %s",snapshots_dir);
LOG_MSG("Can't open snapshot dir %s",snapshots_dir);
return;
}
while (dir_ent=readdir(dir)) {
@ -130,7 +130,7 @@ static void TakeScreenShot(Bit8u * bitmap) {
/* Open the actual file */
FILE * fp=fopen(file_name,"wb");
if (!fp) {
LOG_WARN("Can't open snapshot file %s",file_name);
LOG_MSG("Can't open snapshot file %s",file_name);
return;
}
/* Finalize the initing of png library */

24
src/gui/sdlmain.cpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2002 The DOSBox Team
* Copyright (C) 2002-2003 The DOSBox Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -43,6 +43,7 @@ struct SDL_Block {
Bitu flags;
GFX_ModeCallBack mode_callback;
bool full_screen;
bool nowait;
SDL_Surface * surface;
SDL_Joystick * joy;
SDL_cond *cond;
@ -234,6 +235,7 @@ static void GUI_StartUp(Section * sec) {
Section_prop * section=static_cast<Section_prop *>(sec);
sdl.active=false;
sdl.full_screen=false;
sdl.nowait=section->Get_bool("nowait");
sdl.mouse.locked=false;
sdl.mouse.requestlock=false;
sdl.mouse.autoenable=section->Get_bool("autolock");
@ -498,7 +500,7 @@ void GFX_Events() {
HandleVideoResize(&event.resize);
break;
case SDL_QUIT:
E_Exit("Closed the SDL Window");
throw(true);
break;
}
}
@ -512,15 +514,17 @@ void GFX_ShowMsg(char * msg) {
};
int main(int argc, char* argv[]) {
#if C_DEBUG
DEBUG_SetupConsole();
#endif
try {
CommandLine com_line(argc,argv);
Config myconf(&com_line);
control=&myconf;
#if C_DEBUG
DEBUG_SetupConsole();
#endif
if ( SDL_Init(SDL_INIT_AUDIO|SDL_INIT_VIDEO|SDL_INIT_TIMER
#ifndef DISABLE_JOYSTICK
@ -532,7 +536,7 @@ int main(int argc, char* argv[]) {
sdl_sec->Add_bool("fullscreen",false);
sdl_sec->Add_bool("autolock",true);
sdl_sec->Add_int("sensitivity",100);
sdl_sec->Add_bool("nowait",false);
/* Init all the dosbox subsystems */
DOSBOX_Init();
std::string config_file;
@ -564,7 +568,11 @@ int main(int argc, char* argv[]) {
if (sdl.full_screen) SwitchFullScreen();
if (sdl.mouse.locked) CaptureMouse();
LOG_MSG("Exit to error: %sPress enter to continue.",error);
fgetc(stdin);
if(!sdl.nowait) fgetc(stdin);
}
catch (...){
if (sdl.full_screen) SwitchFullScreen();
if (sdl.mouse.locked) CaptureMouse();
}
return 0;
};