aboutsummaryrefslogtreecommitdiff
path: root/sword1/control.h
diff options
context:
space:
mode:
authorTorbjörn Andersson2003-12-31 17:38:27 +0000
committerTorbjörn Andersson2003-12-31 17:38:27 +0000
commit0aeae5a9b567ad825e78ef3b4f2875b3eca63f7f (patch)
tree2413212fe20cc9f82e7b7ae7f0d106ee088a663b /sword1/control.h
parent9a064972c22984d06b1927395b92c3d60e5e051b (diff)
downloadscummvm-rg350-0aeae5a9b567ad825e78ef3b4f2875b3eca63f7f.tar.gz
scummvm-rg350-0aeae5a9b567ad825e78ef3b4f2875b3eca63f7f.tar.bz2
scummvm-rg350-0aeae5a9b567ad825e78ef3b4f2875b3eca63f7f.zip
Use uint8 instead of char to avoid crashes with some accented characters.
svn-id: r12061
Diffstat (limited to 'sword1/control.h')
-rw-r--r--sword1/control.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/sword1/control.h b/sword1/control.h
index 8c844fac82..e0cc5daa31 100644
--- a/sword1/control.h
+++ b/sword1/control.h
@@ -83,8 +83,8 @@ private:
uint8 _saveFiles;
uint8 _saveScrollPos;
uint8 _selectedSavegame;
- char _saveNames[64][32];
- char _oldName[32];
+ uint8 _saveNames[64][32];
+ uint8 _oldName[32];
uint8 getClicks(uint8 mode, uint8 *retVal);
uint8 handleButtonClick(uint8 id, uint8 mode, uint8 *retVal);
@@ -101,16 +101,16 @@ private:
void handleSaveKey(uint8 key);
void renderVolumeBar(uint8 id);
- uint16 getTextWidth(const char *str);
- void renderText(const char *str, uint16 x, uint16 y, uint8 mode);
+ uint16 getTextWidth(const uint8 *str);
+ void renderText(const uint8 *str, uint16 x, uint16 y, uint8 mode);
uint8 _numButtons;
uint8 _selectedButton;
void createButtons(const ButtonInfo *buttons, uint8 num);
void destroyButtons(void);
ControlButton *_buttons[MAX_BUTTONS];
static const ButtonInfo _deathButtons[3], _panelButtons[8], _saveButtons[16], _volumeButtons[1];
- static const char _languageStrings[8 * 20][43];
- const char (*_lStrings)[43];
+ static const uint8 _languageStrings[8 * 20][43];
+ const uint8 (*_lStrings)[43];
ObjectMan *_objMan;
ResMan *_resMan;
OSystem *_system;