Project: ScummVM

Revision: 34753

Author: dreammaster

Date: 06 Oct 2008 05:16:26

• /scummvm/branches/branch-0-12-0/engines/lure/res_struct.cpp

  ......	@@ -434,13 +434,8 @@
  434	434	talkGate = 0;
  435	435	scriptHotspotId = 0;
  436	436
  437		// Set up NPC schedule if any
  438		uint16 npcScheduleId = READ_LE_UINT16(&rec->npcSchedule);
  439		if (npcScheduleId != 0) {
  440		Resources &res = Resources::getReference();
  441		CharacterScheduleEntry *entry = res.charSchedules().getEntry(npcScheduleId);
  442		npcSchedule.addFront(DISPATCH_ACTION, entry, roomNumber);
  443		}
  	437	// Get the NPC schedule, if any
  	438	npcScheduleId = READ_LE_UINT16(&rec->npcSchedule);
  444	439	}
  445	440
  446	441	void HotspotData::saveToStream(WriteStream *stream) {

• /scummvm/branches/branch-0-12-0/engines/lure/res_struct.h

  ......	@@ -543,6 +543,7 @@
  543	543	uint16 delayCtr;
  544	544	uint8 flags2;
  545	545	uint8 headerFlags;
  	546	uint16 npcScheduleId;
  546	547
  547	548	// Runtime fields
  548	549	uint16 actionCtr;

• /scummvm/branches/branch-0-12-0/engines/lure/hotspots.cpp

  ......	@@ -2760,11 +2760,11 @@
  2760	2760	// Walking done
  2761	2761	h.currentActions().top().setAction(DISPATCH_ACTION);
  2762	2762
  2763		if (h.destHotspotId() != 0) {
  	2763	// if (h.destHotspotId() != 0) {
  2764	2764	// Walking to an exit, check for any required room change
  2765	2765	if (Support::checkRoomChange(h))
  2766	2766	break;
  2767		}
  	2767	// }
  2768	2768	}
  2769	2769
  2770	2770	h.setOccupied(true);

• /scummvm/branches/branch-0-12-0/engines/lure/res.cpp

  ......	@@ -558,6 +558,13 @@
  558	558	if (h != NULL)
  559	559	return h;
  560	560
  	561	// If it's NPC with a schedule, then activate the schedule
  	562	if ((res->npcScheduleId != 0) && (res->npcSchedule.isEmpty())) {
  	563	Resources &resources = Resources::getReference();
  	564	CharacterScheduleEntry *entry = resources.charSchedules().getEntry(res->npcScheduleId);
  	565	res->npcSchedule.addFront(DISPATCH_ACTION, entry, res->roomNumber);
  	566	}
  	567
  561	568	// Check the script load flag
  562	569	if (res->scriptLoadFlag) {
  563	570	// Execute a script rather than doing a standard load