mirror of
https://github.com/XProger/OpenLara.git
synced 2025-08-14 09:04:31 +02:00
fix minor bugs
This commit is contained in:
@@ -560,9 +560,9 @@ struct Inventory {
|
||||
inv->skipVideo();
|
||||
}
|
||||
|
||||
Inventory() : itemsCount(0) {
|
||||
Inventory() : game(NULL), itemsCount(0) {
|
||||
memset(background, 0, sizeof(background));
|
||||
reset(NULL);
|
||||
reset();
|
||||
}
|
||||
|
||||
~Inventory() {
|
||||
@@ -581,9 +581,8 @@ struct Inventory {
|
||||
}
|
||||
}
|
||||
|
||||
void reset(IGame *game) {
|
||||
void reset() {
|
||||
clear();
|
||||
this->game = game;
|
||||
active = false;
|
||||
chosen = false;
|
||||
index = targetIndex = 0;
|
||||
|
@@ -862,8 +862,10 @@ struct Level : IGame {
|
||||
}
|
||||
*/
|
||||
|
||||
inventory->game = this;
|
||||
|
||||
if (!level.isCutsceneLevel()) {
|
||||
inventory->reset(this);
|
||||
inventory->reset();
|
||||
memset(&saveStats, 0, sizeof(saveStats));
|
||||
saveStats.level = level.id;
|
||||
}
|
||||
|
4
src/ui.h
4
src/ui.h
@@ -17,9 +17,9 @@ enum StringID {
|
||||
, STR_HINT_SAVING_ERROR
|
||||
, STR_OFF
|
||||
, STR_ON
|
||||
, STR_SPLIT
|
||||
, STR_YES
|
||||
, STR_NO
|
||||
, STR_SPLIT
|
||||
, STR_VR
|
||||
, STR_QUALITY_LOW
|
||||
, STR_QUALITY_MEDIUM
|
||||
@@ -144,9 +144,9 @@ const char *STR[STR_MAX] = {
|
||||
, "SAVING ERROR!"
|
||||
, "Off"
|
||||
, "On"
|
||||
, "Split Screen"
|
||||
, "YES"
|
||||
, "NO"
|
||||
, "Split Screen"
|
||||
, "VR"
|
||||
, "Low"
|
||||
, "Medium"
|
||||
|
Reference in New Issue
Block a user