7
7
// * Process all active entities' Process routine
8
8
// * Entity Collision detection
9
9
// * Animate all active entities
10
+ // * Activate entities in the `Entity.activateNextFrame` list
10
11
// * Activate entities that enter the active window
11
- // * Activate entities in the `Entity.tryToActivateAgain` list
12
12
// * Delete all entities in the `Entity.toDelete` list
13
13
//
14
14
//
@@ -32,7 +32,7 @@ namespace Entity {
32
32
33
33
34
34
// Previous entity being processed
35
- // Used in TryToActivateAgain, ProcessActiveWindow and the entity loop.
35
+ // Used in _ProcessActivateNextFrameList, _ProcessActiveWindow and the entity loop.
36
36
// (word address)
37
37
allocateTmpWord(_previousEntity)
38
38
@@ -135,26 +135,26 @@ macro __ChangeEntityList_Y() {
135
135
}
136
136
137
137
138
- // Processes the tryToActivateAgain entity list
138
+ // Processes the activateNextFrame entity list
139
139
//
140
140
// For each entity in the list it will try to reactivate the entity and
141
141
// if it succeeds move it into its designated entity list.
142
142
//
143
143
// REQUIRES: 16 bit A, 16 bit Index, DB = 0x7e
144
144
//
145
145
// MODIFIES: DP
146
- inline _ProcessTryToActivateAgainList () {
146
+ inline _ProcessActivateNextFrameList () {
147
147
assert16a()
148
148
assert16i()
149
149
150
- function ProcessTryToActivateAgainList {
151
- lda.w lists.tryToActivateAgain
150
+ function ProcessActivateNextFrameList {
151
+ lda.w lists.activateNextFrame
152
152
beq EndLoop
153
153
154
154
// this allows _previousEntity variable to work on first item
155
155
assert(BaseEntity.next == 0)
156
156
157
- ldy.w # lists.tryToActivateAgain
157
+ ldy.w # lists.activateNextFrame
158
158
sty.w _previousEntity
159
159
160
160
Loop:
@@ -194,7 +194,7 @@ inline _ProcessTryToActivateAgainList() {
194
194
__ChangeEntityList_Y()
195
195
// A = next entity address
196
196
// z set if there are no more entities in the current list
197
- // MUST NOT CHANGE _previousEntity as the entity is no longer in the tryToActivateAgain list
197
+ // MUST NOT CHANGE _previousEntity as the entity is no longer in the activateNextFrame list
198
198
199
199
bne Loop
200
200
@@ -254,7 +254,7 @@ inline _ProcessActiveWindow() {
254
254
255
255
// Could not activate the entity.
256
256
// Try again in the next frame.
257
- ldy.w # lists._TRY_TO_ACTIVATE_AGAIN_INDEX
257
+ ldy.w # lists._ACTIVATE_NEXT_FRAME_INDEX
258
258
bra _ChangeEntityList_Y
259
259
260
260
@@ -418,7 +418,7 @@ code()
418
418
function ProcessGameLoop {
419
419
jsr _UpdateActiveWindows
420
420
421
- _ProcessTryToActivateAgainList ()
421
+ _ProcessActivateNextFrameList ()
422
422
423
423
_ProcessActiveWindow()
424
424
0 commit comments