[Scummvm-cvs-logs] SF.net SVN: scummvm: [31374] scummvm/trunk/engines/kyra
athrxx at users.sourceforge.net
athrxx at users.sourceforge.net
Fri Apr 4 03:43:20 CEST 2008
Revision: 31374
http://scummvm.svn.sourceforge.net/scummvm/?rev=31374&view=rev
Author: athrxx
Date: 2008-04-03 18:43:20 -0700 (Thu, 03 Apr 2008)
Log Message:
-----------
cleanup
Modified Paths:
--------------
scummvm/trunk/engines/kyra/gui_v2.cpp
scummvm/trunk/engines/kyra/kyra_v2.cpp
Modified: scummvm/trunk/engines/kyra/gui_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_v2.cpp 2008-04-04 01:12:35 UTC (rev 31373)
+++ scummvm/trunk/engines/kyra/gui_v2.cpp 2008-04-04 01:43:20 UTC (rev 31374)
@@ -581,21 +581,21 @@
if (!menu.menuNameId)
return 0;
- return _vm->getTableString(menu.menuNameId, _vm->gameFlags().isTalkie ? _vm->_optionsBuffer : _vm->_cCodeBuffer, 1);
+ return _vm->getTableString(menu.menuNameId, _vm->_optionsBuffer, 1);
}
const char *GUI_v2::getMenuItemTitle(const MenuItem &menuItem) {
if (!menuItem.itemId)
return 0;
- return _vm->getTableString(menuItem.itemId, _vm->gameFlags().isTalkie ? _vm->_optionsBuffer : _vm->_cCodeBuffer, 1);
+ return _vm->getTableString(menuItem.itemId, _vm->_optionsBuffer, 1);
}
const char *GUI_v2::getMenuItemLabel(const MenuItem &menuItem) {
if (!menuItem.labelId)
return 0;
- return _vm->getTableString(menuItem.labelId, _vm->gameFlags().isTalkie ? _vm->_optionsBuffer : _vm->_cCodeBuffer, 1);
+ return _vm->getTableString(menuItem.labelId, _vm->_optionsBuffer, 1);
}
#pragma mark -
@@ -1329,7 +1329,7 @@
void GUI_v2::setupSavegameNames(Menu &menu, int num) {
for (int i = 0; i < num; ++i) {
- strcpy(_vm->getTableString(menu.item[i].itemId, _vm->gameFlags().isTalkie ? _vm->_optionsBuffer : _vm->_cCodeBuffer, 0), "");
+ strcpy(_vm->getTableString(menu.item[i].itemId, _vm->_optionsBuffer, 0), "");
menu.item[i].saveSlot = -1;
menu.item[i].enabled = false;
}
@@ -1338,7 +1338,7 @@
Common::InSaveFile *in;
for (int i = 0; i < num; ++i) {
if ((in = _vm->openSaveForReading(_vm->getSavegameFilename(i + _savegameOffset), header)) != 0) {
- strncpy(_vm->getTableString(menu.item[i].itemId, _vm->gameFlags().isTalkie ? _vm->_optionsBuffer : _vm->_cCodeBuffer, 0), header.description.c_str(), 80);
+ strncpy(_vm->getTableString(menu.item[i].itemId, _vm->_optionsBuffer, 0), header.description.c_str(), 80);
menu.item[i].saveSlot = i + _savegameOffset;
menu.item[i].enabled = true;
delete in;
@@ -1346,8 +1346,8 @@
}
if (_savegameOffset == 0) {
- char *dst = _vm->getTableString(menu.item[0].itemId, _vm->gameFlags().isTalkie ? _vm->_optionsBuffer : _vm->_cCodeBuffer, 0);
- const char *src = _vm->getTableString(_vm->gameFlags().isTalkie ? 34 : 42, _vm->gameFlags().isTalkie ? _vm->_optionsBuffer : _vm->_cCodeBuffer, 0);
+ char *dst = _vm->getTableString(menu.item[0].itemId, _vm->_optionsBuffer, 0);
+ const char *src = _vm->getTableString(_vm->gameFlags().isTalkie ? 34 : 42, _vm->_optionsBuffer, 0);
strcpy(dst, src);
}
}
Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp 2008-04-04 01:12:35 UTC (rev 31373)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp 2008-04-04 01:43:20 UTC (rev 31374)
@@ -316,6 +316,8 @@
openTalkFile(0);
_currentTalkFile = 1;
openTalkFile(1);
+ } else {
+ _optionsBuffer = _cCodeBuffer;
}
showMessage(0, 207);
@@ -903,8 +905,10 @@
}
freeSceneShapePtrs();
+ if (_optionsBuffer != _cCodeBuffer)
+ delete [] _optionsBuffer;
+ _optionsBuffer = 0;
delete [] _cCodeBuffer; _cCodeBuffer = 0;
- delete [] _optionsBuffer; _optionsBuffer = 0;
delete [] _chapterBuffer; _chapterBuffer = 0;
delete [] _talkObjectList; _talkObjectList = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list