eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

queueAddEvent readability

This commit is contained in:
phobos2077 2023-07-05 10:52:13 +02:00
parent deb1afe4f1
commit cd4bf88fcf
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/queue.cc
View File

@ -250,9 +250,8 @@ int queueAddEvent(int delay, Object* obj, void* data, int eventType)
return -1; return -1;
} }
int v1 = gameTimeGetTime(); int eventTime = gameTimeGetTime() + delay;
int v2 = v1 + delay; newQueueListNode->time = eventTime;
newQueueListNode->time = v2;
newQueueListNode->type = eventType; newQueueListNode->type = eventType;
newQueueListNode->owner = obj; newQueueListNode->owner = obj;
newQueueListNode->data = data; newQueueListNode->data = data;
@ -261,22 +260,22 @@ int queueAddEvent(int delay, Object* obj, void* data, int eventType)
obj->flags |= OBJECT_QUEUED; obj->flags |= OBJECT_QUEUED;
} }
QueueListNode** v3 = &gQueueListHead; QueueListNode** nextNodePtr = &gQueueListHead;
if (gQueueListHead != NULL) { if (gQueueListHead != NULL) {
QueueListNode* v4; QueueListNode* node;
do { do {
v4 = *v3; node = *nextNodePtr;
if (v2 < v4->time) { if (eventTime < node->time) {
break; break;
} }
v3 = &(v4->next); nextNodePtr = &(node->next);
} while (v4->next != NULL); } while (node->next != NULL);
} }
newQueueListNode->next = *v3; newQueueListNode->next = *nextNodePtr;
*v3 = newQueueListNode; *nextNodePtr = newQueueListNode;
return 0; return 0;
} }
@ -358,18 +357,19 @@ bool queueHasEvent(Object* owner, int eventType)
int queueProcessEvents() int queueProcessEvents()
{ {
int time = gameTimeGetTime(); int time = gameTimeGetTime();
int v1 = 0; // TODO: this is 0 or 1, but in some cases -1. Probably needs to be bool.
int stopProcess = 0;
while (gQueueListHead != NULL) { while (gQueueListHead != NULL) {
QueueListNode* queueListNode = gQueueListHead; QueueListNode* queueListNode = gQueueListHead;
if (time < queueListNode->time || v1 != 0) { if (time < queueListNode->time || stopProcess != 0) {
break; break;
} }
gQueueListHead = queueListNode->next; gQueueListHead = queueListNode->next;
EventTypeDescription* eventTypeDescription = &(gEventTypeDescriptions[queueListNode->type]); EventTypeDescription* eventTypeDescription = &(gEventTypeDescriptions[queueListNode->type]);
v1 = eventTypeDescription->handlerProc(queueListNode->owner, queueListNode->data); stopProcess = eventTypeDescription->handlerProc(queueListNode->owner, queueListNode->data);
if (eventTypeDescription->freeProc != NULL) { if (eventTypeDescription->freeProc != NULL) {
eventTypeDescription->freeProc(queueListNode->data); eventTypeDescription->freeProc(queueListNode->data);
@ -378,7 +378,7 @@ int queueProcessEvents()
internal_free(queueListNode); internal_free(queueListNode);
} }
return v1; return stopProcess;
} }
// 0x4A2748 // 0x4A2748

8
src/scripts.cc
View File

@ -407,7 +407,7 @@ int gameTimeScheduleUpdateEvent()
int gameTimeEventProcess(Object* obj, void* data) int gameTimeEventProcess(Object* obj, void* data)
{ {
int movie_index; int movie_index;
int v4; int stopProcess;
movie_index = -1; movie_index = -1;
@ -423,17 +423,17 @@ int gameTimeEventProcess(Object* obj, void* data)
_scriptsCheckGameEvents(&movie_index, -1); _scriptsCheckGameEvents(&movie_index, -1);
} }
v4 = _critter_check_rads(gDude); stopProcess = _critter_check_rads(gDude);
_queue_clear_type(4, 0); _queue_clear_type(4, 0);
gameTimeScheduleUpdateEvent(); gameTimeScheduleUpdateEvent();
if (movie_index != -1) { if (movie_index != -1) {
v4 = 1; stopProcess = 1;
} }
return v4; return stopProcess;
} }
// 0x4A3690 // 0x4A3690