[Scummvm-cvs-logs] SF.net SVN: scummvm: [20818] scummvm/trunk/engines/cine
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Wed Feb 22 23:46:03 CET 2006
Revision: 20818
Author: eriktorbjorn
Date: 2006-02-22 23:45:51 -0800 (Wed, 22 Feb 2006)
ViewCVS: http://svn.sourceforge.net/scummvm?rev=20818&view=rev
Log Message:
-----------
Don't call exit() directly. Instead, use the backend's quit() method for normal
shutdown, and error() for abnormal termination.
Modified Paths:
--------------
scummvm/trunk/engines/cine/main_loop.cpp
scummvm/trunk/engines/cine/object.cpp
scummvm/trunk/engines/cine/script.cpp
Modified: scummvm/trunk/engines/cine/main_loop.cpp
===================================================================
--- scummvm/trunk/engines/cine/main_loop.cpp 2006-02-22 23:19:57 UTC (rev 20817)
+++ scummvm/trunk/engines/cine/main_loop.cpp 2006-02-23 07:45:51 UTC (rev 20818)
@@ -48,7 +48,7 @@
mouseData.Y = event.mouse.y;
break;
case OSystem::EVENT_QUIT:
- exit(0);
+ g_system->quit();
break;
default:
break;
Modified: scummvm/trunk/engines/cine/object.cpp
===================================================================
--- scummvm/trunk/engines/cine/object.cpp 2006-02-22 23:19:57 UTC (rev 20817)
+++ scummvm/trunk/engines/cine/object.cpp 2006-02-23 07:45:51 UTC (rev 20818)
@@ -436,10 +436,9 @@
}
default:
{
- printf
- ("Unsupported compare type: %d in compareObjectParam\n",
+ error
+ ("Unsupported compare type: %d in compareObjectParam",
param1 - 1);
- exit(1);
}
}
Modified: scummvm/trunk/engines/cine/script.cpp
===================================================================
--- scummvm/trunk/engines/cine/script.cpp 2006-02-22 23:19:57 UTC (rev 20817)
+++ scummvm/trunk/engines/cine/script.cpp 2006-02-23 07:45:51 UTC (rev 20818)
@@ -403,10 +403,9 @@
}
default:
{
- printf
- ("Unsupported opcode %X in computeScriptStack\n",
+ error
+ ("Unsupported opcode %X in computeScriptStack",
opcode - 1);
- exit(1);
}
}
@@ -2752,8 +2751,7 @@
}
default:
{
- printf("Unsupported opcode %X\n", opcode - 1);
- exit(1);
+ error("Unsupported opcode %X", opcode - 1);
}
}
}
More information about the Scummvm-git-logs
mailing list