X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmodels%2Fall.inc;h=b8fc08f388144d328b101b1c60e5557a92027187;hb=d28cca0c0ed2f6dd6c98cbd02488d3c02a27038e;hp=cfe7a010fe9ebbbf44b2181fbdf5e1aed5998777;hpb=492455b6deaf1c06adbbb6500213dece0089de00;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/models/all.inc b/qcsrc/common/models/all.inc index cfe7a010f..b8fc08f38 100644 --- a/qcsrc/common/models/all.inc +++ b/qcsrc/common/models/all.inc @@ -88,7 +88,7 @@ MODEL(PROJECTILE_HOOKBOMB, "models/grenademodel.md3"); MODEL(PROJECTILE_HAGAR, "models/hagarmissile.mdl"); MODEL(PROJECTILE_HAGAR_BOUNCING, "models/hagarmissile.mdl"); -MODEL(PROJECTILE_ARC_BOLT, "models/arctrail.mdl"); +MODEL(PROJECTILE_ARC_BOLT, "models/ebomb.mdl"); // napalm grenade MODEL(PROJECTILE_NAPALM_FOUNTAIN, "null"); @@ -104,7 +104,7 @@ MODEL(PROJECTILE_FLAC, "models/hagarmissile.mdl"); MODEL(PROJECTILE_SEEKER, "models/tagrocket.md3"); MODEL(PROJECTILE_MAGE_SPIKE, "models/ebomb.mdl"); -MODEL(PROJECTILE_GOLEM_LIGHTNING, "models/ebomb.mdl"); +MODEL(PROJECTILE_GOLEM_LIGHTNING, "models/ebomb.mdl"); MODEL(PROJECTILE_RAPTORBOMB, "models/vehicles/clusterbomb.md3"); MODEL(PROJECTILE_RAPTORBOMBLET, "models/vehicles/bomblet.md3"); @@ -147,7 +147,7 @@ MODEL(GIB_ROBO_7, "models/gibs/robo7.md3"); MODEL(GIB_ROBO_8, "models/gibs/robo8.md3"); Model MDL_GIB_ROBO_RANDOM() { int i = floor(random() * 8); - return Models_from(MDL_GIB_ROBO_1.m_id + i); + return REGISTRY_GET(Models, MDL_GIB_ROBO_1.m_id + i); } MODEL(CASING_SHELL, "models/casing_shell.mdl"); @@ -350,7 +350,7 @@ MODEL(9, "models/sprites/9.spr32"); MODEL(10, "models/sprites/10.spr32"); Model MDL_NUM(int i) { if ((i >= 0 && i <= 10)) - return Models_from(MDL_0.m_id + i); + return REGISTRY_GET(Models, MDL_0.m_id + i); return MDL_Null; }