extern float texdetail;
extern float realtexdetail;
extern float volume;
-extern Objects objects;
extern int detail;
extern bool cellophane;
extern GLubyte bloodText[512 * 512 * 3];
extern int accountcampaignchoicesmade[10];
extern int accountcampaignchoices[10][5000];
-void LOG(const std::string &fmt, ...)
+void LOG(const std::string &, ...)
{
// !!! FIXME: write me.
}
Game::endgame = 0;
}
- Account::saveFile(Folders::getUserDataPath()+"/users");
+ Account::saveFile(Folders::getUserSavePath());
//textures.clear();
delete skybox;
if (text)
delete text;
- terraintexture.destroy();
- terraintexture2.destroy();
- cursortexture.destroy();
- Maparrowtexture.destroy();
- Mapboxtexture.destroy();
- Mapcircletexture.destroy();
- hawktexture.destroy();
- loadscreentexture.destroy();
-
- for (int i = 0; i < 10; i++)
- Mainmenuitems[i].destroy();
glDeleteTextures(1, &screentexture);
glDeleteTextures(1, &screentexture2);
-void LoadSave(const std::string& fileName, GLuint *textureid, bool mipmap, GLubyte *array, int *skinsize)
+void LoadSave(const std::string& fileName, GLubyte *array)
{
LOGFUNC;
void Game::LoadingScreen()
{
+ if (!visibleloading) {
+ return;
+ }
+
static float loadprogress;
static AbsoluteTime frametime = {0, 0};
AbsoluteTime currTime = UpTime ();
numchallengelevels = 14;
- Account::loadFile(Folders::getUserDataPath()+"/users");
+ Account::loadFile(Folders::getUserSavePath());
whichjointstartarray[0] = righthip;
whichjointendarray[0] = rightfoot;
LOG("Initializing sound system...");
-#if PLATFORM_LINUX
- unsigned char rc = 0;
- int output = OPENAL_OUTPUT_ALSA; // Try alsa first...
- if (commandLineOptions[SOUND]) {
- output = commandLineOptions[SOUND].last()->type(); // ...but let user override that.
- }
-
- OPENAL_SetOutput(output);
- if ((rc = OPENAL_Init(44100, 32, 0)) == false) {
- // if we tried ALSA and failed, fall back to OSS.
- if ( (output == OPENAL_OUTPUT_ALSA) && (commandLineOptions[SOUND].last()->type() != OPENAL_OUTPUT_ALSA) ) {
- OPENAL_Close();
- output = OPENAL_OUTPUT_OSS;
- OPENAL_SetOutput(output);
- rc = OPENAL_Init(44100, 32, 0);
- }
- }
-
- if (rc == false) {
- OPENAL_Close();
- output = OPENAL_OUTPUT_NOSOUND; // we tried! just do silence.
- OPENAL_SetOutput(output);
- rc = OPENAL_Init(44100, 32, 0);
- }
-#else
OPENAL_Init(44100, 32, 0);
-#endif
OPENAL_SetSFXMasterVolume((int)(volume * 255));
loadAllSounds();
{
static float temptexdetail;
static float viewdistdetail;
- static int i, j;
float megascale = 1;
LOGFUNC;
stillloading = 1;
- for (auto p:Person::players) {
- p->skeleton.drawmodel.textureptr.destroy();
- }
-
- i = abs(Random() % 4);
- visibleloading = 0; //don't use loadscreentexture yet
+ visibleloading = false; //don't use loadscreentexture yet
loadscreentexture.load("Textures/Fire.jpg", 1);
- visibleloading = 1;
+ visibleloading = true;
temptexdetail = texdetail;
texdetail = 1;
if (detail == 2) {
texdetail = 1;
- }
- if (detail == 1) {
+ kTextureSize = 1024;
+ } else if (detail == 1) {
texdetail = 2;
- }
- if (detail == 0) {
+ kTextureSize = 512;
+ } else {
texdetail = 4;
+ kTextureSize = 256;
}
realtexdetail = texdetail;
Weapon::lightbloodswordtextureptr.load("Textures/SwordBloodLight.jpg", 1);
Weapon::stafftextureptr.load("Textures/Staff.jpg", 1);
- Weapon::throwingknifemodel.load("Models/ThrowingKnife.solid", 1);
+ Weapon::throwingknifemodel.load("Models/ThrowingKnife.solid");
Weapon::throwingknifemodel.Scale(.001, .001, .001);
Weapon::throwingknifemodel.Rotate(90, 0, 0);
Weapon::throwingknifemodel.Rotate(0, 90, 0);
Weapon::throwingknifemodel.flat = 0;
Weapon::throwingknifemodel.CalculateNormals(1);
- Weapon::swordmodel.load("Models/Sword.solid", 1);
+ Weapon::swordmodel.load("Models/Sword.solid");
Weapon::swordmodel.Scale(.001, .001, .001);
Weapon::swordmodel.Rotate(90, 0, 0);
Weapon::swordmodel.Rotate(0, 90, 0);
Weapon::swordmodel.flat = 1;
Weapon::swordmodel.CalculateNormals(1);
- Weapon::staffmodel.load("Models/Staff.solid", 1);
+ Weapon::staffmodel.load("Models/Staff.solid");
Weapon::staffmodel.Scale(.005, .005, .005);
Weapon::staffmodel.Rotate(90, 0, 0);
Weapon::staffmodel.Rotate(0, 90, 0);
viewer = 0;
-
- if (detail)
- kTextureSize = 1024;
- if (detail == 1)
- kTextureSize = 512;
- if (detail == 0)
- kTextureSize = 256;
-
//Set up distant light
light.color[0] = .95;
light.color[1] = .95;
viewer.x = terrain.size / 2 * terrain.scale;
viewer.z = terrain.size / 2 * terrain.scale;
- hawk.load("Models/Hawk.solid", 1);
+ hawk.load("Models/Hawk.solid");
hawk.Scale(.03, .03, .03);
hawk.Rotate(90, 1, 1);
hawk.CalculateNormals(0);
hawkcoords.z = terrain.size / 2 * terrain.scale - 5 - 7;
hawkcoords.y = terrain.getHeight(hawkcoords.x, hawkcoords.z) + 25;
- eye.load("Models/Eye.solid", 1);
+ eye.load("Models/Eye.solid");
eye.Scale(.03, .03, .03);
eye.CalculateNormals(0);
- cornea.load("Models/Cornea.solid", 1);
+ cornea.load("Models/Cornea.solid");
cornea.Scale(.03, .03, .03);
cornea.CalculateNormals(0);
- iris.load("Models/Iris.solid", 1);
+ iris.load("Models/Iris.solid");
iris.Scale(.03, .03, .03);
iris.CalculateNormals(0);
- LoadSave("Textures/BloodFur.png", 0, 1, &bloodText[0], 0);
- LoadSave("Textures/WolfBloodFur.png", 0, 1, &wolfbloodText[0], 0);
+ LoadSave("Textures/BloodFur.png", &bloodText[0]);
+ LoadSave("Textures/WolfBloodFur.png", &wolfbloodText[0]);
oldenvironment = -4;
moveamount.z = 2;
// FIXME - Why this uses skeleton.joints.size() and not Animation::numjoints? (are they equal?)
// It seems skeleton.joints.size() is 0 at this point, so this is useless.
- for (i = 0; i < Person::players[0]->skeleton.joints.size(); i++) {
- for (j = 0; j < Animation::animations[knifesneakattackanim].frames.size(); j++) {
+ for (unsigned i = 0; i < Person::players[0]->skeleton.joints.size(); i++) {
+ for (unsigned j = 0; j < Animation::animations[knifesneakattackanim].frames.size(); j++) {
Animation::animations[knifesneakattackanim].frames[j].joints[i].position += moveamount;
}
}
LoadingScreen();
- for (i = 0; i < Person::players[0]->skeleton.joints.size(); i++) {
- for (j = 0; j < Animation::animations[knifesneakattackedanim].frames.size(); j++) {
+ for (unsigned i = 0; i < Person::players[0]->skeleton.joints.size(); i++) {
+ for (unsigned j = 0; j < Animation::animations[knifesneakattackedanim].frames.size(); j++) {
Animation::animations[knifesneakattackedanim].frames[j].joints[i].position += moveamount;
}
}
LoadingScreen();
- for (i = 0; i < Person::players[0]->skeleton.joints.size(); i++) {
+ for (unsigned i = 0; i < Person::players[0]->skeleton.joints.size(); i++) {
Animation::animations[dead1anim].frames[1].joints[i].position = Animation::animations[dead1anim].frames[0].joints[i].position;
Animation::animations[dead2anim].frames[1].joints[i].position = Animation::animations[dead2anim].frames[0].joints[i].position;
Animation::animations[dead3anim].frames[1].joints[i].position = Animation::animations[dead3anim].frames[0].joints[i].position;
Animation::animations[dead3anim].frames[1].speed = 0.001;
Animation::animations[dead4anim].frames[1].speed = 0.001;
- for (i = 0; i < Person::players[0]->skeleton.joints.size(); i++) {
- for (j = 0; j < Animation::animations[swordsneakattackanim].frames.size(); j++) {
+ for (unsigned i = 0; i < Person::players[0]->skeleton.joints.size(); i++) {
+ for (unsigned j = 0; j < Animation::animations[swordsneakattackanim].frames.size(); j++) {
Animation::animations[swordsneakattackanim].frames[j].joints[i].position += moveamount;
}
}
LoadingScreen();
- for (j = 0; j < Animation::animations[swordsneakattackanim].frames.size(); j++) {
+ for (unsigned j = 0; j < Animation::animations[swordsneakattackanim].frames.size(); j++) {
Animation::animations[swordsneakattackanim].frames[j].weapontarget += moveamount;
}
LoadingScreen();
- for (i = 0; i < Person::players[0]->skeleton.joints.size(); i++) {
- for (j = 0; j < Animation::animations[swordsneakattackedanim].frames.size(); j++) {
+ for (unsigned i = 0; i < Person::players[0]->skeleton.joints.size(); i++) {
+ for (unsigned j = 0; j < Animation::animations[swordsneakattackedanim].frames.size(); j++) {
Animation::animations[swordsneakattackedanim].frames[j].joints[i].position += moveamount;
}
}
- LoadingScreen();
- temptexdetail = texdetail;
- texdetail = 1;
- texdetail = temptexdetail;
-
LoadingScreen();
if (!screentexture) {
loading = 0;
changedelay = 1;
- visibleloading = 0;
+ visibleloading = false;
}