diff --git a/baseq3r/gfx/color/black.tga b/baseq3r/gfx/colors/black.tga similarity index 100% rename from baseq3r/gfx/color/black.tga rename to baseq3r/gfx/colors/black.tga diff --git a/baseq3r/models/weapons2/flamethrower/flamethrower.md3 b/baseq3r/models/weapons2/flamethrower/flamethrower.md3 index 0fbf049f..bdcbd6c1 100644 Binary files a/baseq3r/models/weapons2/flamethrower/flamethrower.md3 and b/baseq3r/models/weapons2/flamethrower/flamethrower.md3 differ diff --git a/baseq3r/scripts/ammo.shader b/baseq3r/scripts/ammo.shader index a3c8cab0..33ee6e49 100644 --- a/baseq3r/scripts/ammo.shader +++ b/baseq3r/scripts/ammo.shader @@ -202,7 +202,7 @@ models/powerups/ammo/flameammo models/powerups/ammo/flameammo2 { { - map models/powerups/ammo/flmeammo2.tga + map models/powerups/ammo/flameammo2.tga rgbGen identity } } diff --git a/baseq3r/scripts/weapon_flamethrower.shader b/baseq3r/scripts/weapon_flamethrower.shader new file mode 100644 index 00000000..57d1e4e2 --- /dev/null +++ b/baseq3r/scripts/weapon_flamethrower.shader @@ -0,0 +1,10 @@ +models/weapons2/flamethrower/f_flamethrower +{ + cull disable + { + clampmap models/weapons2/flamethrower/f_flamethrower.tga + blendfunc add + rgbGen identity + tcMod rotate 5288 + } +} diff --git a/engine/code/cgame/cg_weapons.c b/engine/code/cgame/cg_weapons.c index 7defb3c7..2b8521f6 100644 --- a/engine/code/cgame/cg_weapons.c +++ b/engine/code/cgame/cg_weapons.c @@ -2029,6 +2029,7 @@ void CG_MissileHitWall( int weapon, int clientNum, vec3_t origin, vec3_t dir, im sfx = cgs.media.sfx_plasmaexp; mark = cgs.media.burnMarkShader; radius = 16; + isSprite = qtrue; break; // Q3Rally Code END diff --git a/engine/code/game/bg_misc.c b/engine/code/game/bg_misc.c index cd67fcf3..8b6b4d70 100644 --- a/engine/code/game/bg_misc.c +++ b/engine/code/game/bg_misc.c @@ -620,7 +620,7 @@ gitem_t bg_itemlist[] = { "ammo_flame", "sound/misc/am_pkup.wav", - { "models/powerups/ammo/bfgam.md3", + { "models/powerups/ammo/flameam.md3", NULL, NULL, NULL}, /* icon */ "icons/icona_flame", /* pickup */ "Flame Ammo",