From b1b8ba59700d8421719ce74e30d14b5e5a0c9484 Mon Sep 17 00:00:00 2001 From: Daveo Date: Thu, 19 Apr 2001 16:18:26 +0000 Subject: [PATCH] --- source/gfx/actor.cpp | 14 +------------- source/gfx/actor.h | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/source/gfx/actor.cpp b/source/gfx/actor.cpp index 03578f062..4ba38a324 100644 --- a/source/gfx/actor.cpp +++ b/source/gfx/actor.cpp @@ -230,18 +230,6 @@ int Clut=getClut(R.x,R.y); return(Clut); } -/*****************************************************************************/ -int CActorPool::AddActor(FileEquate Filename) -{ -sActorPool *Actor; -int Idx=FindActorInPool(Filename); - - if (Idx!=-1) return(Idx); -// Doesnt Exist, soooooo, Load it - Idx=LoadActor(Filename); - return(Idx); -} - /*****************************************************************************/ CActorGfx *CActorPool::GetActor(FileEquate Filename) { @@ -252,7 +240,7 @@ int Idx; Idx=FindActorInPool(Filename); if (Idx==-1) { - AddActor(Filename); + Idx=LoadActor(Filename); } sActorPool &ThisActor=ActorPool[Idx]; diff --git a/source/gfx/actor.h b/source/gfx/actor.h index 96936c36d..81a40b82a 100644 --- a/source/gfx/actor.h +++ b/source/gfx/actor.h @@ -75,7 +75,7 @@ public: static void Init(); -static int AddActor(FileEquate Filename); +static void AddActor(FileEquate Filename) {GetActor(Filename);} static CActorGfx *GetActor(FileEquate Filename); static void DumpActors();