X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameInitDispose.cpp;h=a1e96031da4ccf4d13245e7a971ca721384b8097;hb=77f22d0571ddca7bbfd1d1f621d61785d375c889;hp=66237151fedea6d9ef029c3e3aedd0c295460fa3;hpb=58e2a577c2ea4cf639a07fc792122c288d4bc2a5;p=lugaru.git diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp index 6623715..a1e9603 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; @@ -604,6 +602,8 @@ void Game::InitGame() Animation::loadAll(); PersonType::Load(); + + Person::players.emplace_back(new Person()); } void Game::LoadScreenTexture() @@ -740,8 +740,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;