diff --git a/src/game/chraction.c b/src/game/chraction.c index 7dfa377d4..db0b02e82 100644 --- a/src/game/chraction.c +++ b/src/game/chraction.c @@ -3212,8 +3212,8 @@ void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hit struct animtablerow *row; struct animtablerow rows[] = { - { 0x005b, 0, -1, 0.6, 0, 27, -1 }, - { 0x0255, 0, -1, 0.5, 0, 25, -1 }, + { ANIM_005B, 0, -1, 0.6, 0, 27, -1 }, + { ANIM_0255, 0, -1, 0.5, 0, 25, -1 }, }; bool flip; @@ -3452,14 +3452,14 @@ void chrBeginArgh(struct chrdata *chr, f32 angle, s32 hitpart) && random() % 5 < 2) { struct animtablerow *row; struct animtablerow rows[] = { - { 0x013b, 0, -1, 0.5, 0, -1, -1 }, - { 0x013c, 0, -1, 0.5, 0, -1, -1 }, - { 0x013f, 0, -1, 0.5, 0, -1, -1 }, - { 0x0142, 0, -1, 0.5, 0, -1, -1 }, - { 0x0145, 0, -1, 0.5, 0, -1, -1 }, - { 0x0148, 0, -1, 0.5, 0, -1, -1 }, - { 0x0036, 0, -1, 0.5, 0, -1, -1 }, - { 0x0037, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_013B, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_013C, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_013F, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0142, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0145, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0148, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0036, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0037, 0, -1, 0.5, 0, -1, -1 }, }; chrStopFiring(chr); diff --git a/src/game/chraicommands.c b/src/game/chraicommands.c index 49e55c0e6..f83e4b0b6 100644 --- a/src/game/chraicommands.c +++ b/src/game/chraicommands.c @@ -7654,7 +7654,7 @@ bool aiShuffleInvestigationTerminals(void) } /** - * Used by the blow command, which makes Investigation scientists run to the + * Used by the below command, which makes Investigation scientists run to the * computer terminals. The number of the left is the pad that the terminal sits * on, and the number on the right is the pad that the scientist will run to * when running to the terminal. diff --git a/src/game/explosions.c b/src/game/explosions.c index 18ce20f59..c0d35d271 100644 --- a/src/game/explosions.c +++ b/src/game/explosions.c @@ -51,34 +51,34 @@ struct explosiontype g_ExplosionTypes[] = { // | | | | | | | | | flarespeed // | | | | | | | | | | smoketype // | | | | | | | | | | | sound - // | | | | | | | | | | | | damage - // | | | | | | | | | | | | | - /*00*/ { 0.1, 0.1, 0, 0, 0.1, 0, 0, 1, 1, 1, SMOKETYPE_NONE, 0x0000, 0 }, - /*01*/ { 1, 1, 0, 0, 1, 0, 0, 30, 1, 1, SMOKETYPE_BULLETIMPACT, 0x0000, 0 }, - /*02*/ { 20, 20, 0, 0, 30, 50, 50, 40, 1, 3, SMOKETYPE_MINI, 0x8099, 0.125 }, - /*03*/ { 50, 50, 0, 0, 50, 100, 100, 45, 1, 4, SMOKETYPE_MINI, 0x809a, 0.5 }, - /*04*/ { 60, 80, 2, 0.6, 100, 130, 240, 60, 2, 5, SMOKETYPE_ELECTRICAL, 0x809e, 1 }, - /*05*/ { 60, 120, 2, 0.6, 150, 160, 280, 60, 2, 5, SMOKETYPE_ELECTRICAL, 0x809e, 2 }, - /*06*/ { 20, 20, 0, 0, 22, 40, 40, 60, 1, 3, SMOKETYPE_MINI, 0x8099, 0.5 }, - /*07*/ { 35, 40, 0, 0, 35, 70, 70, 60, 1, 4, SMOKETYPE_MINI, 0x809a, 1 }, - /*08*/ { 50, 80, 2, 0.6, 50, 100, 160, 60, 2, 5, SMOKETYPE_ELECTRICAL, 0x809e, 2 }, - /*09*/ { 60, 120, 2, 0.6, 50, 130, 180, 60, 2, 5, SMOKETYPE_ELECTRICAL, 0x809e, 2 }, - /*10*/ { 40, 40, 0.8, 0.5, 70, 80, 160, 80, 4, 5, SMOKETYPE_SMALL, 0x80a0, 1 }, - /*11*/ { 50, 50, 1.2, 0.8, 100, 100, 200, 90, 1, 4, SMOKETYPE_SMALL, 0x809e, 2 }, - /*12*/ { 70, 60, 2, 1.2, 150, 140, 280, 90, 2, 5, SMOKETYPE_MEDIUM, 0x809e, 4 }, - /*13*/ { 80, 60, 4, 1.4, 200, 200, 400, 90, 2, 5, SMOKETYPE_LARGE, 0x809f, 4 }, - /*14*/ { 50, 50, 0, 0, 120, 150, 300, 150, 4, 4, SMOKETYPE_SMALL, 0x809f, 4 }, - /*15*/ { 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, SMOKETYPE_BULLETIMPACT, 0x809c, 0 }, - /*16*/ { 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, SMOKETYPE_BULLETIMPACT, 0x809c, 0 }, - /*17*/ { 80, 60, 10, 5, 1500, 2200, 3600, 500, 1, 2, SMOKETYPE_NONE, 0x80a5, 4 }, - /*18*/ { 80, 60, 3, 1, 300, 450, 640, 60, 1, 2, SMOKETYPE_NONE, 0x809f, 4 }, - /*19*/ { 90, 75, 2.5, 0.87, 250, 375, 600, 180, 2, 5, SMOKETYPE_LARGE, 0x809f, 4 }, - /*20*/ { 160, 120, 6, 2, 600, 450, 640, 60, 1, 2, SMOKETYPE_NONE, 0x809f, 4 }, - /*21*/ { 40, 30, 2, 0.7, 100, 140, 270, 45, 2, 5, SMOKETYPE_SMALL, 0x809f, 3.5 }, - /*22*/ { 20, 20, 0, 0, 30, 100, 200, 40, 1, 3, SMOKETYPE_MINI, 0x8099, 0.25 }, - /*23*/ { 100, 80, 4, 1.4, 210, 220, 500, 90, 2, 5, SMOKETYPE_LARGE, 0x809f, 4 }, - /*24*/ { 80, 60, 4, 1.4, 500, 200, 400, 90, 2, 5, SMOKETYPE_LARGE, 0x809f, 4 }, - /*25*/ { 640, 480, 32, 11.2, 1600, 1000, 1000, 180, 2, 5, SMOKETYPE_NONE, 0x80a4, 4 }, + // | | | | | | | | | | | | damage + // | | | | | | | | | | | | | + /*00*/ { 0.1, 0.1, 0, 0, 0.1, 0, 0, 1, 1, 1, SMOKETYPE_NONE, SFX_0000, 0 }, + /*01*/ { 1, 1, 0, 0, 1, 0, 0, 30, 1, 1, SMOKETYPE_BULLETIMPACT, SFX_0000, 0 }, + /*02*/ { 20, 20, 0, 0, 30, 50, 50, 40, 1, 3, SMOKETYPE_MINI, SFX_8099, 0.125 }, + /*03*/ { 50, 50, 0, 0, 50, 100, 100, 45, 1, 4, SMOKETYPE_MINI, SFX_EXPLOSION_809A, 0.5 }, + /*04*/ { 60, 80, 2, 0.6, 100, 130, 240, 60, 2, 5, SMOKETYPE_ELECTRICAL, SFX_809E, 1 }, + /*05*/ { 60, 120, 2, 0.6, 150, 160, 280, 60, 2, 5, SMOKETYPE_ELECTRICAL, SFX_809E, 2 }, + /*06*/ { 20, 20, 0, 0, 22, 40, 40, 60, 1, 3, SMOKETYPE_MINI, SFX_8099, 0.5 }, + /*07*/ { 35, 40, 0, 0, 35, 70, 70, 60, 1, 4, SMOKETYPE_MINI, SFX_EXPLOSION_809A, 1 }, + /*08*/ { 50, 80, 2, 0.6, 50, 100, 160, 60, 2, 5, SMOKETYPE_ELECTRICAL, SFX_809E, 2 }, + /*09*/ { 60, 120, 2, 0.6, 50, 130, 180, 60, 2, 5, SMOKETYPE_ELECTRICAL, SFX_809E, 2 }, + /*10*/ { 40, 40, 0.8, 0.5, 70, 80, 160, 80, 4, 5, SMOKETYPE_SMALL, SFX_80A0, 1 }, + /*11*/ { 50, 50, 1.2, 0.8, 100, 100, 200, 90, 1, 4, SMOKETYPE_SMALL, SFX_809E, 2 }, + /*12*/ { 70, 60, 2, 1.2, 150, 140, 280, 90, 2, 5, SMOKETYPE_MEDIUM, SFX_809E, 4 }, + /*13*/ { 80, 60, 4, 1.4, 200, 200, 400, 90, 2, 5, SMOKETYPE_LARGE, SFX_809F, 4 }, + /*14*/ { 50, 50, 0, 0, 120, 150, 300, 150, 4, 4, SMOKETYPE_SMALL, SFX_809F, 4 }, + /*15*/ { 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, SMOKETYPE_BULLETIMPACT, SFX_809C, 0 }, + /*16*/ { 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, SMOKETYPE_BULLETIMPACT, SFX_809C, 0 }, + /*17*/ { 80, 60, 10, 5, 1500, 2200, 3600, 500, 1, 2, SMOKETYPE_NONE, SFX_80A5, 4 }, + /*18*/ { 80, 60, 3, 1, 300, 450, 640, 60, 1, 2, SMOKETYPE_NONE, SFX_809F, 4 }, + /*19*/ { 90, 75, 2.5, 0.87, 250, 375, 600, 180, 2, 5, SMOKETYPE_LARGE, SFX_809F, 4 }, + /*20*/ { 160, 120, 6, 2, 600, 450, 640, 60, 1, 2, SMOKETYPE_NONE, SFX_809F, 4 }, + /*21*/ { 40, 30, 2, 0.7, 100, 140, 270, 45, 2, 5, SMOKETYPE_SMALL, SFX_809F, 3.5 }, + /*22*/ { 20, 20, 0, 0, 30, 100, 200, 40, 1, 3, SMOKETYPE_MINI, SFX_8099, 0.25 }, + /*23*/ { 100, 80, 4, 1.4, 210, 220, 500, 90, 2, 5, SMOKETYPE_LARGE, SFX_809F, 4 }, + /*24*/ { 80, 60, 4, 1.4, 500, 200, 400, 90, 2, 5, SMOKETYPE_LARGE, SFX_809F, 4 }, + /*25*/ { 640, 480, 32, 11.2, 1600, 1000, 1000, 180, 2, 5, SMOKETYPE_NONE, SFX_80A4, 4 }, }; bool explosionCreateSimple(struct prop *prop, struct coord *pos, RoomNum *rooms, s16 type, s32 playernum) diff --git a/src/game/weather.c b/src/game/weather.c index acbc59f2e..e17ead0d4 100644 --- a/src/game/weather.c +++ b/src/game/weather.c @@ -297,9 +297,9 @@ void weatherTickRain(struct weatherdata *weather) // Rain noise for (i = 0; i != 4; i++) { s32 sounds[] = { - 0x80b7, - 0x80b6, - 0x80b8, + SFX_80B7, + SFX_80B6, + SFX_80B8, -1, };