X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameInitDispose.cpp;h=e84f10ebb61f29d28eb7cc33c8570092de12d9b3;hb=086b9fc6bc5e16d7f77839bfdadb64ab187cca61;hp=bcb47594ed5e7d5e7fdafe54b66204281251f57e;hpb=0aab437dc560d2afa982e61cc2547756ad7b0761;p=lugaru.git diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp index bcb4759..e84f10e 100644 --- a/Source/GameInitDispose.cpp +++ b/Source/GameInitDispose.cpp @@ -40,8 +40,6 @@ extern float realtexdetail; extern float volume; extern int detail; extern bool cellophane; -extern GLubyte bloodText[512 * 512 * 3]; -extern GLubyte wolfbloodText[512 * 512 * 3]; extern bool ismotionblur; extern bool trilinear; extern bool musictoggle; @@ -602,6 +600,8 @@ void Game::InitGame() Menu::Load(); Animation::loadAll(); + + PersonType::Load(); } void Game::LoadScreenTexture() @@ -738,8 +738,8 @@ void Game::LoadStuff() iris.Scale(.03, .03, .03); iris.CalculateNormals(0); - LoadSave("Textures/BloodFur.png", &bloodText[0]); - LoadSave("Textures/WolfBloodFur.png", &wolfbloodText[0]); + LoadSave("Textures/WolfBloodFur.png", &PersonType::types[wolftype].bloodText[0]); + LoadSave("Textures/BloodFur.png", &PersonType::types[rabbittype].bloodText[0]); oldenvironment = -4;