BACKENDS: Use OSystem::destroy() instead of deleting directly the g_system instance
This commit is contained in:
parent
1e11da712b
commit
941d22c047
19 changed files with 19 additions and 19 deletions
|
@ -40,7 +40,7 @@ int main(int argc, char *argv[]) {
|
|||
// res = scummvm_main(argc, argv);
|
||||
scummvm_main(0, nullptr);
|
||||
|
||||
delete dynamic_cast<_3DS::OSystem_3DS*>(g_system);
|
||||
g_system->destroy();
|
||||
|
||||
// Turn on both screen backlights before exiting.
|
||||
if (R_SUCCEEDED(gspLcdInit())) {
|
||||
|
|
|
@ -41,7 +41,7 @@ int main(int argc, char *argv[]) {
|
|||
int res = scummvm_main(argc, argv);
|
||||
|
||||
// Free OSystem
|
||||
delete (OSystem_ANDROIDSDL *)g_system;
|
||||
g_system->destroy();
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -43,7 +43,7 @@ int main(int argc, char* argv[]) {
|
|||
int res = scummvm_main(argc, argv);
|
||||
|
||||
// Free OSystem
|
||||
delete (OSystem_SDL_Dingux *)g_system;
|
||||
g_system->destroy();
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -43,7 +43,7 @@ int main(int argc, char *argv[]) {
|
|||
int res = scummvm_main(argc, argv);
|
||||
|
||||
// Free OSystem
|
||||
delete(OSystem_GPH *)g_system;
|
||||
g_system->destroy();
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -36,7 +36,7 @@ int main(int argc, char *argv[]) {
|
|||
int res = scummvm_main(argc, argv);
|
||||
|
||||
// Free OSystem
|
||||
delete (OSystem_LINUXMOTO *)g_system;
|
||||
g_system->destroy();
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -44,7 +44,7 @@ int main(int argc, char* argv[]) {
|
|||
int res = scummvm_main(argc, argv);
|
||||
|
||||
// Free OSystem
|
||||
delete (Maemo::OSystem_SDL_Maemo *)g_system;
|
||||
g_system->destroy();
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -137,7 +137,7 @@ int main(int argc, char *argv[]) {
|
|||
|
||||
// Invoke the actual ScummVM main entry point:
|
||||
int res = scummvm_main(argc, argv);
|
||||
delete (OSystem_NULL *)g_system;
|
||||
g_system->destroy();
|
||||
return res;
|
||||
}
|
||||
|
||||
|
|
|
@ -43,7 +43,7 @@ int main(int argc, char *argv[]) {
|
|||
int res = scummvm_main(argc, argv);
|
||||
|
||||
// Free OSystem
|
||||
delete(OSystem_OP *)g_system;
|
||||
g_system->destroy();
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -50,7 +50,7 @@ extern "C" int Game_Main(char *path, char *) {
|
|||
int res = scummvm_main(0, 0);
|
||||
|
||||
// Free OSystem
|
||||
delete (OSystem_SDL_SamsungTV *)g_system;
|
||||
g_system->destroy();
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -79,7 +79,7 @@ int main(int argc, char *argv[]) {
|
|||
int res = scummvm_main(argc, argv);
|
||||
|
||||
// Free OSystem
|
||||
delete (OSystem_AmigaOS *)g_system;
|
||||
g_system->destroy();
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -45,7 +45,7 @@ int main(int argc, char *argv[]) {
|
|||
int res = scummvm_main(argc, argv);
|
||||
|
||||
// Free OSystem
|
||||
delete (OSystem_MacOSX *)g_system;
|
||||
g_system->destroy();
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -45,7 +45,7 @@ int main(int argc, char *argv[]) {
|
|||
int res = scummvm_main(argc, argv);
|
||||
|
||||
// Free OSystem
|
||||
delete (OSystem_POSIX *)g_system;
|
||||
g_system->destroy();
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -43,7 +43,7 @@ int main(int argc, char *argv[]) {
|
|||
int res = scummvm_main(argc, argv);
|
||||
|
||||
// Free OSystem
|
||||
delete (OSystem_PS3 *)g_system;
|
||||
g_system->destroy();
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -56,7 +56,7 @@ int main(int argc, char *argv[]) {
|
|||
int res = scummvm_main(argc, argv);
|
||||
|
||||
// Free OSystem
|
||||
delete (OSystem_PSP2 *)g_system;
|
||||
g_system->destroy();
|
||||
|
||||
#ifdef __PSP2_DEBUG__
|
||||
psp2shell_exit();
|
||||
|
|
|
@ -45,7 +45,7 @@ int main(int argc, char *argv[]) {
|
|||
int res = scummvm_main(argc, argv);
|
||||
|
||||
// Free OSystem
|
||||
delete (OSystem_RISCOS *)g_system;
|
||||
g_system->destroy();
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -72,7 +72,7 @@ int main(int argc, char *argv[]) {
|
|||
int res = scummvm_main(argc, argv);
|
||||
|
||||
// Free OSystem
|
||||
delete (OSystem_Win32 *)g_system;
|
||||
g_system->destroy();
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -89,7 +89,7 @@ int main(int argc, char *argv[]) {
|
|||
int res = scummvm_main(argc, argv);
|
||||
|
||||
// Free OSystem
|
||||
delete (OSystem_SDL_Symbian *)g_system;
|
||||
g_system->destroy();
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -44,7 +44,7 @@ int main(int argc, char* argv[]) {
|
|||
int res = scummvm_main(argc, argv);
|
||||
|
||||
// Free OSystem
|
||||
delete (OSystem_SDL_WebOS *)g_system;
|
||||
g_system->destroy();
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -237,7 +237,7 @@ int SDL_main(int argc, char **argv) {
|
|||
res = scummvm_main(argc, argv);
|
||||
|
||||
// Free OSystem
|
||||
delete(OSystem_WINCE3 *)g_system;
|
||||
g_system->destroy();
|
||||
#if !defined(DEBUG) && !defined(__GNUC__)
|
||||
}
|
||||
__except(handleException(GetExceptionInformation())) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue