ich777/cdogs-sdl
1
0
Fork 0
mirror of https://github.com/cxong/cdogs-sdl.git synced 2025-07-23 07:23:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

ostrich body #712

Browse Source
This commit is contained in:
Cong
2025-04-19 21:12:08 +10:00
parent e73fa7eda6
commit 205267d818
10 changed files with 399 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

723
data/.wolf3d/N3Ddata.cdogscpn/characters.json
View File

@@ -1,361 +1,364 @@
{
"Version": 14,
"Characters": [{
"Class": "Noah",
"PlayerTemplateName": "Noah",
"FacehairType": "beard",
"Skin": "ffb26aff",
"Arms": "a94fffff",
"Body": "a94fffff",
"Legs": "3144f7ff",
"Hair": "fff7efff",
"Feet": "744815ff",
"Facehair": "fcfcfcff",
"Hat": "fc7e04ff",
"Glasses": "fc7e04ff",
"speed": 256,
"Gun": "Small Launcher",
"maxHealth": 40,
"excessHealth": 80,
"flags": 0,
"probabilityToMove": 50,
"probabilityToTrack": 25,
"probabilityToShoot": 2,
"actionDelay": 15
},
{
"Class": "Sheep",
"HairType": "sheep",
"Skin": "fabf4eff",
"Arms": "db9642ff",
"Body": "de9b4bff",
"Legs": "e2964dff",
"Hair": "f7f3f3ff",
"Feet": "1e1a1aff",
"Facehair": "9a9a9aff",
"Hat": "9a9a9aff",
"Glasses": "9a9a9aff",
"speed": 193,
"Gun": "Sheep Spit",
"maxHealth": 25,
"excessHealth": 50,
"flags": 128,
"probabilityToMove": 52,
"probabilityToTrack": 42,
"probabilityToShoot": 13,
"actionDelay": 15
},
{
"Class": "Goat",
"HatType": "horns",
"Skin": "515151ff",
"Arms": "404040ff",
"Body": "404040ff",
"Legs": "404040ff",
"Hair": "565555ff",
"Feet": "090909ff",
"Facehair": "565555ff",
"Hat": "d29216ff",
"Glasses": "565555ff",
"speed": 386,
"Gun": "Goat Kick",
"maxHealth": 1,
"excessHealth": 2,
"flags": 1024,
"probabilityToMove": 50,
"probabilityToTrack": 68,
"probabilityToShoot": 0,
"actionDelay": 15
},
{
"Class": "Ostrich",
"Skin": "ffa83bff",
"Arms": "ecececff",
"Body": "f8f8ffff",
"Legs": "fcfcfcff",
"Hair": "ff1709ff",
"Feet": "404040ff",
"Facehair": "ff1709ff",
"Hat": "ff1709ff",
"Glasses": "ff1709ff",
"speed": 330,
"Gun": "Sheep Spit",
"maxHealth": 100,
"excessHealth": 100,
"flags": 128,
"probabilityToMove": 50,
"probabilityToTrack": 40,
"probabilityToShoot": 12,
"actionDelay": 15
},
{
"Class": "Antelope",
"HatType": "horns",
"Skin": "ffa83bff",
"Arms": "0b2effff",
"Body": "041af5ff",
"Legs": "0c06fcff",
"Hair": "181effff",
"Feet": "404040ff",
"Facehair": "181effff",
"Hat": "181effff",
"Glasses": "181effff",
"speed": 258,
"Gun": "SS Machine Gun",
"maxHealth": 160,
"excessHealth": 200,
"flags": 128,
"probabilityToMove": 50,
"probabilityToTrack": 41,
"probabilityToShoot": 12,
"actionDelay": 15
},
{
"Class": "Ox",
"HairType": "horns",
"Skin": "e9e9e9ff",
"Arms": "093f00ff",
"Body": "003f06ff",
"Legs": "003c08ff",
"Hair": "000000ff",
"Feet": "404040ff",
"Facehair": "000000ff",
"Hat": "000000ff",
"Glasses": "000000ff",
"speed": 194,
"Gun": "Sheep Spit",
"maxHealth": 100,
"excessHealth": 110,
"flags": 128,
"probabilityToMove": 50,
"probabilityToTrack": 42,
"probabilityToShoot": 12,
"actionDelay": 5
},
{
"Class": "Camel",
"Skin": "f5921dff",
"Arms": "0c08f0ff",
"Body": "0016ffff",
"Legs": "fc9b08ff",
"Hair": "bf7f00ff",
"Feet": "f79722ff",
"Facehair": "fcfa0aff",
"Hat": "fcfa0aff",
"Glasses": "fcfa0aff",
"speed": 192,
"Gun": "Dual Chain Gun",
"maxHealth": 1000,
"excessHealth": 2000,
"flags": 29824,
"Drop": "keys/plain/yellow",
"probabilityToMove": 30,
"probabilityToTrack": 20,
"probabilityToShoot": 42,
"actionDelay": 40
},
{
"Class": "Dr Schabbs",
"GlassesType": "goggles",
"Skin": "ffc785ff",
"Arms": "f7f5f5ff",
"Body": "fffafaff",
"Legs": "fffcfcff",
"Hair": "fcfcfcff",
"Feet": "fffcfcff",
"Facehair": "fcfcfcff",
"Hat": "fcfcfcff",
"Glasses": "fcfcfcff",
"speed": 192,
"Gun": "Syringes",
"maxHealth": 1250,
"excessHealth": 2500,
"flags": 29824,
"probabilityToMove": 40,
"probabilityToTrack": 30,
"probabilityToShoot": 52,
"actionDelay": 40
},
{
"Class": "Mecha Hitler",
"HairType": "hitler",
"Skin": "ffb871ff",
"Arms": "830000ff",
"Body": "007f83ff",
"Legs": "007a7eff",
"Hair": "000000ff",
"Feet": "006a74ff",
"Facehair": "000000ff",
"Hat": "000000ff",
"Glasses": "000000ff",
"speed": 192,
"Gun": "Quad Chain Gun",
"maxHealth": 1000,
"excessHealth": 2000,
"flags": 25728,
"probabilityToMove": 40,
"probabilityToTrack": 20,
"probabilityToShoot": 42,
"actionDelay": 40
},
{
"Class": "Hitler",
"HairType": "hitler",
"Skin": "ffb871ff",
"Arms": "d99b3cff",
"Body": "d9a644ff",
"Legs": "d29a2eff",
"Hair": "000000ff",
"Feet": "020100ff",
"Facehair": "000000ff",
"Hat": "000000ff",
"Glasses": "000000ff",
"speed": 327,
"Gun": "Dual Chain Gun",
"maxHealth": 750,
"excessHealth": 1500,
"flags": 25728,
"probabilityToMove": 40,
"probabilityToTrack": 20,
"probabilityToShoot": 80,
"actionDelay": 40
},
{
"Class": "Monkey",
"Skin": "ffbb63ff",
"Arms": "ecececff",
"Body": "f8f8ffff",
"Legs": "fcfcfcff",
"Hair": "6d410cff",
"Feet": "404040ff",
"Facehair": "ffededff",
"Hat": "ffededff",
"Glasses": "ffededff",
"speed": 256,
"Gun": "Rocket Launcher",
"maxHealth": 1000,
"excessHealth": 2000,
"flags": 25728,
"probabilityToMove": 40,
"probabilityToTrack": 20,
"probabilityToShoot": 42,
"actionDelay": 40
},
{
"Class": "Gretel Grosse",
"HairType": "pigtails",
"Skin": "ffbf73ff",
"Arms": "f00d00ff",
"Body": "ff0000ff",
"Legs": "fc0808ff",
"Hair": "fcfa0aff",
"Feet": "f70d00ff",
"Facehair": "fcfa0aff",
"Hat": "fcfa0aff",
"Glasses": "fcfa0aff",
"speed": 194,
"Gun": "Dual Chain Gun",
"maxHealth": 1000,
"excessHealth": 2000,
"flags": 25728,
"Drop": "keys/plain/yellow",
"probabilityToMove": 40,
"probabilityToTrack": 20,
"probabilityToShoot": 42,
"actionDelay": 40
},
{
"Class": "General Fettgesicht",
"HatType": "peak_cap",
"Skin": "ffbb63ff",
"Arms": "ffbf5fff",
"Body": "ffc26aff",
"Legs": "ffb965ff",
"Hair": "ffd073ff",
"Feet": "404040ff",
"Facehair": "ffd073ff",
"Hat": "ffd073ff",
"Glasses": "ffd073ff",
"speed": 192,
"Gun": "Chaingun and Rocket Launcher",
"maxHealth": 1000,
"excessHealth": 2000,
"flags": 25728,
"probabilityToMove": 40,
"probabilityToTrack": 20,
"probabilityToShoot": 42,
"actionDelay": 40
},
{
"Class": "Naamah",
"PlayerTemplateName": "Naamah",
"HairType": "long",
"Skin": "ffb26aff",
"Arms": "ff412aff",
"Body": "ff352aff",
"Legs": "ff372bff",
"Hair": "fff7efff",
"Feet": "744815ff",
"Facehair": "fcfcfcff",
"Hat": "fc7e04ff",
"Glasses": "fc7e04ff",
"speed": 256,
"Gun": "Small Launcher",
"maxHealth": 40,
"excessHealth": 80,
"flags": 0,
"probabilityToMove": 50,
"probabilityToTrack": 25,
"probabilityToShoot": 2,
"actionDelay": 15
},
{
"Class": "Noah",
"PlayerTemplateName": "Utnapishtim",
"HairType": "ponytail",
"FacehairType": "dutch",
"Skin": "ffb26aff",
"Arms": "ffad4bff",
"Body": "23e0ffff",
"Legs": "9f5d2aff",
"Hair": "fff7efff",
"Feet": "faa23fff",
"Facehair": "fcfcfcff",
"Hat": "fc7e04ff",
"Glasses": "fc7e04ff",
"speed": 256,
"Gun": "Small Launcher",
"maxHealth": 40,
"excessHealth": 80,
"flags": 0,
"probabilityToMove": 50,
"probabilityToTrack": 25,
"probabilityToShoot": 2,
"actionDelay": 15
},
{
"Class": "Noah",
"PlayerTemplateName": "Ziusudra",
"HairType": "long",
"FacehairType": "beard",
"HatType": "beret",
"Skin": "ffb26aff",
"Arms": "fcfcfcff",
"Body": "ff6316ff",
"Legs": "ff6023ff",
"Hair": "fff7efff",
"Feet": "744815ff",
"Facehair": "fcfcfcff",
"Hat": "ffb96eff",
"Glasses": "fc7e04ff",
"speed": 256,
"Gun": "Small Launcher",
"maxHealth": 40,
"excessHealth": 80,
"flags": 0,
"probabilityToMove": 50,
"probabilityToTrack": 25,
"probabilityToShoot": 2,
"actionDelay": 15
}]
}
"Version": 14,
"Characters": [
{
"Class": "Noah",
"PlayerTemplateName": "Noah",
"FacehairType": "beard",
"Skin": "ffb26aff",
"Arms": "a94fffff",
"Body": "a94fffff",
"Legs": "3144f7ff",
"Hair": "fff7efff",
"Feet": "744815ff",
"Facehair": "fcfcfcff",
"Hat": "fc7e04ff",
"Glasses": "fc7e04ff",
"speed": 256,
"Gun": "Small Launcher",
"maxHealth": 40,
"excessHealth": 80,
"flags": 0,
"probabilityToMove": 50,
"probabilityToTrack": 25,
"probabilityToShoot": 2,
"actionDelay": 15
},
{
"Class": "Sheep",
"HairType": "sheep",
"Skin": "fabf4eff",
"Arms": "db9642ff",
"Body": "de9b4bff",
"Legs": "e2964dff",
"Hair": "f7f3f3ff",
"Feet": "1e1a1aff",
"Facehair": "9a9a9aff",
"Hat": "9a9a9aff",
"Glasses": "9a9a9aff",
"speed": 193,
"Gun": "Sheep Spit",
"maxHealth": 25,
"excessHealth": 50,
"flags": 128,
"probabilityToMove": 52,
"probabilityToTrack": 42,
"probabilityToShoot": 13,
"actionDelay": 15
},
{
"Class": "Goat",
"HatType": "horns",
"Skin": "515151ff",
"Arms": "404040ff",
"Body": "404040ff",
"Legs": "404040ff",
"Hair": "565555ff",
"Feet": "090909ff",
"Facehair": "565555ff",
"Hat": "d29216ff",
"Glasses": "565555ff",
"speed": 386,
"Gun": "Goat Kick",
"maxHealth": 1,
"excessHealth": 2,
"flags": 1024,
"probabilityToMove": 50,
"probabilityToTrack": 68,
"probabilityToShoot": 0,
"actionDelay": 15
},
{
"Class": "Ostrich",
"HairType": "donut",
"Skin": "ee85ffff",
"Arms": "fffcfcff",
"Body": "2e2e2eff",
"Legs": "e28020ff",
"Hair": "ff1709ff",
"Feet": "404040ff",
"Facehair": "ff1709ff",
"Hat": "ff2a00ff",
"Glasses": "ff1709ff",
"speed": 330,
"Gun": "Sheep Spit",
"maxHealth": 100,
"excessHealth": 100,
"flags": 128,
"probabilityToMove": 50,
"probabilityToTrack": 40,
"probabilityToShoot": 12,
"actionDelay": 15
},
{
"Class": "Antelope",
"HatType": "horns",
"Skin": "ffa83bff",
"Arms": "0b2effff",
"Body": "041af5ff",
"Legs": "0c06fcff",
"Hair": "181effff",
"Feet": "404040ff",
"Facehair": "181effff",
"Hat": "181effff",
"Glasses": "181effff",
"speed": 258,
"Gun": "SS Machine Gun",
"maxHealth": 160,
"excessHealth": 200,
"flags": 128,
"probabilityToMove": 50,
"probabilityToTrack": 41,
"probabilityToShoot": 12,
"actionDelay": 15
},
{
"Class": "Ox",
"HairType": "donut",
"Skin": "e9e9e9ff",
"Arms": "093f00ff",
"Body": "003f06ff",
"Legs": "003c08ff",
"Hair": "000000ff",
"Feet": "404040ff",
"Facehair": "000000ff",
"Hat": "000000ff",
"Glasses": "000000ff",
"speed": 194,
"Gun": "Sheep Spit",
"maxHealth": 100,
"excessHealth": 110,
"flags": 128,
"probabilityToMove": 50,
"probabilityToTrack": 42,
"probabilityToShoot": 12,
"actionDelay": 5
},
{
"Class": "Camel",
"Skin": "f5921dff",
"Arms": "0c08f0ff",
"Body": "0016ffff",
"Legs": "fc9b08ff",
"Hair": "bf7f00ff",
"Feet": "f79722ff",
"Facehair": "fcfa0aff",
"Hat": "fcfa0aff",
"Glasses": "fcfa0aff",
"speed": 192,
"Gun": "Dual Chain Gun",
"maxHealth": 1000,
"excessHealth": 2000,
"flags": 29824,
"Drop": "keys/plain/yellow",
"probabilityToMove": 30,
"probabilityToTrack": 20,
"probabilityToShoot": 42,
"actionDelay": 40
},
{
"Class": "Dr Schabbs",
"GlassesType": "goggles",
"Skin": "ffc785ff",
"Arms": "f7f5f5ff",
"Body": "fffafaff",
"Legs": "fffcfcff",
"Hair": "fcfcfcff",
"Feet": "fffcfcff",
"Facehair": "fcfcfcff",
"Hat": "fcfcfcff",
"Glasses": "fcfcfcff",
"speed": 192,
"Gun": "Syringes",
"maxHealth": 1250,
"excessHealth": 2500,
"flags": 29824,
"probabilityToMove": 40,
"probabilityToTrack": 30,
"probabilityToShoot": 52,
"actionDelay": 40
},
{
"Class": "Mecha Hitler",
"HairType": "hitler",
"Skin": "ffb871ff",
"Arms": "830000ff",
"Body": "007f83ff",
"Legs": "007a7eff",
"Hair": "000000ff",
"Feet": "006a74ff",
"Facehair": "000000ff",
"Hat": "000000ff",
"Glasses": "000000ff",
"speed": 192,
"Gun": "Quad Chain Gun",
"maxHealth": 1000,
"excessHealth": 2000,
"flags": 25728,
"probabilityToMove": 40,
"probabilityToTrack": 20,
"probabilityToShoot": 42,
"actionDelay": 40
},
{
"Class": "Hitler",
"HairType": "hitler",
"Skin": "ffb871ff",
"Arms": "d99b3cff",
"Body": "d9a644ff",
"Legs": "d29a2eff",
"Hair": "000000ff",
"Feet": "020100ff",
"Facehair": "000000ff",
"Hat": "000000ff",
"Glasses": "000000ff",
"speed": 327,
"Gun": "Dual Chain Gun",
"maxHealth": 750,
"excessHealth": 1500,
"flags": 25728,
"probabilityToMove": 40,
"probabilityToTrack": 20,
"probabilityToShoot": 80,
"actionDelay": 40
},
{
"Class": "Monkey",
"Skin": "ffbb63ff",
"Arms": "ecececff",
"Body": "f8f8ffff",
"Legs": "fcfcfcff",
"Hair": "6d410cff",
"Feet": "404040ff",
"Facehair": "ffededff",
"Hat": "ffededff",
"Glasses": "ffededff",
"speed": 256,
"Gun": "Rocket Launcher",
"maxHealth": 1000,
"excessHealth": 2000,
"flags": 25728,
"probabilityToMove": 40,
"probabilityToTrack": 20,
"probabilityToShoot": 42,
"actionDelay": 40
},
{
"Class": "Gretel Grosse",
"HairType": "pigtails",
"Skin": "ffbf73ff",
"Arms": "f00d00ff",
"Body": "ff0000ff",
"Legs": "fc0808ff",
"Hair": "fcfa0aff",
"Feet": "f70d00ff",
"Facehair": "fcfa0aff",
"Hat": "fcfa0aff",
"Glasses": "fcfa0aff",
"speed": 194,
"Gun": "Dual Chain Gun",
"maxHealth": 1000,
"excessHealth": 2000,
"flags": 25728,
"Drop": "keys/plain/yellow",
"probabilityToMove": 40,
"probabilityToTrack": 20,
"probabilityToShoot": 42,
"actionDelay": 40
},
{
"Class": "General Fettgesicht",
"HatType": "peak_cap",
"Skin": "ffbb63ff",
"Arms": "ffbf5fff",
"Body": "ffc26aff",
"Legs": "ffb965ff",
"Hair": "ffd073ff",
"Feet": "404040ff",
"Facehair": "ffd073ff",
"Hat": "ffd073ff",
"Glasses": "ffd073ff",
"speed": 192,
"Gun": "Chaingun and Rocket Launcher",
"maxHealth": 1000,
"excessHealth": 2000,
"flags": 25728,
"probabilityToMove": 40,
"probabilityToTrack": 20,
"probabilityToShoot": 42,
"actionDelay": 40
},
{
"Class": "Naamah",
"PlayerTemplateName": "Naamah",
"HairType": "long",
"Skin": "ffb26aff",
"Arms": "ff412aff",
"Body": "ff352aff",
"Legs": "ff372bff",
"Hair": "fff7efff",
"Feet": "744815ff",
"Facehair": "fcfcfcff",
"Hat": "fc7e04ff",
"Glasses": "fc7e04ff",
"speed": 256,
"Gun": "Small Launcher",
"maxHealth": 40,
"excessHealth": 80,
"flags": 0,
"probabilityToMove": 50,
"probabilityToTrack": 25,
"probabilityToShoot": 2,
"actionDelay": 15
},
{
"Class": "Noah",
"PlayerTemplateName": "Utnapishtim",
"HairType": "ponytail",
"FacehairType": "dutch",
"Skin": "ffb26aff",
"Arms": "ffad4bff",
"Body": "23e0ffff",
"Legs": "9f5d2aff",
"Hair": "fff7efff",
"Feet": "faa23fff",
"Facehair": "fcfcfcff",
"Hat": "fc7e04ff",
"Glasses": "fc7e04ff",
"speed": 256,
"Gun": "Small Launcher",
"maxHealth": 40,
"excessHealth": 80,
"flags": 0,
"probabilityToMove": 50,
"probabilityToTrack": 25,
"probabilityToShoot": 2,
"actionDelay": 15
},
{
"Class": "Noah",
"PlayerTemplateName": "Ziusudra",
"HairType": "long",
"FacehairType": "beard",
"HatType": "beret",
"Skin": "ffb26aff",
"Arms": "fcfcfcff",
"Body": "ff6316ff",
"Legs": "ff6023ff",
"Hair": "fff7efff",
"Feet": "744815ff",
"Facehair": "fcfcfcff",
"Hat": "ffb96eff",
"Glasses": "fc7e04ff",
"speed": 256,
"Gun": "Small Launcher",
"maxHealth": 40,
"excessHealth": 80,
"flags": 0,
"probabilityToMove": 50,
"probabilityToTrack": 25,
"probabilityToShoot": 2,
"actionDelay": 15
}
]
}

24
data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/ostrich/data.json
View File

@@ -13,10 +13,17 @@
"Offsets": {
"Frame": {
"Head": {
"stand": [[0, 13]],
"idle": [[0, 13]],
"stand": [[0, 16]],
"idle": [[0, 16]],
"run": [
[0, 14], [0, 13], [0, 12], [0, 13], [0, 14], [0, 13], [0, 12], [0, 13]
[0, 17],
[0, 16],
[0, 15],
[0, 16],
[0, 17],
[0, 16],
[0, 15],
[0, 16]
]
},
"Body": {
@@ -30,7 +37,16 @@
"Gun": {
"stand": [[0, 6]],
"idle": [[0, 6]],
"run": [[0, 7], [0, 6], [0, 5], [0, 6], [0, 7], [0, 6], [0, 5], [0, 6]]
"run": [
[0, 7],
[0, 6],
[0, 5],
[0, 6],
[0, 7],
[0, 6],
[0, 5],
[0, 6]
]
}
}
}

BIN
data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/ostrich/legs_idle_24x24.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 627 B

After

Width:  |  Height:  |  Size: 603 B

BIN
data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/ostrich/legs_run_24x24.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/ostrich/src.blend
View File

Binary file not shown.

BIN
data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/ostrich/upper_idle_24x24.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 965 B

BIN
data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/ostrich/upper_idle_handgun_24x24.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/ostrich/upper_run_24x24.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/ostrich/upper_run_handgun_24x24.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

28
src/cdogs/draw/draw_actor.c
View File

@@ -205,7 +205,8 @@ static void UpdatePilotHeadPic(
{
if (c->Class->HasHeadParts[hp])
{
pics->HeadParts[hp] = GetHeadPartPic(c->HeadParts[hp], hp, dir, grimace, &c->Colors);
pics->HeadParts[hp] =
GetHeadPartPic(c->HeadParts[hp], hp, dir, grimace, &c->Colors);
}
}
}
@@ -320,10 +321,11 @@ static ActorPics GetUnorderedPics(
{
if (c->Class->HasHeadParts[hp])
{
pics.HeadParts[hp] = GetHeadPartPic(c->HeadParts[hp], hp, headDir, grimace, colors);
pics.HeadParts[hp] =
GetHeadPartPic(c->HeadParts[hp], hp, headDir, grimace, colors);
pics.HeadPartOffsets[hp] = GetActorDrawOffset(
pics.HeadParts[hp], BODY_PART_HEAD, c->Class->Sprites, anim, frame, dir,
GUNSTATE_READY);
pics.HeadParts[hp], BODY_PART_HEAD, c->Class->Sprites, anim,
frame, dir, GUNSTATE_READY);
}
}
@@ -411,7 +413,8 @@ static void ReorderPics(
break;
case BODY_PART_FACEHAIR:
pics->OrderedPics[bp] = pics->HeadParts[HEAD_PART_FACEHAIR];
pics->OrderedOffsets[bp] = pics->HeadPartOffsets[HEAD_PART_FACEHAIR];
pics->OrderedOffsets[bp] =
pics->HeadPartOffsets[HEAD_PART_FACEHAIR];
break;
case BODY_PART_HAT:
pics->OrderedPics[bp] = pics->HeadParts[HEAD_PART_HAT];
@@ -419,7 +422,8 @@ static void ReorderPics(
break;
case BODY_PART_GLASSES:
pics->OrderedPics[bp] = pics->HeadParts[HEAD_PART_GLASSES];
pics->OrderedOffsets[bp] = pics->HeadPartOffsets[HEAD_PART_GLASSES];
pics->OrderedOffsets[bp] =
pics->HeadPartOffsets[HEAD_PART_GLASSES];
break;
case BODY_PART_BODY:
pics->OrderedPics[bp] = pics->Body;
@@ -558,8 +562,8 @@ const Pic *GetHeadPic(
return CArrayGet(&ns->pics, idx);
}
const Pic *GetHeadPartPic(
const char *name, const HeadPart hp, const direction_e dir, const bool isGrimacing,
const CharColors *colors)
const char *name, const HeadPart hp, const direction_e dir,
const bool isGrimacing, const CharColors *colors)
{
if (name == NULL)
{
@@ -588,7 +592,6 @@ static const Pic *GetBodyPic(
CASSERT(numBarrels <= 2, "up to 2 barrels supported");
const NamedSprites *ns = NULL;
const char *upperPose = "";
// TODO: 2 grip firing pic
if (numBarrels == 1)
{
upperPose = "_handgun";
@@ -690,12 +693,13 @@ void DrawHead(
{
if (c->Class->HasHeadParts[hp])
{
const Pic *pic = GetHeadPartPic(c->HeadParts[hp], hp, dir, isGrimacing, &c->Colors);
const Pic *pic = GetHeadPartPic(
c->HeadParts[hp], hp, dir, isGrimacing, &c->Colors);
if (pic)
{
PicRender(
pic, renderer, drawPos, mask, 0, svec2_one(), SDL_FLIP_NONE,
Rect2iZero());
pic, renderer, drawPos, mask, 0, svec2_one(),
SDL_FLIP_NONE, Rect2iZero());
}
}
}