thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SAGA: replace Actor::_pathCell, Anim::*, Converse::text, IsoMap::*, Music::_songTable, ObjectMap::*, PalAnim::*, Scene::sceneLut, SndRes::_fxTable* malloc based arrays with Common::Array implementation

Browse source 
add ByteArray type
fix debug Tile Hittest frame drawing
debug 0x%x => 0x%X

svn-id: r53719
This commit is contained in:
Andrew Kurushin 2010-10-22 23:13:17 +00:00
parent b8ff3eb491
commit f24394b85f
40 changed files with 329 additions and 540 deletions
Download patch file Download diff file Expand all files Collapse all files

17
engines/saga/interface.cpp
View file

@ -2420,18 +2420,9 @@ void Interface::drawVerbPanelText(PanelButton *panelButton, KnownColor textKnown
// Converse stuff
void Interface::converseInit() {
for (int i = 0; i < CONVERSE_MAX_TEXTS; i++)
_converseText[i].text = NULL;
converseClear();
}
void Interface::converseClear() {
for (int i = 0; i < CONVERSE_MAX_TEXTS; i++) {
if (_converseText[i].text != NULL) {
free(_converseText[i].text);
_converseText[i].text = NULL;
}
_converseText[i].text.clear();
_converseText[i].stringNum = -1;
_converseText[i].replyId = 0;
_converseText[i].replyFlags = 0;
@ -2477,8 +2468,8 @@ bool Interface::converseAddText(const char *text, int strId, int replyId, byte r
return true;
}
_converseText[_converseTextCount].text = (char *)malloc(i + 1);
strncpy(_converseText[_converseTextCount].text, _converseWorkString, i);
_converseText[_converseTextCount].text.resize(i + 1);
strncpy(&_converseText[_converseTextCount].text.front(), _converseWorkString, i);
_converseText[_converseTextCount].strId = strId;
_converseText[_converseTextCount].text[i] = 0;
@ -2588,7 +2579,7 @@ void Interface::converseDisplayTextLines() {
rect.left += 8;
_vm->_gfx->drawRect(rect, backgnd);
str = _converseText[relPos].text;
str = &_converseText[relPos].text.front();
if (_converseText[relPos].textNum == 0) { // first entry
textPoint.x = rect.left - 6;