mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-16 01:54:38 +02:00
Code Issues Releases Wiki Activity

fix loading game

Browse Source
This commit is contained in:
XProger
2018-10-18 06:25:25 +03:00
parent ccc270ee2b
commit c59459235b
3 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/game.h
View File

@@ -186,11 +186,18 @@ namespace Game {
if (level->isEnded) if (level->isEnded)
return true; return true;
#ifdef _DEBUG
if (Input::down[ik0] && !level->inventory->isActive()) { if (Input::down[ik0] && !level->inventory->isActive()) {
level->inventory->toggle(0, Inventory::PAGE_LEVEL_STATS); level->inventory->toggle(0, Inventory::PAGE_LEVEL_STATS);
Input::down[ik0] = false; Input::down[ik0] = false;
} }
if (Input::down[ikF]) {
level->flipMap();
Input::down[ikF] = false;
}
#endif
if (Input::down[ik5] && !level->inventory->isActive()) { if (Input::down[ik5] && !level->inventory->isActive()) {
if (level->players[0]->canSaveGame()) if (level->players[0]->canSaveGame())
level->saveGame(true, false); level->saveGame(true, false);

42
src/level.h
View File

@@ -71,34 +71,35 @@ struct Level : IGame {
// IGame implementation ======== // IGame implementation ========
virtual void loadLevel(TR::LevelID id) { virtual void loadLevel(TR::LevelID id) {
if (nextLevel != TR::LVL_MAX) return;
sndWater = sndTrack = NULL; sndWater = sndTrack = NULL;
Sound::stopAll(); Sound::stopAll();
if (!level.isTitle() && loadSlot == -1 && !TR::isCutsceneLevel(level.id)) {
// update statistics info for current level
saveGame(false, true);
// save next level
level.id = TR::getNextSaveLevel(level.id); // get next not cutscene level
if (level.id != TR::LVL_MAX && !level.isTitle()) {
memset(&level.stats, 0, sizeof(level.stats));
saveGame(false, false);
loadSlot = getSaveSlot(level.id, false);
}
}
nextLevel = id; nextLevel = id;
} }
virtual void loadNextLevel() { virtual void loadNextLevel() {
TR::LevelID id = TR::LVL_MAX;
#ifdef _OS_WEB #ifdef _OS_WEB
if (level.id == TR::LVL_TR1_2 && level.version != TR::VER_TR1_PC) { if (level.id == TR::LVL_TR1_2 && level.version != TR::VER_TR1_PC) {
loadLevel(TR::LVL_TR1_TITLE); id = TR::LVL_TR1_TITLE;
return; return;
} } else
#endif #endif
loadLevel((level.isEnd() || level.isHome()) ? level.getTitleId() : TR::LevelID(level.id + 1)); id = (level.isEnd() || level.isHome()) ? level.getTitleId() : TR::LevelID(level.id + 1);
if (nextLevel == TR::LVL_MAX) {
if (!level.isTitle() && loadSlot == -1 && !TR::isCutsceneLevel(level.id)) {
// update statistics info for current level
saveGame(false, true);
// save next level
level.id = TR::getNextSaveLevel(level.id); // get next not cutscene level
if (level.id != TR::LVL_MAX && !level.isTitle()) {
memset(&level.stats, 0, sizeof(level.stats));
saveGame(false, false);
loadSlot = getSaveSlot(level.id, false);
}
}
loadLevel(id);
}
} }
virtual void invShow(int playerIndex, int page, int itemIndex = -1) { virtual void invShow(int playerIndex, int page, int itemIndex = -1) {
@@ -2436,11 +2437,6 @@ struct Level : IGame {
Core::setViewport(Core::x, Core::y, Core::width, Core::height); Core::setViewport(Core::x, Core::y, Core::width, Core::height);
camera->setup(true); camera->setup(true);
if (Input::down[ikF]) {
flipMap();
Input::down[ikF] = false;
}
Debug::begin(); Debug::begin();
/* /*
lara->updateEntity(); // TODO clip angle while rotating lara->updateEntity(); // TODO clip angle while rotating

4
src/ui.h
View File

@@ -393,13 +393,13 @@ namespace UI {
MeshBuilder *mesh = game->getMesh(); MeshBuilder *mesh = game->getMesh();
int seq = level->extra.glyphs; int seq = level->extra.glyphs;
int x = int(pos.x) + getLeftOffset(text, align, width); int x = int(pos.x) + getLeftOffset(text, align, int(width));
int y = int(pos.y); int y = int(pos.y);
while (char c = *text++) { while (char c = *text++) {
if (c == '@') { if (c == '@') {
x = int(pos.x) + getLeftOffset(text, align, width); x = int(pos.x) + getLeftOffset(text, align, int(width));
y += 16; y += 16;
continue; continue;
} }