Skip to content

Commit

Permalink
Tweak vertical offsets of flying monsters when r_fixspriteoffsets C…
Browse files Browse the repository at this point in the history 
…VAR `on`

Improves clipping of cacodemons, lost souls and pain elementals when in liquid sectors. Also improves positioning of cacodemon corpses.
  • Loading branch information
@bradharding
bradharding committed Jan 11, 2025
1 parent 228f200 commit 137946b
Showing 1 changed file with 107 additions and 92 deletions.
199 changes: 107 additions & 92 deletions src/sprites.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,34 +394,42 @@ const sproffset_t sproffsets[] =
{ "HDB4A0", 11, 59, 22, 64, true }, // 10, 59
{ "HDB5A0", 11, 59, 22, 57, true }, // 10, 59
{ "HDB6A0", 11, 59, 22, 61, true }, // 10, 59
{ "HEADA3A7", 29, 66, 62, 67, true }, // 27, 68
{ "HEADA4A6", 29, 68, 63, 67, true }, // 32, 68
{ "HEADA5", 31, 67, 63, 65, true }, // 28, 66
{ "HEADB1", 31, 66, 63, 65, true }, // 31, 70
{ "HEADB2B8", 26, 66, 61, 66, true }, // 29, 69
{ "HEADB3B7", 29, 66, 62, 67, true }, // 30, 68
{ "HEADB4B6", 29, 66, 63, 65, true }, // 32, 67
{ "HEADB5", 31, 67, 63, 65, true }, // 32, 68
{ "HEADC1", 31, 67, 63, 69, true }, // 31, 71
{ "HEADC2C8", 26, 68, 60, 69, true }, // 29, 72
{ "HEADC3C7", 29, 66, 62, 69, true }, // 30, 68
{ "HEADC4C6", 29, 67, 63, 68, true }, // 32, 67
{ "HEADC5", 31, 68, 63, 67, true }, // 32, 68
{ "HEADD1", 31, 68, 63, 71, true }, // 31, 72
{ "HEADD2D8", 26, 69, 61, 71, true }, // 29, 72
{ "HEADD3D7", 29, 70, 62, 75, true }, // 30, 72
{ "HEADD4D6", 29, 69, 63, 71, true }, // 32, 70
{ "HEADD5", 31, 68, 63, 70, true }, // 32, 68
{ "HEADE2E8", 28, 65, 62, 65, true }, // 30, 67
{ "HEADE3E7", 29, 67, 62, 68, true }, // 29, 68
{ "HEADE4E6", 30, 69, 63, 67, true }, // 31, 69
{ "HEADE5", 31, 69, 63, 66, true }, // 30, 68
{ "HEADF2F8", 28, 64, 62, 65, true }, // 31, 66
{ "HEADF3F7", 30, 67, 62, 68, true }, // 31, 67
{ "HEADF4F6", 30, 69, 63, 67, true }, // 31, 69
{ "HEADF5", 31, 69, 63, 66, true }, // 30, 68
{ "HEADK0", 37, 63, 69, 66, true }, // 35, 63
{ "HEADL0", 40, 47, 75, 49, true }, // 37, 47
{ "HEADA1", 31, 61, 63, 66, true }, // 31, 67
{ "HEADA2A8", 26, 61, 61, 66, true }, // 26, 67
{ "HEADA3A7", 29, 60, 62, 67, true }, // 27, 68
{ "HEADA4A6", 29, 62, 63, 67, true }, // 32, 68
{ "HEADA5", 31, 61, 63, 65, true }, // 28, 66
{ "HEADB1", 31, 60, 63, 65, true }, // 31, 70
{ "HEADB2B8", 26, 60, 61, 66, true }, // 29, 69
{ "HEADB3B7", 29, 60, 62, 67, true }, // 30, 68
{ "HEADB4B6", 29, 60, 63, 65, true }, // 32, 67
{ "HEADB5", 31, 61, 63, 65, true }, // 32, 68
{ "HEADC1", 31, 61, 63, 69, true }, // 31, 71
{ "HEADC2C8", 26, 62, 60, 69, true }, // 29, 72
{ "HEADC3C7", 29, 60, 62, 69, true }, // 30, 68
{ "HEADC4C6", 29, 61, 63, 68, true }, // 32, 67
{ "HEADC5", 31, 62, 63, 67, true }, // 32, 68
{ "HEADD1", 31, 62, 63, 71, true }, // 31, 72
{ "HEADD2D8", 26, 63, 61, 71, true }, // 29, 72
{ "HEADD3D7", 29, 64, 62, 75, true }, // 30, 72
{ "HEADD4D6", 29, 63, 63, 71, true }, // 32, 70
{ "HEADD5", 31, 62, 63, 70, true }, // 32, 68
{ "HEADE1", 31, 62, 63, 67, true }, // 31, 68
{ "HEADE2E8", 28, 59, 62, 65, true }, // 30, 67
{ "HEADE3E7", 29, 61, 62, 68, true }, // 29, 68
{ "HEADE4E6", 30, 63, 63, 67, true }, // 31, 69
{ "HEADE5", 31, 63, 63, 66, true }, // 30, 68
{ "HEADF1", 31, 62, 63, 67, true }, // 31, 68
{ "HEADF2F8", 28, 58, 62, 65, true }, // 31, 66
{ "HEADF3F7", 30, 61, 62, 68, true }, // 31, 67
{ "HEADF4F6", 30, 63, 63, 67, true }, // 31, 69
{ "HEADF5", 31, 63, 63, 66, true }, // 30, 68
{ "HEADG0", 31, 62, 63, 67, true }, // 31, 68
{ "HEADH0", 31, 62, 63, 67, true }, // 31, 68
{ "HEADI0", 31, 62, 63, 67, true }, // 31, 68
{ "HEADJ0", 31, 66, 67, 77, true }, // 31, 72
{ "HEADK0", 37, 57, 69, 66, true }, // 35, 63
{ "HEADL0", 40, 42, 75, 49, true }, // 37, 47
{ "IFOGA0", 19, 33, 40, 37, true }, // 18, 33
{ "IFOGB0", 16, 27, 34, 30, true }, // 16, 26
{ "IFOGC0", 8, 20, 17, 16, true }, // 6, 15
Expand Down Expand Up @@ -468,42 +476,47 @@ const sproffset_t sproffsets[] =
{ "MISLA8A2", 16, 8, 32, 14, true }, // 16, 13
{ "MISLC0", 44, 36, 88, 72, true }, // 42, 34
{ "MISLD0", 52, 46, 103, 86, true }, // 50, 43
{ "PAINA2A8", 30, 58, 67, 55, true }, // 34, 58
{ "PAINA3A7", 37, 58, 70, 56, true }, // 35, 60
{ "PAINA4A6", 32, 59, 66, 55, true }, // 35, 59
{ "PAINA5", 36, 59, 72, 53, true }, // 37, 58
{ "PAINB2B8", 34, 58, 76, 55, true }, // 38, 58
{ "PAINB3B7", 37, 58, 70, 56, true }, // 35, 60
{ "PAINB4B6", 32, 59, 66, 55, true }, // 35, 59
{ "PAINB5", 37, 59, 77, 53, true }, // 38, 58
{ "PAINC2C8", 35, 58, 78, 55, true }, // 39, 58
{ "PAINC3C7", 37, 58, 70, 56, true }, // 35, 60
{ "PAINC4C6", 32, 59, 66, 55, true }, // 35, 59
{ "PAINC5", 38, 59, 77, 53, true }, // 36, 58
{ "PAIND1", 44, 61, 89, 55, true }, // 44, 62
{ "PAIND2D8", 41, 59, 80, 56, true }, // 40, 61
{ "PAIND3D7", 38, 59, 71, 57, true }, // 35, 61
{ "PAIND4D6", 36, 59, 70, 56, true }, // 35, 59
{ "PAIND5", 36, 59, 72, 53, true }, // 37, 58
{ "PAINE2E8", 42, 60, 81, 57, true }, // 41, 62
{ "PAINE3E7", 37, 59, 70, 61, true }, // 34, 61
{ "PAINE4E6", 36, 60, 70, 59, true }, // 35, 60
{ "PAINE5", 35, 60, 71, 56, true }, // 36, 59
{ "PAINF2F8", 47, 61, 82, 60, true }, // 38, 62
{ "PAINF3F7", 33, 61, 66, 64, true }, // 30, 63
{ "PAINF4F6", 41, 61, 75, 61, true }, // 36, 69
{ "PAINF5", 36, 62, 73, 59, true }, // 37, 68
{ "PAING1", 42, 61, 82, 57, true }, // 38, 60
{ "PAING2G8", 31, 59, 69, 55, true }, // 35, 60
{ "PAING3G7", 36, 59, 71, 57, true }, // 34, 62
{ "PAING4G6", 41, 59, 77, 56, true }, // 36, 59
{ "PAING5", 45, 58, 95, 53, true }, // 47, 57
{ "PAINH0", 42, 61, 82, 57, true }, // 41, 57
{ "PAINI0", 38, 58, 76, 56, true }, // 36, 54
{ "PAINJ0", 41, 57, 84, 56, true }, // 39, 54
{ "PAINK0", 47, 66, 97, 70, true }, // 46, 71
{ "PAINL0", 43, 66, 87, 72, true }, // 43, 71
{ "PAINM0", 52, 76, 102, 86, true }, // 49, 88
{ "PAINA1", 38, 52, 77, 57, true }, // 38, 60
{ "PAINA2A8", 30, 50, 67, 55, true }, // 34, 58
{ "PAINA3A7", 37, 50, 70, 56, true }, // 35, 60
{ "PAINA4A6", 32, 51, 66, 55, true }, // 35, 59
{ "PAINA5", 36, 51, 72, 53, true }, // 37, 58
{ "PAINB1", 39, 52, 77, 57, true }, // 39, 60
{ "PAINB2B8", 34, 50, 76, 55, true }, // 38, 58
{ "PAINB3B7", 37, 50, 70, 56, true }, // 35, 60
{ "PAINB4B6", 32, 51, 66, 55, true }, // 35, 59
{ "PAINB5", 37, 51, 77, 53, true }, // 38, 58
{ "PAINC1", 37, 52, 75, 57, true }, // 37, 60
{ "PAINC2C8", 35, 50, 78, 55, true }, // 39, 58
{ "PAINC3C7", 37, 50, 70, 56, true }, // 35, 60
{ "PAINC4C6", 32, 51, 66, 55, true }, // 35, 59
{ "PAINC5", 38, 51, 77, 53, true }, // 36, 58
{ "PAIND1", 44, 53, 89, 55, true }, // 44, 62
{ "PAIND2D8", 41, 51, 80, 56, true }, // 40, 61
{ "PAIND3D7", 38, 51, 71, 57, true }, // 35, 61
{ "PAIND4D6", 36, 51, 70, 56, true }, // 35, 59
{ "PAIND5", 36, 51, 72, 53, true }, // 37, 58
{ "PAINE1", 43, 54, 88, 58, true }, // 43, 62
{ "PAINE2E8", 42, 52, 81, 57, true }, // 41, 62
{ "PAINE3E7", 37, 51, 70, 61, true }, // 34, 61
{ "PAINE4E6", 36, 52, 70, 59, true }, // 35, 60
{ "PAINE5", 35, 52, 71, 56, true }, // 36, 59
{ "PAINF1", 38, 54, 77, 60, true }, // 38, 62
{ "PAINF2F8", 47, 53, 82, 60, true }, // 38, 62
{ "PAINF3F7", 33, 53, 66, 64, true }, // 30, 63
{ "PAINF4F6", 41, 53, 75, 61, true }, // 36, 69
{ "PAINF5", 36, 54, 73, 59, true }, // 37, 68
{ "PAING1", 42, 53, 82, 57, true }, // 38, 60
{ "PAING2G8", 31, 51, 69, 55, true }, // 35, 60
{ "PAING3G7", 36, 51, 71, 57, true }, // 34, 62
{ "PAING4G6", 41, 51, 77, 56, true }, // 36, 59
{ "PAING5", 45, 50, 95, 53, true }, // 47, 57
{ "PAINH0", 42, 53, 82, 57, true }, // 41, 57
{ "PAINI0", 38, 50, 76, 56, true }, // 36, 54
{ "PAINJ0", 41, 49, 84, 56, true }, // 39, 54
{ "PAINK0", 47, 58, 97, 70, true }, // 46, 71
{ "PAINL0", 43, 58, 87, 72, true }, // 43, 71
{ "PAINM0", 52, 68, 102, 86, true }, // 49, 88
{ "PINSA0", 12, 40, 25, 25, true }, // 11, 39
{ "PINSB0", 12, 40, 25, 25, true }, // 11, 39
{ "PINSC0", 12, 40, 25, 25, true }, // 11, 39
Expand Down Expand Up @@ -659,34 +672,36 @@ const sproffset_t sproffsets[] =
{ "SKELO0", 27, 51, 65, 55, true }, // 28, 51
{ "SKELP0", 23, 33, 62, 38, true }, // 28, 33
{ "SKELQ0", 29, 15, 65, 22, true }, // 40, 19
{ "SKULA1", 22, 50, 44, 47, true }, // 20, 50
{ "SKULA5", 22, 49, 44, 46, true }, // 21, 48
{ "SKULA6A4", 13, 56, 35, 52, true }, // 13, 53
{ "SKULA7A3", 14, 57, 31, 54, true }, // 14, 54
{ "SKULA8A2", 15, 50, 32, 47, true }, // 15, 47
{ "SKULB1", 22, 49, 44, 46, true }, // 20, 49
{ "SKULB5", 22, 49, 44, 46, true }, // 21, 48
{ "SKULB6B4", 13, 56, 35, 52, true }, // 13, 53
{ "SKULB7B3", 14, 57, 31, 54, true }, // 14, 54
{ "SKULB8B2", 15, 56, 32, 53, true }, // 15, 53
{ "SKULC1", 22, 47, 44, 44, true }, // 23, 47
{ "SKULC5", 22, 31, 44, 26, true }, // 20, 30
{ "SKULC7C3", 33, 37, 67, 33, true }, // 33, 36
{ "SKULC8C2", 32, 38, 60, 36, true }, // 32, 37
{ "SKULD1", 22, 46, 44, 44, true }, // 23, 46
{ "SKULD5", 22, 32, 44, 26, true }, // 20, 31
{ "SKULD7D3", 33, 37, 67, 33, true }, // 33, 36
{ "SKULD8D2", 25, 38, 53, 36, true }, // 25, 37
{ "SKULE1", 15, 53, 34, 51, true }, // 14, 53
{ "SKULE6E4", 11, 54, 30, 52, true }, // 11, 53
{ "SKULE7E3", 15, 55, 33, 54, true }, // 15, 54
{ "SKULE8E2", 15, 55, 36, 54, true }, // 15, 54
{ "SKULF0", 15, 53, 34, 51, true }, // 17, 53
{ "SKULG0", 17, 53, 36, 53, true }, // 15, 53
{ "SKULH0", 23, 48, 45, 48, true }, // 24, 48
{ "SKULI0", 35, 52, 68, 60, true }, // 35, 58
{ "SKULJ0", 44, 59, 88, 72, true }, // 45, 75
{ "SKULK0", 51, 67, 103, 90, true }, // 49, 85
{ "SKULA1", 22, 42, 44, 47, true }, // 20, 50
{ "SKULA5", 22, 41, 44, 46, true }, // 21, 48
{ "SKULA6A4", 13, 48, 35, 52, true }, // 13, 53
{ "SKULA7A3", 14, 49, 31, 54, true }, // 14, 54
{ "SKULA8A2", 15, 42, 32, 47, true }, // 15, 47
{ "SKULB1", 22, 41, 44, 46, true }, // 20, 49
{ "SKULB5", 22, 41, 44, 46, true }, // 21, 48
{ "SKULB6B4", 13, 48, 35, 52, true }, // 13, 53
{ "SKULB7B3", 14, 49, 31, 54, true }, // 14, 54
{ "SKULB8B2", 15, 48, 32, 53, true }, // 15, 53
{ "SKULC1", 22, 39, 44, 44, true }, // 23, 47
{ "SKULC5", 22, 23, 44, 26, true }, // 20, 30
{ "SKULC6C4", 24, 28, 54, 32, true }, // 24, 36
{ "SKULC7C3", 33, 29, 67, 33, true }, // 33, 36
{ "SKULC8C2", 32, 30, 60, 36, true }, // 32, 37
{ "SKULD1", 22, 38, 44, 44, true }, // 23, 46
{ "SKULD5", 22, 24, 44, 26, true }, // 20, 31
{ "SKULD6D4", 18, 28, 48, 32, true }, // 18, 36
{ "SKULD7D3", 33, 29, 67, 33, true }, // 33, 36
{ "SKULD8D2", 25, 30, 53, 36, true }, // 25, 37
{ "SKULE1", 15, 45, 34, 51, true }, // 14, 53
{ "SKULE6E4", 11, 46, 30, 52, true }, // 11, 53
{ "SKULE7E3", 15, 47, 33, 54, true }, // 15, 54
{ "SKULE8E2", 15, 47, 36, 54, true }, // 15, 54
{ "SKULF0", 15, 45, 34, 51, true }, // 17, 53
{ "SKULG0", 17, 45, 36, 53, true }, // 15, 53
{ "SKULH0", 23, 40, 45, 48, true }, // 24, 48
{ "SKULI0", 35, 44, 68, 60, true }, // 35, 58
{ "SKULJ0", 44, 51, 88, 72, true }, // 45, 75
{ "SKULK0", 51, 59, 103, 90, true }, // 49, 85
{ "SMBTA0", 8, 72, 17, 73, false }, // 10, 72
{ "SMBTB0", 8, 67, 17, 68, false }, // 10, 67
{ "SMBTC0", 8, 67, 16, 68, false }, // 10, 67
Expand Down

0 comments on commit 137946b

Please sign in to comment.