diff --git a/src/inventory.h b/src/inventory.h index 1da4915..f6da4bb 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -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; diff --git a/src/level.h b/src/level.h index 2bb112c..09d7edc 100644 --- a/src/level.h +++ b/src/level.h @@ -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; } diff --git a/src/ui.h b/src/ui.h index 2c4a68c..562c13b 100644 --- a/src/ui.h +++ b/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"