[Scummvm-cvs-logs] SF.net SVN: scummvm:[39636] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Mon Mar 23 18:42:08 CET 2009
Revision: 39636
http://scummvm.svn.sourceforge.net/scummvm/?rev=39636&view=rev
Author: peres001
Date: 2009-03-23 17:42:08 +0000 (Mon, 23 Mar 2009)
Log Message:
-----------
Pushed down dependencies from parser.h
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/callables_ns.cpp
scummvm/trunk/engines/parallaction/disk_br.cpp
scummvm/trunk/engines/parallaction/disk_ns.cpp
scummvm/trunk/engines/parallaction/objects.cpp
scummvm/trunk/engines/parallaction/parallaction.h
scummvm/trunk/engines/parallaction/parallaction_br.cpp
scummvm/trunk/engines/parallaction/parallaction_ns.cpp
scummvm/trunk/engines/parallaction/parser.cpp
scummvm/trunk/engines/parallaction/parser_br.cpp
scummvm/trunk/engines/parallaction/parser_ns.cpp
Modified: scummvm/trunk/engines/parallaction/callables_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/callables_ns.cpp 2009-03-23 17:40:46 UTC (rev 39635)
+++ scummvm/trunk/engines/parallaction/callables_ns.cpp 2009-03-23 17:42:08 UTC (rev 39636)
@@ -408,8 +408,8 @@
parseLocation("common");
uint id[2];
- id[0] = _gfx->createLabel(_menuFont, _location._slideText[0], 1);
- id[1] = _gfx->createLabel(_menuFont, _location._slideText[1], 1);
+ id[0] = _gfx->createLabel(_menuFont, _location._slideText[0].c_str(), 1);
+ id[1] = _gfx->createLabel(_menuFont, _location._slideText[1].c_str(), 1);
_gfx->showLabel(id[0], CENTER_LABEL_HORIZONTAL, 38);
_gfx->showLabel(id[1], CENTER_LABEL_HORIZONTAL, 58);
Modified: scummvm/trunk/engines/parallaction/disk_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk_br.cpp 2009-03-23 17:40:46 UTC (rev 39635)
+++ scummvm/trunk/engines/parallaction/disk_br.cpp 2009-03-23 17:42:08 UTC (rev 39636)
@@ -27,6 +27,7 @@
#include "common/config-manager.h"
#include "parallaction/parallaction.h"
+#include "parallaction/parser.h"
#include "parallaction/iff.h"
Modified: scummvm/trunk/engines/parallaction/disk_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk_ns.cpp 2009-03-23 17:40:46 UTC (rev 39635)
+++ scummvm/trunk/engines/parallaction/disk_ns.cpp 2009-03-23 17:42:08 UTC (rev 39636)
@@ -25,7 +25,7 @@
#include "parallaction/iff.h"
#include "common/config-manager.h"
-
+#include "parallaction/parser.h"
#include "parallaction/parallaction.h"
Modified: scummvm/trunk/engines/parallaction/objects.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/objects.cpp 2009-03-23 17:40:46 UTC (rev 39635)
+++ scummvm/trunk/engines/parallaction/objects.cpp 2009-03-23 17:42:08 UTC (rev 39636)
@@ -25,6 +25,7 @@
#include "parallaction/parallaction.h"
#include "parallaction/objects.h"
+#include "parallaction/parser.h"
namespace Parallaction {
Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h 2009-03-23 17:40:46 UTC (rev 39635)
+++ scummvm/trunk/engines/parallaction/parallaction.h 2009-03-23 17:42:08 UTC (rev 39636)
@@ -36,7 +36,6 @@
#include "parallaction/input.h"
#include "parallaction/inventory.h"
-#include "parallaction/parser.h"
#include "parallaction/objects.h"
#include "parallaction/disk.h"
@@ -126,6 +125,10 @@
class SoundMan;
class SoundMan_ns;
class SoundMan_br;
+class LocationParser_ns;
+class LocationParser_br;
+class ProgramParser_ns;
+class ProgramParser_br;
struct Location {
@@ -148,7 +151,7 @@
// NS specific
PointList _walkPoints;
- char _slideText[2][MAX_TOKEN_LEN];
+ Common::String _slideText[2];
// BRA specific
int _zeta0;
@@ -535,7 +538,7 @@
LocationParser_br *_locationParser;
ProgramParser_br *_programParser;
SoundMan_br *_soundManI;
-
+
int32 _counters[32];
Table *_countersNames;
Modified: scummvm/trunk/engines/parallaction/parallaction_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_br.cpp 2009-03-23 17:40:46 UTC (rev 39635)
+++ scummvm/trunk/engines/parallaction/parallaction_br.cpp 2009-03-23 17:42:08 UTC (rev 39636)
@@ -29,6 +29,7 @@
#include "parallaction/parallaction.h"
#include "parallaction/exec.h"
#include "parallaction/input.h"
+#include "parallaction/parser.h"
#include "parallaction/saveload.h"
#include "parallaction/sound.h"
#include "parallaction/walk.h"
Modified: scummvm/trunk/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_ns.cpp 2009-03-23 17:40:46 UTC (rev 39635)
+++ scummvm/trunk/engines/parallaction/parallaction_ns.cpp 2009-03-23 17:42:08 UTC (rev 39636)
@@ -30,6 +30,7 @@
#include "parallaction/parallaction.h"
#include "parallaction/exec.h"
#include "parallaction/input.h"
+#include "parallaction/parser.h"
#include "parallaction/saveload.h"
#include "parallaction/sound.h"
#include "parallaction/walk.h"
@@ -173,7 +174,7 @@
} else {
_soundManI = new AmigaSoundMan_ns(this);
}
-
+
_soundMan = new SoundMan(_soundManI);
initResources();
@@ -333,7 +334,7 @@
if (locname.hasSlide()) {
showSlide(locname.slide());
- uint id = _gfx->createLabel(_menuFont, _location._slideText[0], 1);
+ uint id = _gfx->createLabel(_menuFont, _location._slideText[0].c_str(), 1);
_gfx->showLabel(id, CENTER_LABEL_HORIZONTAL, 14);
_gfx->updateScreen();
Modified: scummvm/trunk/engines/parallaction/parser.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parser.cpp 2009-03-23 17:40:46 UTC (rev 39635)
+++ scummvm/trunk/engines/parallaction/parser.cpp 2009-03-23 17:42:08 UTC (rev 39636)
@@ -24,6 +24,7 @@
*/
#include "parallaction/parallaction.h"
+#include "parallaction/parser.h"
namespace Parallaction {
Modified: scummvm/trunk/engines/parallaction/parser_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parser_br.cpp 2009-03-23 17:40:46 UTC (rev 39635)
+++ scummvm/trunk/engines/parallaction/parser_br.cpp 2009-03-23 17:42:08 UTC (rev 39636)
@@ -25,7 +25,7 @@
#include "parallaction/parallaction.h"
-
+#include "parallaction/parser.h"
#include "parallaction/sound.h"
namespace Parallaction {
@@ -812,9 +812,8 @@
do {
if (!scumm_stricmp(_tokens[0], "slidetext")) {
- strcpy(_vm->_location._slideText[0], _tokens[1]);
-// printf("%s\t", _slideText[0]);
- strcpy(_vm->_location._slideText[1], _tokens[2]);
+ _vm->_location._slideText[0] = _tokens[1];
+ _vm->_location._slideText[1] = _tokens[2];
}
if (!scumm_stricmp(_tokens[0], "location")) {
Modified: scummvm/trunk/engines/parallaction/parser_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parser_ns.cpp 2009-03-23 17:40:46 UTC (rev 39635)
+++ scummvm/trunk/engines/parallaction/parser_ns.cpp 2009-03-23 17:42:08 UTC (rev 39636)
@@ -25,6 +25,7 @@
#include "parallaction/parallaction.h"
+#include "parallaction/parser.h"
#include "parallaction/sound.h"
namespace Parallaction {
@@ -1443,9 +1444,8 @@
do {
if (!scumm_stricmp(_tokens[0], "slidetext")) {
- strcpy(_vm->_location._slideText[0], _tokens[1]);
-// printf("%s\t", _slideText[0]);
- strcpy(_vm->_location._slideText[1], _tokens[2]);
+ _vm->_location._slideText[0] = _tokens[1];
+ _vm->_location._slideText[1] = _tokens[2];
}
if (!scumm_stricmp(_tokens[0], "location")) {
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