From 4d4f063ed72bd09f78275987d13470bb3127a962 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Fri, 27 Apr 2007 20:54:04 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@981 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/entities.cpp | 2 +- source/src/md2.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/source/src/entities.cpp b/source/src/entities.cpp index be9f5fa5..b3afef2e 100644 --- a/source/src/entities.cpp +++ b/source/src/entities.cpp @@ -18,7 +18,7 @@ char *entmdlnames[] = "pickups/pistolclips", "pickups/ammobox", "pickups/nades", "pickups/health", "pickups/kevlar", "pickups/akimbo", }; -void renderent(entity &e, char *mdlname, float z, float yaw, int anim = ANIM_MAPMODEL|ANIM_LOOP, int basetime = 0, float speed = 10.0f) +void renderent(entity &e, char *mdlname, float z, float yaw, int anim = ANIM_MAPMODEL|ANIM_LOOP, int basetime = 0, float speed = 0) { rendermodel(mdlname, anim, 0, 1.1f, e.x, e.y, z+S(e.x, e.y)->floor, yaw, 0, speed, basetime); } diff --git a/source/src/md2.h b/source/src/md2.h index 0fa1900f..67b725d3 100644 --- a/source/src/md2.h +++ b/source/src/md2.h @@ -151,7 +151,7 @@ struct md2 : vertmodel return true; } - void getdefaultanim(animstate &as, int anim, int varseed, float speed) + void getdefaultanim(animstate &as, int anim, int varseed) { // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 21 23 24 // I R A P P P J L F S T W P CI CW CA CP CD D D D LD LD LD F @@ -159,7 +159,6 @@ struct md2 : vertmodel static int range[] = { 40, 6, 8, 4, 4, 4, 3, 3, 12, 11, 17, 11, 12, 19, 6, 9, 4, 5, 6, 6, 8, 1, 1, 1, 7 }; static int animfr[] = { 0, 1, 2, 3, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 21, 24 }; - as.speed = speed; if((size_t)anim >= sizeof(animfr)/sizeof(animfr[0])) { as.frame = 0;