[Scummvm-cvs-logs] SF.net SVN: scummvm:[48845] scummvm/branches/branch-1-1-0/engines/ parallaction
wjpalenstijn at users.sourceforge.net
wjpalenstijn at users.sourceforge.net
Thu Apr 29 00:37:45 CEST 2010
Revision: 48845
http://scummvm.svn.sourceforge.net/scummvm/?rev=48845&view=rev
Author: wjpalenstijn
Date: 2010-04-28 22:37:44 +0000 (Wed, 28 Apr 2010)
Log Message:
-----------
Backport r48838, r48840, r48844: Initialize variables and fix leaks
Modified Paths:
--------------
scummvm/branches/branch-1-1-0/engines/parallaction/graphics.cpp
scummvm/branches/branch-1-1-0/engines/parallaction/parser_ns.cpp
Modified: scummvm/branches/branch-1-1-0/engines/parallaction/graphics.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/engines/parallaction/graphics.cpp 2010-04-28 22:33:17 UTC (rev 48844)
+++ scummvm/branches/branch-1-1-0/engines/parallaction/graphics.cpp 2010-04-28 22:37:44 UTC (rev 48845)
@@ -720,8 +720,11 @@
Gfx::Gfx(Parallaction* vm) :
- _vm(vm), _disk(vm->_disk), _backgroundInfo(0), _scrollPosX(0), _minScrollX(0), _maxScrollX(0),
- _minScrollY(0), _maxScrollY(0), _requestedHScrollSteps(0), _requestedVScrollSteps(0) {
+ _vm(vm), _disk(vm->_disk), _backgroundInfo(0),
+ _scrollPosX(0), _scrollPosY(0),_minScrollX(0), _maxScrollX(0),
+ _minScrollY(0), _maxScrollY(0),
+ _requestedHScrollSteps(0), _requestedVScrollSteps(0),
+ _requestedHScrollDir(0), _requestedVScrollDir(0) {
_gameType = _vm->getGameType();
_doubleBuffering = _gameType != GType_Nippon;
Modified: scummvm/branches/branch-1-1-0/engines/parallaction/parser_ns.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/engines/parallaction/parser_ns.cpp 2010-04-28 22:33:17 UTC (rev 48844)
+++ scummvm/branches/branch-1-1-0/engines/parallaction/parser_ns.cpp 2010-04-28 22:37:44 UTC (rev 48845)
@@ -1346,7 +1346,7 @@
void LocationParser_ns::parseExamineData(ZonePtr z) {
TypeData *data = &z->u;
if (!scumm_stricmp(_tokens[0], "file")) {
- data->_filename = strdup(_tokens[1]);
+ data->_filename = _tokens[1];
} else
if (!scumm_stricmp(_tokens[0], "desc")) {
data->_examineText = parseComment();
@@ -1360,7 +1360,7 @@
_vm->_location._slideText[1] = _tokens[2];
} else
if (!scumm_stricmp(_tokens[0], "location")) {
- data->_doorLocation = strdup(_tokens[1]);
+ data->_doorLocation = _tokens[1];
} else
if (!scumm_stricmp(_tokens[0], "file")) {
GfxObj *obj = _vm->_gfx->loadDoor(_tokens[1]);
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