Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More fine-grained exception reporting for -[PlayerEntity update:]. Should probably do same for some of the bigger sub-methods.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3330 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2010-05-13 22:19:42 +00:00
parent ec1d15ddce
commit f0f02f7045
2 changed files with 105 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
src/Core/Entities/PlayerEntity.m
View File

@ -1444,48 +1444,102 @@ static GLfloat launchRoll;
- (void) update:(OOTimeDelta)delta_t - (void) update:(OOTimeDelta)delta_t
{ {
[self updateMovementFlags]; #ifndef NDEBUG
[self updateAlertCondition]; NSString * volatile updateStage = @"initialisation";
[self updateFuelScoops:delta_t]; // TODO: this should probably be called from performInFlightUpdates: instead. -- Ahruman 20080322 #define UPDATE_STAGE(x) do { updateStage = (x); } while (0);
#else
[self updateClocks:delta_t]; #define UPDATE_STAGE(x) do { (void) (x); } while (0);
// scripting
[OOScriptTimer updateTimers];
[self checkScriptsIfAppropriate];
// deal with collisions
[self manageCollisions];
[self pollControls:delta_t];
[self updateTrumbles:delta_t];
OOEntityStatus status = [self status];
if (status == STATUS_START_GAME && gui_screen != GUI_SCREEN_INTRO1 && gui_screen != GUI_SCREEN_INTRO2)
{
[self setGuiToIntroFirstGo:YES]; //set up demo mode
}
if (status == STATUS_AUTOPILOT_ENGAGED || status == STATUS_ESCAPE_SEQUENCE)
{
[self performAutopilotUpdates:delta_t];
}
else if (![self isDocked]) [self performInFlightUpdates:delta_t];
if (status == STATUS_IN_FLIGHT) [self doBookkeeping:delta_t];
if (status == STATUS_WITCHSPACE_COUNTDOWN) [self performWitchspaceCountdownUpdates:delta_t];
if (status == STATUS_EXITING_WITCHSPACE) [self performWitchspaceExitUpdates:delta_t];
if (status == STATUS_LAUNCHING) [self performLaunchingUpdates:delta_t];
if (status == STATUS_DOCKING) [self performDockingUpdates:delta_t];
if (status == STATUS_DEAD) [self performDeadUpdates:delta_t];
// TODO: this should probably be called from performInFlightUpdates: instead. -- Ahruman 20080322
// Moved to performInFlightUpdates. -- Micha 20090403
//[self updateTargeting];
#if WORMHOLE_SCANNER
[self updateWormholes];
#endif #endif
NS_DURING
UPDATE_STAGE(@"updateMovementFlags");
[self updateMovementFlags];
UPDATE_STAGE(@"updateAlertCondition");
[self updateAlertCondition];
UPDATE_STAGE(@"updateFuelScoops:");
[self updateFuelScoops:delta_t]; // TODO: this should probably be called from performInFlightUpdates: instead. -- Ahruman 20080322
UPDATE_STAGE(@"updateClocks:");
[self updateClocks:delta_t];
// scripting
UPDATE_STAGE(@"updateTimers");
[OOScriptTimer updateTimers];
UPDATE_STAGE(@"checkScriptsIfAppropriate");
[self checkScriptsIfAppropriate];
// deal with collisions
UPDATE_STAGE(@"manageCollisions");
[self manageCollisions];
UPDATE_STAGE(@"pollControls:");
[self pollControls:delta_t];
UPDATE_STAGE(@"updateTrumbles:");
[self updateTrumbles:delta_t];
OOEntityStatus status = [self status];
if (status == STATUS_START_GAME && gui_screen != GUI_SCREEN_INTRO1 && gui_screen != GUI_SCREEN_INTRO2)
{
UPDATE_STAGE(@"setGuiToIntroFirstGo:");
[self setGuiToIntroFirstGo:YES]; //set up demo mode
}
if (status == STATUS_AUTOPILOT_ENGAGED || status == STATUS_ESCAPE_SEQUENCE)
{
UPDATE_STAGE(@"performAutopilotUpdates:");
[self performAutopilotUpdates:delta_t];
}
else if (![self isDocked])
{
UPDATE_STAGE(@"performInFlightUpdates:");
[self performInFlightUpdates:delta_t];
}
/* NOTE: status-contingent updates are not a switch since they can
cascade when status changes.
*/
if (status == STATUS_IN_FLIGHT)
{
UPDATE_STAGE(@"doBookkeeping:");
[self doBookkeeping:delta_t];
}
if (status == STATUS_WITCHSPACE_COUNTDOWN)
{
UPDATE_STAGE(@"performWitchspaceCountdownUpdates:");
[self performWitchspaceCountdownUpdates:delta_t];
}
if (status == STATUS_EXITING_WITCHSPACE)
{
UPDATE_STAGE(@"performWitchspaceExitUpdates:");
[self performWitchspaceExitUpdates:delta_t];
}
if (status == STATUS_LAUNCHING)
{
UPDATE_STAGE(@"performLaunchingUpdates:");
[self performLaunchingUpdates:delta_t];
}
if (status == STATUS_DOCKING)
{
UPDATE_STAGE(@"performDockingUpdates:");
[self performDockingUpdates:delta_t];
}
if (status == STATUS_DEAD)
{
UPDATE_STAGE(@"performDeadUpdates:");
[self performDeadUpdates:delta_t];
}
#if WORMHOLE_SCANNER
UPDATE_STAGE(@"updateWormholes");
[self updateWormholes];
#endif
NS_HANDLER
#ifndef NDEBUG
OOLog(kOOLogException, @"***** Exception during [%@] in [PlayerEntity update:] : %@ : %@ *****", updateStage, [localException name], [localException reason]);
#endif
[localException raise];
NS_ENDHANDLER
} }
@ -1777,8 +1831,8 @@ static GLfloat launchRoll;
- (void) updateAlertCondition - (void) updateAlertCondition
{ {
/* TODO: update alert condition once per frame. Tried this before, but /* TODO: update alert condition once per frame. Tried this before, but
there turned out to be complications. See mailing list archive. there turned out to be complications. See mailing list archive.
-- Ahruman 20070802 -- Ahruman 20070802
*/ */
OOAlertCondition cond = [self alertCondition]; OOAlertCondition cond = [self alertCondition];
if (cond != lastScriptAlertCondition) if (cond != lastScriptAlertCondition)

12
src/Core/Universe.m
View File

@ -5484,7 +5484,7 @@ OOINLINE BOOL EntityInRange(Vector p1, Entity *e2, float range)
{ {
Entity *thing = my_entities[i]; Entity *thing = my_entities[i];
#ifndef NDEBUG #ifndef NDEBUG
update_stage = [NSString stringWithFormat:@"update:entity[%@]", [thing shortDescription]]; update_stage = [NSString stringWithFormat:@"update:entity [%@]", [thing shortDescription]];
#endif #endif
// Game Over code depends on regular delta_t updates to the dead player entity. Ignore the player entity, even when dead. // Game Over code depends on regular delta_t updates to the dead player entity. Ignore the player entity, even when dead.
if (EXPECT_NOT([thing status] == STATUS_DEAD && ![entitiesDeadThisUpdate containsObject:thing] && ![thing isPlayer])) if (EXPECT_NOT([thing status] == STATUS_DEAD && ![entitiesDeadThisUpdate containsObject:thing] && ![thing isPlayer]))
@ -5496,6 +5496,10 @@ OOINLINE BOOL EntityInRange(Vector p1, Entity *e2, float range)
[thing update:delta_t]; [thing update:delta_t];
#ifndef NDEBUG
update_stage = [NSString stringWithFormat:@"update:list maintenance [%@]", [thing shortDescription]];
#endif
// maintain distance-from-player list // maintain distance-from-player list
double z_distance = thing->zero_distance; double z_distance = thing->zero_distance;
@ -5512,15 +5516,15 @@ OOINLINE BOOL EntityInRange(Vector p1, Entity *e2, float range)
// update deterministic AI // update deterministic AI
if ([thing isShip]) if ([thing isShip])
{ {
#ifndef NDEBUG
update_stage = [NSString stringWithFormat:@"update:think [%@]", [thing shortDescription]];
#endif
AI* theShipsAI = [(ShipEntity *)thing getAI]; AI* theShipsAI = [(ShipEntity *)thing getAI];
if (theShipsAI) if (theShipsAI)
{ {
double thinkTime = [theShipsAI nextThinkTime]; double thinkTime = [theShipsAI nextThinkTime];
if ((universal_time > thinkTime)||(thinkTime == 0.0)) if ((universal_time > thinkTime)||(thinkTime == 0.0))
{ {
#ifndef NDEBUG
update_stage = [NSString stringWithFormat:@"update:think[%@]", [thing shortDescription]];
#endif
[theShipsAI setNextThinkTime:universal_time + [theShipsAI thinkTimeInterval]]; [theShipsAI setNextThinkTime:universal_time + [theShipsAI thinkTimeInterval]];
[theShipsAI think]; [theShipsAI think];
} }