mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-07-31 10:20:27 +02:00
Code Issues Releases Wiki Activity

remove Laras braid for TR1 levels

Browse Source
This commit is contained in:
XProger
2020-01-31 20:12:53 +03:00
parent 8c8f539a70
commit aeb32c44c1
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/game.h
View File

@@ -208,6 +208,32 @@ namespace Game {
Core::deltaTime = dt; Core::deltaTime = dt;
} }
void quickSave() {
if (!level || TR::isTitleLevel(level->level.id) || TR::isCutsceneLevel(level->level.id)) {
return;
}
level->saveGame(level->level.id, true, false);
}
void quickLoad(bool forced = false) {
if (!level) return;
int slot = getSaveSlot(level->level.id, true);
if (slot == -1) {
slot = getSaveSlot(level->level.id, false);
}
if (slot > -1) {
if (forced) {
level->loadLevel(saveSlots[slot].getLevelID());
level->loadNextLevel();
} else {
level->loadGame(slot);
}
}
}
bool update() { bool update() {
// async load for settings // async load for settings
if (Core::settings.version == SETTINGS_READING) if (Core::settings.version == SETTINGS_READING)
@@ -245,16 +271,12 @@ namespace Game {
if (Input::down[ik5] && !inventory->isActive()) { if (Input::down[ik5] && !inventory->isActive()) {
if (level->players[0]->canSaveGame()) if (level->players[0]->canSaveGame())
level->saveGame(level->level.id, true, false); quickSave();
Input::down[ik5] = false; Input::down[ik5] = false;
} }
if (Input::down[ik9] && !inventory->isActive()) { if (Input::down[ik9] && !inventory->isActive()) {
int slot = getSaveSlot(level->level.id, true); quickLoad();
if (slot == -1)
slot = getSaveSlot(level->level.id, false);
if (slot > -1)
level->loadGame(slot);
Input::down[ik9] = false; Input::down[ik9] = false;
} }

2
src/lara.h
View File

@@ -553,7 +553,7 @@ struct Lara : Character {
vec3 offset(0.0f); vec3 offset(0.0f);
switch (level->version & TR::VER_VERSION) { switch (level->version & TR::VER_VERSION) {
case TR::VER_TR1 : case TR::VER_TR1 :
braid[0] = new Braid(this, vec3(-4.0f, 24.0f, -48.0f)); //braid[0] = new Braid(this, vec3(-4.0f, 24.0f, -48.0f)); // it's just ugly :)
break; break;
case TR::VER_TR2 : case TR::VER_TR2 :
case TR::VER_TR3 : case TR::VER_TR3 :