mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-03 06:24:32 +00:00
Code Issues Releases Wiki Activity

Include stringbank.txt into binary in case stringbank.txt is out of date

Browse source 
This makes sure engine-internal strings are always present.
This commit is contained in:
fgenesis 2018-01-02 15:31:47 +01:00
parent ce4f6a7d3e
commit 8f565c6171
8 changed files with 318 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

16
BBGE/ActionInput.cpp
View file

@ -143,10 +143,10 @@ std::string getInputCodeToUserString(unsigned int k, size_t joystickID)
}
std::string s = inputcode2string(k);
return s.empty() ? stringbank.get(2153) : s;
return s.empty() ? stringbank.get(SB_BBGE_NO_KEY) : s;
}
static int checkInp(const char *s, int category, int limit, const char *err)
static int checkInp(const char *s, int category, int limit, StringBankIndexBBGE errid)
{
const int k = atoi(s);
if(!k)
@ -155,7 +155,7 @@ static int checkInp(const char *s, int category, int limit, const char *err)
return k + category;
std::ostringstream os;
os << err << k;
os << stringbank.get(errid) << k;
errorLog(os.str());
return 0;
}
@ -171,20 +171,20 @@ int getStringToInputCode(const std::string& s)
else if(s == "MMB")
k = MOUSE_BUTTON_MIDDLE;
else if(!strncmp(s.c_str(), "K:", 2))
k = checkInp(s.c_str() + 2, 0, KEY_MAXARRAY, "Invalid key id: ");
k = checkInp(s.c_str() + 2, 0, KEY_MAXARRAY, SB_BBGE_INVALID_KEY_ID);
else if(!strncmp(s.c_str(), "JB:", 3))
k = checkInp(s.c_str() + 3, JOY_BUTTON_0, JOY_BUTTON_END, "Invalid joy button value: ");
k = checkInp(s.c_str() + 3, JOY_BUTTON_0, JOY_BUTTON_END, SB_BBGE_INVALID_JOY_BTN);
else if(!strncmp(s.c_str(), "MB:", 3))
k = checkInp(s.c_str() + 3, MOUSE_BUTTON_LEFT, MOUSE_BUTTON_EXTRA_END, "Invalid mouse button id: ");
k = checkInp(s.c_str() + 3, MOUSE_BUTTON_LEFT, MOUSE_BUTTON_EXTRA_END, SB_BBGE_INVALID_MOUSE_BTN);
else if(s.length() > 4 && !strncmp(s.c_str(), "AX:", 3))
{
switch(s[3])
{
case '+':
k = checkInp(s.c_str() + 4, JOY_AXIS_0_POS, JOY_AXIS_END_POS, "Invalid joy axis(+): ");
k = checkInp(s.c_str() + 4, JOY_AXIS_0_POS, JOY_AXIS_END_POS, SB_BBGE_INVALID_JOY_AXIS_POS);
break;
case '-':
k = checkInp(s.c_str() + 4, JOY_AXIS_0_NEG, JOY_AXIS_END_NEG, "Invalid joy axis(-): ");
k = checkInp(s.c_str() + 4, JOY_AXIS_0_NEG, JOY_AXIS_END_NEG, SB_BBGE_INVALID_JOY_AXIS_NEG);
break;
default:
return 0;

6
BBGE/StringBank.cpp
View file

@ -69,9 +69,7 @@ const std::string& StringBank::get(int idx) const
return it != stringMap.end() ? it->second : emptyStr;
}
void StringBank::addDefault(int idx, const char *str)
void StringBank::set(int idx, const char *str)
{
StringMap::iterator it = stringMap.find(idx);
if(it == stringMap.end())
stringMap[idx] = str;
stringMap[idx] = str;
}

14
BBGE/StringBank.h
View file

@ -4,6 +4,17 @@
#include <string>
#include <map>
// Some strings used in BBGE
enum StringBankIndexBBGE
{
SB_BBGE_NO_KEY = 2153,
SB_BBGE_INVALID_KEY_ID = 2154,
SB_BBGE_INVALID_JOY_BTN = 2155,
SB_BBGE_INVALID_MOUSE_BTN = 2156,
SB_BBGE_INVALID_JOY_AXIS_POS = 2157,
SB_BBGE_INVALID_JOY_AXIS_NEG = 2158,
};
class StringBank
{
public:
@ -11,8 +22,7 @@ public:
bool load(const std::string &file);
void clear();
bool empty() const;
void addDefault(int idx, const char *str);
void set(int idx, const char *str);
const std::string& get(int idx) const;
protected: