Commit 086b9fc6 by MCMic

Moved bloodText to PersonType

parent 8139604f
......@@ -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;
......@@ -740,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;
......
......@@ -67,8 +67,6 @@ float realtexdetail = 0;
float playerdist = 0;
int slomo = 0;
float slomodelay = 0;
GLubyte bloodText[512 * 512 * 3] = { 0 };
GLubyte wolfbloodText[512 * 512 * 3] = { 0 };
int bloodtoggle = 0;
float camerashake = 0;
float woozy = 0;
......
......@@ -79,6 +79,8 @@ public:
std::vector<std::string> skins;
GLubyte bloodText[512 * 512 * 3] = { 0 };
static std::vector<PersonType> types;
static void Load();
};
......
......@@ -41,7 +41,6 @@ extern int slomo;
extern float slomodelay;
extern bool cellophane;
extern float texdetail;
extern GLubyte bloodText[512 * 512 * 3];
extern int bloodtoggle;
extern bool autoslomo;
extern float camerashake;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment