X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameInitDispose.cpp;h=e84f10ebb61f29d28eb7cc33c8570092de12d9b3;hb=845b8ad33ffc79190b6c89e22fa2a7e9913a1e16;hp=57f6958faba924144401c348bb146e0ae268dcb9;hpb=b9a46d8e2b7e7e22c706e7dd3734f31015db4408;p=lugaru.git diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp index 57f6958..e84f10e 100644 --- a/Source/GameInitDispose.cpp +++ b/Source/GameInitDispose.cpp @@ -1,6 +1,6 @@ /* Copyright (C) 2003, 2010 - Wolfire Games -Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) +Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file) This file is part of Lugaru. @@ -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;