X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_playermodel.pas;h=ebb3915efedfbc09ab7379729f7fa9bcd4dcfd78;hb=4cf7f08ed4f5baf7e0161b87fab446b5b3391154;hp=e4b485d9eac079280c34118ec8e237be918097c3;hpb=d7d166dc3cd287276202e862746208892c4cc89f;p=d2df-sdl.git

diff --git a/src/game/g_playermodel.pas b/src/game/g_playermodel.pas
index e4b485d..ebb3915 100644
--- a/src/game/g_playermodel.pas
+++ b/src/game/g_playermodel.pas
@@ -20,8 +20,8 @@ unit g_playermodel;
 interface
 
 uses
-  mempool,
-  MAPDEF, g_textures, g_basic, g_weapons, e_graphics, wadreader;
+  {$IFDEF USE_MEMPOOL}mempool,{$ENDIF}
+  MAPDEF, g_textures, g_basic, g_weapons, e_graphics, utils;
 
 const
   A_STAND      = 0;
@@ -82,7 +82,7 @@ type
                   Array [A_STAND..A_LAST] of
                   Array [TDirection.D_LEFT..TDirection.D_RIGHT] of Array of TDFPoint;
 
-  TPlayerModel = class(TPoolObject)
+  TPlayerModel = class{$IFDEF USE_MEMPOOL}(TPoolObject){$ENDIF}
   private
     FName:             String;
     FDirection:        TDirection;
@@ -130,17 +130,18 @@ type
 procedure g_PlayerModel_LoadData();
 procedure g_PlayerModel_FreeData();
 function  g_PlayerModel_Load(FileName: String): Boolean;
-function  g_PlayerModel_GetNames(): SArray;
+function  g_PlayerModel_GetNames(): SSArray;
 function  g_PlayerModel_GetInfo(ModelName: String): TModelInfo;
 function  g_PlayerModel_Get(ModelName: String): TPlayerModel;
 function  g_PlayerModel_GetAnim(ModelName: String; Anim: Byte; var _Anim, _Mask: TAnimation): Boolean;
 function  g_PlayerModel_GetGibs(ModelName: String; var Gibs: TGibsArray): Boolean;
 
+
 implementation
 
 uses
   g_main, g_sound, g_console, SysUtils, g_player, CONFIG,
-  GL, GLExt, e_sound, g_options, g_map, Math, e_log;
+  GL, GLExt, e_sound, g_options, g_map, Math, e_log, wadreader;
 
 type
   TPlayerModelInfo = record
@@ -692,7 +693,7 @@ begin
     end;
 end;
 
-function g_PlayerModel_GetNames(): SArray;
+function g_PlayerModel_GetNames(): SSArray;
 var
   i: DWORD;
 begin