Improve explosion types and smoke types data

This commit is contained in:
Ryan Dwyer
2020-01-21 22:59:05 +10:00
parent 391ab87899
commit 0469c71bb6
5 changed files with 141 additions and 100 deletions
+11
View File
@@ -584,6 +584,7 @@
#define NUM_AICOMMANDS 481
#define NUM_CHALLENGES 30
#define NUM_CHEATS 42
#define NUM_EXPLOSIONTYPES 26
#define NUM_FIRESLOTS 20
#define NUM_MPBEAUHEADS 5
#define NUM_MPBOTCOMMANDS 14
@@ -591,6 +592,7 @@
#define NUM_MPHEADS 75
#define NUM_MPPRESETS 14
#define NUM_MPTRACKS 42
#define NUM_SMOKETYPES 23
#define NUM_SOLONORMALSTAGES 17
#define NUM_SOLOSTAGES 21
#define NUM_STAGES 90
@@ -867,6 +869,15 @@
#define SCREENSPLIT_HORIZONTAL 0
#define SCREENSPLIT_VERTICAL 1
#define SMOKETYPE_0 0
#define SMOKETYPE_1 1
#define SMOKETYPE_2 2
#define SMOKETYPE_3 3
#define SMOKETYPE_4 4
#define SMOKETYPE_5 5
#define SMOKETYPE_6 6
#define SMOKETYPE_7 7
#define SOLOSTAGEINDEX_DEFECTION 0
#define SOLOSTAGEINDEX_INVESTIGATION 1
#define SOLOSTAGEINDEX_EXTRACTION 2
+2 -2
View File
@@ -67,8 +67,8 @@ extern u32 var8007dc10;
extern u32 var8007e3d0;
extern u32 var8007e4a0;
extern u32 var8007e4a4;
extern u32 var8007e4b8;
extern u32 smoketable[];
extern struct explosiontype g_ExplosionTypes[NUM_EXPLOSIONTYPES];
extern struct smoketype g_SmokeTypes[NUM_SMOKETYPES];
extern u32 sparktable[];
extern u32 var8007f0b8;
extern u32 var8007f0c0;
+30
View File
@@ -4687,4 +4687,34 @@ struct mppreset {
u8 challenges[16];
};
struct explosiontype {
f32 rangeh;
f32 rangev;
f32 changerateh;
f32 changeratev;
f32 innersize;
f32 blastradius;
f32 damageradius;
u16 duration;
u16 propagationrate;
f32 flarespeed;
u8 smoketype;
u16 sound;
f32 damage;
};
struct smoketype {
u16 duration;
u16 fadespeed;
u16 spreadspeed;
u16 size;
f32 bgrotatespeed;
u32 colour;
f32 fgrotatespeed;
u16 numclouds;
f32 unk18;
f32 unk1c;
f32 unk20;
};
#endif