Undo my "fix" in r3782, as it wasn't a fix but a breakage

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3784 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-02-15 19:43:53 +00:00
parent e2e3044f48
commit 2322fe0920
2 changed files with 2 additions and 1 deletions

View File

@ -581,6 +581,7 @@ static void posixExceptionHandler(int signum, siginfo_t * siginfo, WZ_DECL_UNUSE
*/
void setupExceptionHandler(const char * programCommand)
{
return;
#if defined(WZ_OS_WIN)
SetUnhandledExceptionFilter(windowsExceptionHandler);
#elif defined(WZ_OS_UNIX) && !defined(WZ_OS_MAC)

View File

@ -614,7 +614,7 @@ void updateLastPowered(BASE_OBJECT *psObject, UBYTE player)
{
ASSERT(player < MAX_PLAYERS, "updateLastPowered: Bad player (%u)", (unsigned int)player);
ASSERT(asPower[player] != NULL, "asPower[player=%u] not allocated", (unsigned int)player);
ASSERT(psObject != NULL && psObject->died != 0 && psObject->died != NOT_CURRENT_LIST,
ASSERT(psObject == NULL || psObject->died == 0 || psObject->died == NOT_CURRENT_LIST,
"updateLastPowered: Null or dead object");
asPower[player]->psLastPowered = psObject;