diff --git a/missionpack/g_monster.c b/missionpack/g_monster.c index 218f5d5..b7b513e 100644 --- a/missionpack/g_monster.c +++ b/missionpack/g_monster.c @@ -1646,6 +1646,7 @@ int PatchMonsterModel (char *modelname) qboolean is_vulture = false; qboolean is_zboss_mech = false; qboolean is_zboss_pilot = false; + qboolean is_q1monster = false; qboolean gamedirpakfile = false; @@ -1742,6 +1743,17 @@ int PatchMonsterModel (char *modelname) is_zboss_pilot = true; numskins = 12; } + else if ( !strcmp(modelname, "models/monsters/q1dog/tris.md2") || !strcmp(modelname, "models/monsters/q1enforcer/tris.md2") + || !strcmp(modelname, "models/monsters/q1fiend/tris.md2") || !strcmp(modelname, "models/monsters/q1freddie/tris.md2") + || !strcmp(modelname, "models/monsters/q1grunt/tris.md2") || !strcmp(modelname, "models/monsters/q1hknight/tris.md2") + || !strcmp(modelname, "models/monsters/q1knight/tris.md2") || !strcmp(modelname, "models/monsters/q1ogre/tris.md2") + || !strcmp(modelname, "models/monsters/q1rotfish/tris.md2") || !strcmp(modelname, "models/monsters/q1scrag/tris.md2") + || !strcmp(modelname, "models/monsters/q1shalrath/tris.md2") || !strcmp(modelname, "models/monsters/q1shambler/tris.md2") + || !strcmp(modelname, "models/monsters/q1tarbaby/tris.md2") || !strcmp(modelname, "models/monsters/q1zombie/tris.md2") ) + { + is_q1monster = true; + numskins = 4; + } // end Knightmare @@ -2176,6 +2188,20 @@ int PatchMonsterModel (char *modelname) Com_strcat (skins[j], sizeof(skins[j]), "custom3_p2.pcx"); break; } } + else if (is_q1monster) + { + switch (j) + { + case 0: + Com_strcat (skins[j], sizeof(skins[j]), "skin0.pcx"); break; + case 1: + Com_strcat (skins[j], sizeof(skins[j]), "custom1.pcx"); break; + case 2: + Com_strcat (skins[j], sizeof(skins[j]), "custom2.pcx"); break; + case 3: + Com_strcat (skins[j], sizeof(skins[j]), "custom3.pcx"); break; + } + } // end Knightmare else { diff --git a/missionpack/m_dog.c b/missionpack/m_dog.c index 6a188d5..c10b77d 100644 --- a/missionpack/m_dog.c +++ b/missionpack/m_dog.c @@ -17,7 +17,7 @@ static int sound_sight; static int sound_idle; -/*static*/ void dog_idle (edict_t *self) +void dog_idle (edict_t *self) { if (random() < 0.2) gi.sound (self, CHAN_VOICE, sound_idle, 1, ATTN_IDLE, 0); @@ -155,7 +155,7 @@ void dog_pain (edict_t *self, edict_t *other, float kick, int damage) // MELEE -/*static*/ void dog_bite (edict_t *self) +void dog_bite (edict_t *self) { vec3_t aim; @@ -165,7 +165,7 @@ void dog_pain (edict_t *self, edict_t *other, float kick, int damage) } -/*static*/ void dog_checkrefire (edict_t *self) +void dog_checkrefire (edict_t *self) { if (!self->enemy || !self->enemy->inuse || self->enemy->health <= 0) return; @@ -196,7 +196,7 @@ void dog_melee (edict_t *self) // LEAP -/*static*/ void dog_jump_touch (edict_t *self, edict_t *other, cplane_t *plane, csurface_t *surf) +void dog_jump_touch (edict_t *self, edict_t *other, cplane_t *plane, csurface_t *surf) { if (self->health <= 0) { @@ -234,7 +234,7 @@ void dog_melee (edict_t *self) } -/*static*/ void dogtakeoff (edict_t *self) +void dogtakeoff (edict_t *self) { vec3_t forward; @@ -248,7 +248,7 @@ void dog_melee (edict_t *self) self->touch = dog_jump_touch; } -/*static*/ void dogchecklanding (edict_t *self) +void dogchecklanding (edict_t *self) { if (self->groundentity) { diff --git a/missionpack/m_q1dog.c b/missionpack/m_q1dog.c index b6ee388..d3752dd 100644 --- a/missionpack/m_q1dog.c +++ b/missionpack/m_q1dog.c @@ -456,7 +456,7 @@ void SP_monster_q1_dog (edict_t *self) if ( self->style ) { PatchMonsterModel("models/monsters/q1dog/tris.md2"); - self->s.skinnum = self->style * 2; + self->s.skinnum = self->style; } self->s.modelindex = gi.modelindex ("models/monsters/q1dog/tris.md2"); diff --git a/missionpack/m_q1enforcer.c b/missionpack/m_q1enforcer.c index c162033..6d4f008 100644 --- a/missionpack/m_q1enforcer.c +++ b/missionpack/m_q1enforcer.c @@ -373,7 +373,7 @@ void SP_monster_q1_enforcer (edict_t *self) if ( self->style ) { PatchMonsterModel("models/monsters/q1enforcer/tris.md2"); - self->s.skinnum = self->style * 2; + self->s.skinnum = self->style; } self->s.modelindex = gi.modelindex ("models/monsters/q1enforcer/tris.md2"); diff --git a/missionpack/m_q1fiend.c b/missionpack/m_q1fiend.c index 776a0ca..ffbf7df 100644 --- a/missionpack/m_q1fiend.c +++ b/missionpack/m_q1fiend.c @@ -474,7 +474,7 @@ void SP_monster_q1_fiend (edict_t *self) if ( self->style ) { PatchMonsterModel("models/monsters/q1fiend/tris.md2"); - self->s.skinnum = self->style * 2; + self->s.skinnum = self->style; } self->s.modelindex = gi.modelindex ("models/monsters/q1fiend/tris.md2"); diff --git a/missionpack/m_q1freddie.c b/missionpack/m_q1freddie.c index 5417b59..476973e 100644 --- a/missionpack/m_q1freddie.c +++ b/missionpack/m_q1freddie.c @@ -832,7 +832,7 @@ void SP_monster_q1_freddie (edict_t *self) if ( self->style ) { PatchMonsterModel("models/monsters/q1freddie/tris.md2"); - self->s.skinnum = self->style * 2; + self->s.skinnum = self->style; } self->s.modelindex = gi.modelindex ("models/monsters/q1freddie/tris.md2"); diff --git a/missionpack/m_q1grunt.c b/missionpack/m_q1grunt.c index 0ef82f5..f3e0110 100644 --- a/missionpack/m_q1grunt.c +++ b/missionpack/m_q1grunt.c @@ -430,7 +430,7 @@ void SP_monster_q1_grunt (edict_t *self) if ( self->style ) { PatchMonsterModel("models/monsters/q1grunt/tris.md2"); - self->s.skinnum = self->style * 2; + self->s.skinnum = self->style; } self->s.modelindex = gi.modelindex ("models/monsters/q1grunt/tris.md2"); diff --git a/missionpack/m_q1hknight.c b/missionpack/m_q1hknight.c index 4f2dbaa..c46c5be 100644 --- a/missionpack/m_q1hknight.c +++ b/missionpack/m_q1hknight.c @@ -517,7 +517,7 @@ void SP_monster_q1_hknight (edict_t *self) if ( self->style ) { PatchMonsterModel("models/monsters/q1hknight/tris.md2"); - self->s.skinnum = self->style * 2; + self->s.skinnum = self->style; } self->s.modelindex = gi.modelindex ("models/monsters/q1hknight/tris.md2"); diff --git a/missionpack/m_q1knight.c b/missionpack/m_q1knight.c index 1961422..1867253 100644 --- a/missionpack/m_q1knight.c +++ b/missionpack/m_q1knight.c @@ -429,7 +429,7 @@ void SP_monster_q1_knight (edict_t *self) if ( self->style ) { PatchMonsterModel("models/monsters/q1knight/tris.md2"); - self->s.skinnum = self->style * 2; + self->s.skinnum = self->style; } self->s.modelindex = gi.modelindex ("models/monsters/q1knight/tris.md2"); diff --git a/missionpack/m_q1ogre.c b/missionpack/m_q1ogre.c index 7c8f401..9f21d6e 100644 --- a/missionpack/m_q1ogre.c +++ b/missionpack/m_q1ogre.c @@ -548,7 +548,7 @@ void SP_monster_q1_ogre (edict_t *self) if ( self->style ) { PatchMonsterModel("models/monsters/q1ogre/tris.md2"); - self->s.skinnum = self->style * 2; + self->s.skinnum = self->style; } self->s.modelindex = gi.modelindex ("models/monsters/q1ogre/tris.md2"); diff --git a/missionpack/m_q1rotfish.c b/missionpack/m_q1rotfish.c index 5095fbb..de6e81b 100644 --- a/missionpack/m_q1rotfish.c +++ b/missionpack/m_q1rotfish.c @@ -251,7 +251,7 @@ void SP_monster_q1_rotfish (edict_t *self) if ( self->style ) { PatchMonsterModel("models/monsters/q1rotfish/tris.md2"); - self->s.skinnum = self->style * 2; + self->s.skinnum = self->style; } self->s.modelindex = gi.modelindex ("models/monsters/q1rotfish/tris.md2"); diff --git a/missionpack/m_q1scrag.c b/missionpack/m_q1scrag.c index 9b02f31..ad31ff0 100644 --- a/missionpack/m_q1scrag.c +++ b/missionpack/m_q1scrag.c @@ -360,7 +360,7 @@ void SP_monster_q1_scrag (edict_t *self) if ( self->style ) { PatchMonsterModel("models/monsters/q1scrag/tris.md2"); - self->s.skinnum = self->style * 2; + self->s.skinnum = self->style; } self->s.modelindex = gi.modelindex ("models/monsters/q1scrag/tris.md2"); diff --git a/missionpack/m_q1shalrath.c b/missionpack/m_q1shalrath.c index f613588..dba138a 100644 --- a/missionpack/m_q1shalrath.c +++ b/missionpack/m_q1shalrath.c @@ -306,7 +306,7 @@ void SP_monster_q1_shalrath (edict_t *self) if ( self->style ) { PatchMonsterModel("models/monsters/q1shalrath/tris.md2"); - self->s.skinnum = self->style * 2; + self->s.skinnum = self->style; } self->s.modelindex = gi.modelindex ("models/monsters/q1shalrath/tris.md2"); diff --git a/missionpack/m_q1shambler.c b/missionpack/m_q1shambler.c index 8a6c104..689e293 100644 --- a/missionpack/m_q1shambler.c +++ b/missionpack/m_q1shambler.c @@ -545,7 +545,7 @@ void SP_monster_q1_shambler (edict_t *self) if ( self->style ) { PatchMonsterModel("models/monsters/q1shambler/tris.md2"); - self->s.skinnum = self->style * 2; + self->s.skinnum = self->style; } self->s.modelindex = gi.modelindex ("models/monsters/q1shambler/tris.md2"); diff --git a/missionpack/m_q1tarbaby.c b/missionpack/m_q1tarbaby.c index 0401fa1..2ae9036 100644 --- a/missionpack/m_q1tarbaby.c +++ b/missionpack/m_q1tarbaby.c @@ -327,7 +327,7 @@ void SP_monster_q1_tarbaby (edict_t *self) if ( self->style ) { PatchMonsterModel("models/monsters/q1tarbaby/tris.md2"); - self->s.skinnum = self->style * 2; + self->s.skinnum = self->style; } self->s.modelindex = gi.modelindex ("models/monsters/q1tarbaby/tris.md2"); diff --git a/missionpack/m_q1zombie.c b/missionpack/m_q1zombie.c index c447b09..b2badf1 100644 --- a/missionpack/m_q1zombie.c +++ b/missionpack/m_q1zombie.c @@ -671,7 +671,7 @@ void SP_monster_q1_zombie (edict_t *self) if ( self->style ) { PatchMonsterModel("models/monsters/q1zombie/tris.md2"); - self->s.skinnum = self->style * 2; + self->s.skinnum = self->style; } self->s.modelindex = gi.modelindex ("models/monsters/q1zombie/tris.md2");