Skip to content

Commit d5b9cbe

Browse files
committed
Fix name conflict between Stockboy flock and libc flock
1 parent 41f9dc8 commit d5b9cbe

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

source/stockboy/flock.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
#define CIRCLE_SIZE 32
77
#define FLOCK_MINDIST (FIXAMT*20)
88

9-
sprite_set_t *fsp;
9+
static sprite_set_t *fsp;
1010

11-
flock_t flock[FLOCK_SIZE];
12-
circle_t circle[2];
11+
static flock_t flock[FLOCK_SIZE];
12+
static circle_t circle[2];
1313
static word tick=0;
1414

1515
void CreateFlockMember(byte n)
@@ -80,7 +80,7 @@ void UpdateFlockMember(flock_t *me)
8080
me->brightChg=1;
8181

8282
me->angle+=me->angAdj;
83-
83+
8484
dxAdj=Cosine(me->angle)/2;
8585
dyAdj=Sine(me->angle)/2;
8686

source/stockboy/flock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ void InitFlock(sprite_set_t *spr);
3030
void UpdateFlock(void);
3131
void RenderFlock(MGLDraw *mgl);
3232

33-
#endif
33+
#endif

0 commit comments

Comments
 (0)