diff --git a/src/game/chr.c b/src/game/chr.c index ce49677eb..91cc5727f 100644 --- a/src/game/chr.c +++ b/src/game/chr.c @@ -3693,7 +3693,7 @@ void chrEmitSparks(struct chrdata *chr, struct prop *prop, s32 hitpart, struct c } if (chrGetShield(chr) > 0.0f) { - sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_00); + sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_DEFAULT); return; } @@ -3702,14 +3702,14 @@ void chrEmitSparks(struct chrdata *chr, struct prop *prop, s32 hitpart, struct c || prop->type == PROPTYPE_DOOR || hitpart == HITPART_GUN || hitpart == HITPART_HAT) { - sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_00); + sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_DEFAULT); return; } race = CHRRACE(chr); if (race == RACE_DRCAROLL || race == RACE_ROBOT || race == RACE_EYESPY) { - sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_01); + sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_ELECTRICAL); return; } @@ -3723,12 +3723,12 @@ void chrEmitSparks(struct chrdata *chr, struct prop *prop, s32 hitpart, struct c coord3.y = coord2->y * 42.0f + coord->y; coord3.z = coord2->z * 42.0f + coord->z; - sparksCreate(chrprop->rooms[0], chrprop, &coord3, coord2, 0, SPARKTYPE_04); + sparksCreate(chrprop->rooms[0], chrprop, &coord3, coord2, 0, SPARKTYPE_FLESH_LARGE); } #if VERSION < VERSION_JPN_FINAL - sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_02); - sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_03); + sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_BLOOD); + sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_FLESH); #endif } diff --git a/src/game/chraction.c b/src/game/chraction.c index 51a3f8d01..8562eab2a 100644 --- a/src/game/chraction.c +++ b/src/game/chraction.c @@ -8399,7 +8399,7 @@ void chrTickDie(struct chrdata *chr) var80068080 -= 5; propsnd0f0939f8(NULL, prop, SFX_SHIELD_DAMAGE, -1, -1, 1024, 0, 0, 0, -1, 0, -1, -1, -1, -1); - sparksCreate(prop->rooms[0], prop, &prop->pos, NULL, 0, SPARKTYPE_01); + sparksCreate(prop->rooms[0], prop, &prop->pos, NULL, 0, SPARKTYPE_ELECTRICAL); } return; @@ -18293,7 +18293,7 @@ glabel var7f1a9184 // if (chrIsUsingPaintball(chr)) { // sparksCreate(hitrooms[0], hitprop, &hitpos, NULL, NULL, SPARKTYPE_PAINT); // } else { -// sparksCreate(hitrooms[0], hitprop, &hitpos, NULL, NULL, SPARKTYPE_00); +// sparksCreate(hitrooms[0], hitprop, &hitpos, NULL, NULL, SPARKTYPE_DEFAULT); // } // // if (g_MissionConfig.iscoop && chr->team == TEAM_ALLY @@ -18312,7 +18312,7 @@ glabel var7f1a9184 // if (chrIsUsingPaintball(chr)) { // sparksCreate(hitrooms[0], 0, &hitpos, NULL, NULL, SPARKTYPE_PAINT); // } else { -// sparksCreate(hitrooms[0], 0, &hitpos, NULL, NULL, SPARKTYPE_00); +// sparksCreate(hitrooms[0], 0, &hitpos, NULL, NULL, SPARKTYPE_DEFAULT); // } // } // @@ -26410,6 +26410,6 @@ void chrDrCarollEmitSparks(struct chrdata *chr) { if (chr && chr->prop) { propsnd0f0939f8(0, chr->prop, SFX_SHIELD_DAMAGE, -1, -1, 0, 0, 0, 0, -1, 0, -1, -1, -1, -1); - sparksCreate(chr->prop->rooms[0], chr->prop, &chr->prop->pos, NULL, 0, SPARKTYPE_01); + sparksCreate(chr->prop->rooms[0], chr->prop, &chr->prop->pos, NULL, 0, SPARKTYPE_ELECTRICAL); } } diff --git a/src/game/dlights.c b/src/game/dlights.c index f91c831be..30544def9 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -1665,16 +1665,16 @@ const char var7f1a7bc0[] = "dlights.c"; // // switch (random() % 4) { // case 0: -// sparktype = SPARKTYPE_11; +// sparktype = SPARKTYPE_LIGHT1; // break; // case 1: -// sparktype = SPARKTYPE_12; +// sparktype = SPARKTYPE_LIGHT2; // break; // case 2: -// sparktype = SPARKTYPE_13; +// sparktype = SPARKTYPE_LIGHT3; // break; // case 3: -// sparktype = SPARKTYPE_14; +// sparktype = SPARKTYPE_LIGHT4; // break; // } // diff --git a/src/game/prop.c b/src/game/prop.c index 52fa21167..25b94de58 100644 --- a/src/game/prop.c +++ b/src/game/prop.c @@ -867,33 +867,33 @@ struct prop *shotCalculateHits(s32 handnum, bool arg1, struct coord *arg2, struc if (sp694.unk00.x > -32000 && sp694.unk00.x < 32000 && sp694.unk00.y > -32000 && sp694.unk00.y < 32000 && sp694.unk00.z > -32000 && sp694.unk00.z < 32000) { - sparktype = SPARKTYPE_00; + sparktype = SPARKTYPE_DEFAULT; if (chrIsUsingPaintball(g_Vars.currentplayer->prop->chr)) { sparktype = SPARKTYPE_PAINT; } else { switch (shotdata.gset.weaponnum) { case WEAPON_FARSIGHT: - sparktype = SPARKTYPE_16; + sparktype = SPARKTYPE_BGHIT_ORANGE; break; case WEAPON_CYCLONE: - sparktype = SPARKTYPE_01; + sparktype = SPARKTYPE_ELECTRICAL; break; case WEAPON_MAULER: case WEAPON_PHOENIX: case WEAPON_CALLISTO: case WEAPON_REAPER: - sparktype = SPARKTYPE_17; + sparktype = SPARKTYPE_BGHIT_GREEN; break; case WEAPON_TRANQUILIZER: - sparktype = SPARKTYPE_18; + sparktype = SPARKTYPE_BGHIT_TRANQULIZER; break; } uVar6 = g_Textures[sp694.texturenum].surfacetype; if (uVar6 == SURFACETYPE_SHALLOWWATER || uVar6 == SURFACETYPE_DEEPWATER) { - sparktype = SPARKTYPE_0F; + sparktype = SPARKTYPE_SHALLOWWATER; } } @@ -924,9 +924,9 @@ struct prop *shotCalculateHits(s32 handnum, bool arg1, struct coord *arg2, struc if (shotdata.gset.weaponnum != WEAPON_UNARMED && shotdata.gset.weaponnum != WEAPON_TRANQUILIZER) { if (hitaprop) { - sparksCreate(shotdata.hits[hitindex].prop->rooms[0], NULL, &shotdata.hits[hitindex].pos, &shotdata.dir, &shotdata.hits[hitindex].dir, SPARKTYPE_00); + sparksCreate(shotdata.hits[hitindex].prop->rooms[0], NULL, &shotdata.hits[hitindex].pos, &shotdata.dir, &shotdata.hits[hitindex].dir, SPARKTYPE_DEFAULT); } else { - sparksCreate(room, NULL, &sp694.unk00, &shotdata.dir, &sp694.unk0c, SPARKTYPE_00); + sparksCreate(room, NULL, &sp694.unk00, &shotdata.dir, &sp694.unk0c, SPARKTYPE_DEFAULT); } } } else { @@ -6161,19 +6161,19 @@ void propsTickPadEffects(void) up.z = -pad.up.z; if ((random() % 2048) <= 50) { - sparksCreate(rooms[0], NULL, &pad.pos, &up, &pad.up, SPARKTYPE_09); + sparksCreate(rooms[0], NULL, &pad.pos, &up, &pad.up, SPARKTYPE_ENVIRONMENTAL1); propsnd0f0939f8(NULL, NULL, propsndGetRandomSparkSound(), -1, -1, 0, 0, 0, &pad.pos, -1, rooms, -1, -1, -1, -1); } if ((random() % 2048) <= 15) { - sparksCreate(rooms[0], NULL, &pad.pos, &up, &pad.up, SPARKTYPE_09); - sparksCreate(rooms[0], NULL, &pad.pos, &up, &pad.up, SPARKTYPE_0A); + sparksCreate(rooms[0], NULL, &pad.pos, &up, &pad.up, SPARKTYPE_ENVIRONMENTAL1); + sparksCreate(rooms[0], NULL, &pad.pos, &up, &pad.up, SPARKTYPE_ENVIRONMENTAL2); propsnd0f0939f8(NULL, NULL, propsndGetRandomSparkSound(), -1, -1, 0, 0, 0, &pad.pos, -1, rooms, -1, -1, -1, -1); } if ((random() % 2048) <= 5) { - sparksCreate(rooms[0], NULL, &pad.pos, &up, &pad.up, SPARKTYPE_09); - sparksCreate(rooms[0], NULL, &pad.pos, &up, &pad.up, SPARKTYPE_0B); + sparksCreate(rooms[0], NULL, &pad.pos, &up, &pad.up, SPARKTYPE_ENVIRONMENTAL1); + sparksCreate(rooms[0], NULL, &pad.pos, &up, &pad.up, SPARKTYPE_ENVIRONMENTAL3); propsnd0f0939f8(NULL, NULL, propsndGetRandomSparkSound(), -1, -1, 0, 0, 0, &pad.pos, -1, rooms, -1, -1, -1, -1); } break; diff --git a/src/game/propobj.c b/src/game/propobj.c index 5f30972ac..4686ab2d9 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -5642,7 +5642,7 @@ s32 func0f06cd00(struct defaultobj *obj, struct coord *pos, struct coord *arg2, if (g_Textures[hitthing.texturenum].surfacetype == SURFACETYPE_DEEPWATER) { struct coord spa4 = {0, 0, 0}; s0 = false; - sparksCreate(prop->rooms[0], prop, &hitthing.unk00, &spa4, &hitthing.unk0c, SPARKTYPE_1A); + sparksCreate(prop->rooms[0], prop, &hitthing.unk00, &spa4, &hitthing.unk0c, SPARKTYPE_DEEPWATER); propsnd0f0939f8(0, prop, SFX_HIT_WATER, -1, -1, 1024, 0, 0, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); obj->hidden |= OBJHFLAG_REAPABLE; } @@ -14595,7 +14595,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) if (chrIsUsingPaintball(ownerprop ? ownerprop->chr : NULL)) { sparksCreate(prop->rooms[0], prop, &sp5e8, &dir, &sp5f4, SPARKTYPE_PAINT); } else { - sparksCreate(prop->rooms[0], prop, &sp5e8, &dir, &sp5f4, SPARKTYPE_10); + sparksCreate(prop->rooms[0], prop, &sp5e8, &dir, &sp5f4, SPARKTYPE_PROJECTILE); } } } @@ -19204,7 +19204,7 @@ void autogunTickShoot(struct prop *autogunprop) if (chrIsUsingPaintball(ownerchr)) { sparksCreate(hitprop->rooms[0], hitprop, &hitpos, 0, 0, SPARKTYPE_PAINT); } else { - sparksCreate(hitprop->rooms[0], hitprop, &hitpos, 0, 0, SPARKTYPE_00); + sparksCreate(hitprop->rooms[0], hitprop, &hitpos, 0, 0, SPARKTYPE_DEFAULT); } bgunPlayPropHitSound(&gset, hitprop, TEXTURE_00F2); @@ -19296,7 +19296,7 @@ void autogunTickShoot(struct prop *autogunprop) if (chrIsUsingPaintball(ownerchr)) { sparksCreate(hitrooms[0], NULL, &hitpos, 0, 0, SPARKTYPE_PAINT); } else { - sparksCreate(hitrooms[0], NULL, &hitpos, 0, 0, autogun->base.modelnum == MODEL_CETROOFGUN ? SPARKTYPE_17 : SPARKTYPE_00); + sparksCreate(hitrooms[0], NULL, &hitpos, 0, 0, autogun->base.modelnum == MODEL_CETROOFGUN ? SPARKTYPE_BGHIT_GREEN : SPARKTYPE_DEFAULT); } bgunPlayBgHitSound(&gset, &hitpos, -1, hitrooms); @@ -26236,7 +26236,7 @@ glabel var7f1aa6e0 // -1, 1024, 0, 0, 0, -1, 0, -1, -1, -1, -1); // // // Create sparks -// sparksCreate(prop->rooms[0], prop, &prop->pos, NULL, 0, SPARKTYPE_00); +// sparksCreate(prop->rooms[0], prop, &prop->pos, NULL, 0, SPARKTYPE_DEFAULT); // } // } else { // // 3e8 @@ -31551,7 +31551,7 @@ void objHit(struct shotdata *shotdata, struct hit *hit) if (chrIsUsingPaintball(g_Vars.currentplayer->prop->chr)) { sparksCreate(prop->rooms[0], prop, &sp110, 0, 0, SPARKTYPE_PAINT); } else { - sparksCreate(prop->rooms[0], prop, &sp110, 0, 0, SPARKTYPE_00); + sparksCreate(prop->rooms[0], prop, &sp110, 0, 0, SPARKTYPE_DEFAULT); } } @@ -38617,14 +38617,14 @@ void doorCreateSparks(struct doorobj *door) sp70.y = -pad.up.y; sp70.z = -pad.up.z; - sparksCreate(door->base.prop->rooms[0], door->base.prop, &sp88, &sp70, &pad.up, SPARKTYPE_09); + sparksCreate(door->base.prop->rooms[0], door->base.prop, &sp88, &sp70, &pad.up, SPARKTYPE_ENVIRONMENTAL1); - sparksCreate(door->base.prop->rooms[0], door->base.prop, &sp7c, &sp70, &pad.up, SPARKTYPE_09); + sparksCreate(door->base.prop->rooms[0], door->base.prop, &sp7c, &sp70, &pad.up, SPARKTYPE_ENVIRONMENTAL1); if (random() % 2) { - sparksCreate(door->base.prop->rooms[0], door->base.prop, &sp88, &sp70, &pad.up, SPARKTYPE_0C); + sparksCreate(door->base.prop->rooms[0], door->base.prop, &sp88, &sp70, &pad.up, SPARKTYPE_ENVIRONMENTAL4); } else { - sparksCreate(door->base.prop->rooms[0], door->base.prop, &sp88, &sp70, &pad.up, SPARKTYPE_0D); + sparksCreate(door->base.prop->rooms[0], door->base.prop, &sp88, &sp70, &pad.up, SPARKTYPE_ENVIRONMENTAL5); } propsnd0f0939f8(NULL, door->base.prop, propsndGetRandomSparkSound(), -1, @@ -40186,7 +40186,7 @@ void projectileCreate(struct prop *fromprop, struct fireslotthing *arg1, struct } func0f065e74(pos, fromprop->rooms, &endpos, sp1c8); - sparksCreate(sp1c8[0], obstacle, &endpos, NULL, NULL, SPARKTYPE_00); + sparksCreate(sp1c8[0], obstacle, &endpos, NULL, NULL, SPARKTYPE_DEFAULT); objTakeGunfire(obstacle->obj, gsetGetDamage(&gset), &endpos, weaponnum, -1); if (obj->type == OBJTYPE_WEAPON) { @@ -40204,7 +40204,7 @@ void projectileCreate(struct prop *fromprop, struct fireslotthing *arg1, struct bgunPlayBgHitSound(&gset, &endpos, -1, sp1c8); } - sparksCreate(sp1c8[0], NULL, &endpos, NULL, NULL, SPARKTYPE_00); + sparksCreate(sp1c8[0], NULL, &endpos, NULL, NULL, SPARKTYPE_DEFAULT); } } diff --git a/src/game/sparks.c b/src/game/sparks.c index ff5c8f90f..859abe707 100644 --- a/src/game/sparks.c +++ b/src/game/sparks.c @@ -181,17 +181,17 @@ void sparksCreate(s32 room, struct prop *prop, struct coord *pos, struct coord * struct coord grouppos; s32 i; - if ((typenum == SPARKTYPE_02 || typenum == SPARKTYPE_03) && prop && prop->type == PROPTYPE_CHR) { + if ((typenum == SPARKTYPE_BLOOD || typenum == SPARKTYPE_FLESH) && prop && prop->type == PROPTYPE_CHR) { struct chrdata *chr = prop->chr; u32 colours[3]; u32 stack; chrGetBloodColour(chr->bodynum, NULL, colours); - if (typenum == SPARKTYPE_02) { + if (typenum == SPARKTYPE_BLOOD) { type->unk1c = colours[0]; type->unk20 = colours[1]; - } else if (typenum == SPARKTYPE_03) { + } else if (typenum == SPARKTYPE_FLESH) { type->unk20 = colours[2]; } } else if (typenum == SPARKTYPE_PAINT) { @@ -210,7 +210,7 @@ void sparksCreate(s32 room, struct prop *prop, struct coord *pos, struct coord * g_NextSparkGroupIndex = (g_NextSparkGroupIndex + 1) % 10; - if (typenum == SPARKTYPE_0F) { + if (typenum == SPARKTYPE_SHALLOWWATER) { if (group->age != 0) { s32 newindex = -1; @@ -276,20 +276,20 @@ void sparksCreate(s32 room, struct prop *prop, struct coord *pos, struct coord * } switch (typenum) { - case SPARKTYPE_00: + case SPARKTYPE_DEFAULT: roomAdjustLighting(group->room, 24, 32); break; - case SPARKTYPE_09: + case SPARKTYPE_ENVIRONMENTAL1: if (g_Vars.stagenum != STAGE_CRASHSITE) { roomAdjustLighting(group->room, 32, 128); } break; - case SPARKTYPE_0A: + case SPARKTYPE_ENVIRONMENTAL2: if (g_Vars.stagenum != STAGE_CRASHSITE) { roomAdjustLighting(group->room, 64, 128); } break; - case SPARKTYPE_0B: + case SPARKTYPE_ENVIRONMENTAL3: if (g_Vars.stagenum != STAGE_CRASHSITE) { roomAdjustLighting(group->room, 200, 255); } diff --git a/src/game/weather.c b/src/game/weather.c index f798209ea..f4e1ff4f6 100644 --- a/src/game/weather.c +++ b/src/game/weather.c @@ -3016,7 +3016,7 @@ u32 var8007f0fc = 22000; // spd4.f[1] = g_Rooms[spcb8[s0]].bbmin[1] / spc84; // spd4.f[2] = particledata->unk3e80.f[2] + particledata->particles[p].pos.f[2]; // -// sparksCreate(spcb8[s0], NULL, &spd4, &particledata->particles[p].inc, NULL, SPARKTYPE_0F); +// sparksCreate(spcb8[s0], NULL, &spd4, &particledata->particles[p].inc, NULL, SPARKTYPE_SHALLOWWATER); // // spd80--; // } diff --git a/src/include/constants.h b/src/include/constants.h index a52cbbfae..99148e467 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -3687,27 +3687,27 @@ #define SOUNDMODE_HEADPHONE 2 #define SOUNDMODE_SURROUND 3 -#define SPARKTYPE_00 0x00 -#define SPARKTYPE_01 0x01 -#define SPARKTYPE_02 0x02 -#define SPARKTYPE_03 0x03 -#define SPARKTYPE_04 0x04 -#define SPARKTYPE_09 0x09 -#define SPARKTYPE_0A 0x0a -#define SPARKTYPE_0C 0x0c -#define SPARKTYPE_0B 0x0b -#define SPARKTYPE_0D 0x0d -#define SPARKTYPE_0F 0x0f -#define SPARKTYPE_10 0x10 -#define SPARKTYPE_11 0x11 -#define SPARKTYPE_12 0x12 -#define SPARKTYPE_13 0x13 -#define SPARKTYPE_14 0x14 -#define SPARKTYPE_16 0x16 -#define SPARKTYPE_17 0x17 -#define SPARKTYPE_18 0x18 -#define SPARKTYPE_PAINT 0x19 -#define SPARKTYPE_1A 0x1a +#define SPARKTYPE_DEFAULT 0x00 +#define SPARKTYPE_ELECTRICAL 0x01 +#define SPARKTYPE_BLOOD 0x02 +#define SPARKTYPE_FLESH 0x03 +#define SPARKTYPE_FLESH_LARGE 0x04 +#define SPARKTYPE_ENVIRONMENTAL1 0x09 +#define SPARKTYPE_ENVIRONMENTAL2 0x0a +#define SPARKTYPE_ENVIRONMENTAL3 0x0b +#define SPARKTYPE_ENVIRONMENTAL4 0x0c +#define SPARKTYPE_ENVIRONMENTAL5 0x0d +#define SPARKTYPE_SHALLOWWATER 0x0f +#define SPARKTYPE_PROJECTILE 0x10 +#define SPARKTYPE_LIGHT1 0x11 +#define SPARKTYPE_LIGHT2 0x12 +#define SPARKTYPE_LIGHT3 0x13 +#define SPARKTYPE_LIGHT4 0x14 +#define SPARKTYPE_BGHIT_ORANGE 0x16 +#define SPARKTYPE_BGHIT_GREEN 0x17 +#define SPARKTYPE_BGHIT_TRANQULIZER 0x18 +#define SPARKTYPE_PAINT 0x19 +#define SPARKTYPE_DEEPWATER 0x1a #define SPAWNFLAG_FORCESUNGLASSES 0x00000001 // 100% chance of wearing sunglasses if head model supports it #define SPAWNFLAG_MAYBESUNGLASSES 0x00000002 // 50% chance of wearing sunglasses if head model supports it