From b5eb075a66a1f064fe8f8479c63bd99a518b1da4 Mon Sep 17 00:00:00 2001 From: Bendegúz Nagy Date: Tue, 16 Aug 2016 09:39:35 +0200 Subject: DM: Fix wrong global initialized in InventoryMan::initConstants() --- engines/dm/inventory.cpp | 4 ++-- engines/dm/inventory.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/dm') diff --git a/engines/dm/inventory.cpp b/engines/dm/inventory.cpp index f393427930..bbc451daee 100644 --- a/engines/dm/inventory.cpp +++ b/engines/dm/inventory.cpp @@ -44,7 +44,7 @@ Box g35_BoxFood = Box(112, 159, 60, 68); // @ G0035_s_Graphic562_Box_Food Box g36_BoxWater = Box(112, 159, 83, 91); // @ G0036_s_Graphic562_Box_Water Box g37_BoxPoisoned = Box(112, 207, 105, 119); // @ G0037_s_Graphic562_Box_Poisoned -char* G0428_apc_SkillLevelNames[15]; +const char* G0428_apc_SkillLevelNames[15]; void InventoryMan::initConstants() { { @@ -62,7 +62,7 @@ void InventoryMan::initConstants() { case Common::FR_FRA: g428_byLanguage = G0428_apc_SkillLevelNames_FR_FRA; break; } for (int i = 0; i < 15; ++i) - g417_baseSkillName[i] = g428_byLanguage[i]; + G0428_apc_SkillLevelNames[i] = g428_byLanguage[i]; } } diff --git a/engines/dm/inventory.h b/engines/dm/inventory.h index 0af166180d..d16f22d6fa 100644 --- a/engines/dm/inventory.h +++ b/engines/dm/inventory.h @@ -47,7 +47,7 @@ enum PanelContent { k5_PanelContentResurrectReincarnate = 5 // @ C05_PANEL_RESURRECT_REINCARNATE }; -extern char* G0428_apc_SkillLevelNames[15]; // @ G0428_apc_SkillLevelNames +extern const char* G0428_apc_SkillLevelNames[15]; // @ G0428_apc_SkillLevelNames class InventoryMan { DMEngine *_vm; -- cgit v1.2.3