Cleanup.

svn-id: r36228

1 files changed, 12 insertions, 12 deletions

diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp
index 683a096219..a91d1de08e 100644
--- a/engines/agos/event.cpp
+++ b/engines/agos/event.cpp
@@ -160,7 +160,7 @@ bool AGOSEngine::isVgaQueueEmpty() {
 	bool result = false;
 
 	while (vte->delay) {
-		if (vte->cur_vga_file == _variableArray[999] && vte->sprite_id >= 100) {
+		if (vte->zoneNum == _variableArray[999] && vte->id >= 100) {
 			result = true;
 			break;
 		}
@@ -195,7 +195,7 @@ void AGOSEngine::restartAnimation() {
 	// Check picture queue
 }
 
-void AGOSEngine::addVgaEvent(uint16 num, uint8 type, const byte *code_ptr, uint16 cur_sprite, uint16 curZoneNum) {
+void AGOSEngine::addVgaEvent(uint16 num, uint8 type, const byte *codePtr, uint16 curSprite, uint16 curZoneNum) {
 	VgaTimerEntry *vte;
 
 	_lockWord |= 1;
@@ -204,9 +204,9 @@ void AGOSEngine::addVgaEvent(uint16 num, uint8 type, const byte *code_ptr, uint1
 	}
 
 	vte->delay = num;
-	vte->script_pointer = code_ptr;
-	vte->sprite_id = cur_sprite;
-	vte->cur_vga_file = curZoneNum;
+	vte->codePtr = codePtr;
+	vte->id = curSprite;
+	vte->zoneNum = curZoneNum;
 	vte->type = type;
 
 	_lockWord &= ~1;
@@ -235,9 +235,9 @@ void AGOSEngine::processVgaEvents() {
 	while (vte->delay) {
 		vte->delay -= _vgaBaseDelay;
 		if (vte->delay <= 0) {
-			uint16 curZoneNum = vte->cur_vga_file;
-			uint16 cur_sprite = vte->sprite_id;
-			const byte *script_ptr = vte->script_pointer;
+			uint16 curZoneNum = vte->zoneNum;
+			uint16 curSprite = vte->id;
+			const byte *script_ptr = vte->codePtr;
 
 			switch (vte->type) {
 			case ANIMATE_INT:
@@ -248,7 +248,7 @@ void AGOSEngine::processVgaEvents() {
 			case ANIMATE_EVENT:
 				_nextVgaTimerToProcess = vte + 1;
 				deleteVgaEvent(vte);
-				animateEvent(script_ptr, curZoneNum, cur_sprite);
+				animateEvent(script_ptr, curZoneNum, curSprite);
 				vte = _nextVgaTimerToProcess;
 				break;
 			case SCROLL_EVENT:
@@ -274,10 +274,10 @@ void AGOSEngine::processVgaEvents() {
 	}
 }
 
-void AGOSEngine::animateEvent(const byte *code_ptr, uint16 curZoneNum, uint16 cur_sprite) {
+void AGOSEngine::animateEvent(const byte *codePtr, uint16 curZoneNum, uint16 curSprite) {
 	VgaPointersEntry *vpe;
 
-	_vgaCurSpriteId = cur_sprite;
+	_vgaCurSpriteId = curSprite;
 
 	_vgaCurZoneNum = curZoneNum;
 	_zoneNumber = curZoneNum;
@@ -287,7 +287,7 @@ void AGOSEngine::animateEvent(const byte *code_ptr, uint16 curZoneNum, uint16 cu
 	_curVgaFile2 = vpe->vgaFile2;
 	_curSfxFile = vpe->sfxFile;
 
-	_vcPtr = code_ptr;
+	_vcPtr = codePtr;
 
 	runVgaScript();
 }