Skip to content

Commit cb3ebb2

Browse files
authored
Fill in powerup related headers
1 parent 87b8169 commit cb3ebb2

File tree

6 files changed

+79
-6
lines changed

6 files changed

+79
-6
lines changed

include/jt.h

+12-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,18 @@
55
#define JT_H
66

77
#include "common.h"
8+
#include <step.h>
89

9-
// ...
10+
/**
11+
* @brief Sly entity.
12+
*
13+
* JT = "jewel thief" = codename for Sly.
14+
*
15+
* @todo Implement struct.
16+
*/
17+
struct JT : public STEP
18+
{
19+
// ...
20+
};
1021

1122
#endif // JT_H

include/po.h

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/**
2+
* @file po.h
3+
*
4+
* @brief TBD
5+
*/
6+
#ifndef PO_H
7+
#define PO_H
8+
9+
#include "common.h"
10+
#include <so.h>
11+
12+
/**
13+
* @brief TBD
14+
*
15+
* @todo Implement struct.
16+
*/
17+
struct PO : public SO
18+
{
19+
// ...
20+
};
21+
22+
#endif // PO_H

include/so.h

+8-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,16 @@
66
#ifndef SO_H
77
#define SO_H
88

9+
#include <alo.h>
10+
911
/**
12+
* @brief Scene object.
13+
*
1014
* @todo Implement struct.
1115
*/
12-
struct SO;
16+
struct SO : public ALO
17+
{
18+
// ...
19+
};
1320

1421
#endif // SO_H

include/step.h

+10-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,16 @@
55
#define STEP_H
66

77
#include "common.h"
8+
#include <po.h>
89

9-
// ...
10+
/**
11+
* @brief TBD
12+
*
13+
* @todo Implement struct.
14+
*/
15+
struct STEP : public PO
16+
{
17+
// ...
18+
};
1019

1120
#endif // STEP_H

include/steppower.h

+26-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,35 @@
55
#define STEPPOWER_H
66

77
#include "common.h"
8+
#include <jt.h>
89
#include <joy.h>
910

1011
/**
11-
* @brief Rotate the current powerup.
12+
* @brief Selected powerup flags.
1213
*/
13-
int IRotatePowerUp(JOY *pjoy,int iCur,int iMax,int *mpigrfvault);
14+
enum FSP
15+
{
16+
FSP_Nil = -1,
17+
FSP_Dive = 0,
18+
FSP_SpeedUpClock = 1,
19+
FSP_SlowDownClock = 2,
20+
FSP_Ball = 3,
21+
FSP_Max = 4
22+
};
23+
24+
/**
25+
* @brief Set the selected powerup.
26+
*/
27+
void SetFsp(FSP fsp);
28+
29+
/**
30+
* @brief Update the currently selected powerup.
31+
*/
32+
void UpdateJtActivePowerUp(JT *pjt, JOY *pjoy);
33+
34+
/**
35+
* @brief Rotate the selected powerup.
36+
*/
37+
int IRotatePowerUp(JOY *pjoy, int iCur, int iMax, int *mpigrfvault);
1438

1539
#endif // STEPPOWER_H

src/P2/steppower.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "common.h"
1+
#include "steppower.h"
22

33
INCLUDE_ASM(const s32, "P2/steppower", SetFsp__F3FSP);
44

0 commit comments

Comments
 (0)