Commit 10209969 authored by DailyShana's avatar DailyShana

load expansion strings

parent e7b0c400
...@@ -70,8 +70,6 @@ bool DataManager::LoadStrings(const char* file) { ...@@ -70,8 +70,6 @@ bool DataManager::LoadStrings(const char* file) {
FILE* fp = fopen(file, "r"); FILE* fp = fopen(file, "r");
if(!fp) if(!fp)
return false; return false;
for(int i = 0; i < 2048; ++i)
_sysStrings[i] = 0;
char linebuf[256]; char linebuf[256];
char strbuf[256]; char strbuf[256];
int value; int value;
......
...@@ -58,6 +58,7 @@ bool Game::Initialize() { ...@@ -58,6 +58,7 @@ bool Game::Initialize() {
if(!dataManager.LoadStrings("strings.conf")) if(!dataManager.LoadStrings("strings.conf"))
return false; return false;
RefreshExpansionDB(); RefreshExpansionDB();
dataManager.LoadStrings("./expansions/strings.conf");
env = device->getGUIEnvironment(); env = device->getGUIEnvironment();
numFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 16); numFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 16);
adFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 12); adFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 12);
......
...@@ -496,7 +496,7 @@ extern Game* mainGame; ...@@ -496,7 +496,7 @@ extern Game* mainGame;
#define BUTTON_SAVE_DECK 304 #define BUTTON_SAVE_DECK 304
#define BUTTON_SAVE_DECK_AS 305 #define BUTTON_SAVE_DECK_AS 305
#define BUTTON_DELETE_DECK 306 #define BUTTON_DELETE_DECK 306
#define BUTTON_DBEXIT 307 //#define BUTTON_DBEXIT 307
#define BUTTON_SORT_DECK 308 #define BUTTON_SORT_DECK 308
#define BUTTON_SIDE_OK 309 #define BUTTON_SIDE_OK 309
#define BUTTON_SHUFFLE_DECK 310 #define BUTTON_SHUFFLE_DECK 310
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment