[Scummvm-cvs-logs] SF.net SVN: scummvm:[43945] scummvm/trunk/engines/teenagent
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Fri Sep 4 22:08:33 CEST 2009
Revision: 43945
http://scummvm.svn.sourceforge.net/scummvm/?rev=43945&view=rev
Author: fingolfin
Date: 2009-09-04 20:08:33 +0000 (Fri, 04 Sep 2009)
Log Message:
-----------
TEEN:
* don't use "using namespace", instead put stuff into its correct namespace
* when using #include, always prefix engine header files with the engine name
* some cleanup
Modified Paths:
--------------
scummvm/trunk/engines/teenagent/actor.cpp
scummvm/trunk/engines/teenagent/actor.h
scummvm/trunk/engines/teenagent/animation.cpp
scummvm/trunk/engines/teenagent/animation.h
scummvm/trunk/engines/teenagent/callbacks.cpp
scummvm/trunk/engines/teenagent/detection.cpp
scummvm/trunk/engines/teenagent/dialog.cpp
scummvm/trunk/engines/teenagent/dialog.h
scummvm/trunk/engines/teenagent/font.cpp
scummvm/trunk/engines/teenagent/font.h
scummvm/trunk/engines/teenagent/inventory.cpp
scummvm/trunk/engines/teenagent/inventory.h
scummvm/trunk/engines/teenagent/music.cpp
scummvm/trunk/engines/teenagent/objects.cpp
scummvm/trunk/engines/teenagent/objects.h
scummvm/trunk/engines/teenagent/pack.cpp
scummvm/trunk/engines/teenagent/pack.h
scummvm/trunk/engines/teenagent/resources.cpp
scummvm/trunk/engines/teenagent/resources.h
scummvm/trunk/engines/teenagent/scene.cpp
scummvm/trunk/engines/teenagent/scene.h
scummvm/trunk/engines/teenagent/segment.cpp
scummvm/trunk/engines/teenagent/segment.h
scummvm/trunk/engines/teenagent/surface.cpp
scummvm/trunk/engines/teenagent/surface.h
scummvm/trunk/engines/teenagent/teenagent.cpp
scummvm/trunk/engines/teenagent/teenagent.h
Modified: scummvm/trunk/engines/teenagent/actor.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/actor.cpp 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/actor.cpp 2009-09-04 20:08:33 UTC (rev 43945)
@@ -21,11 +21,12 @@
* $URL$
* $Id$
*/
-#include "actor.h"
-#include "objects.h"
-using namespace TeenAgent;
+#include "teenagent/actor.h"
+#include "teenagent/objects.h"
+namespace TeenAgent {
+
void Actor::render(Graphics::Surface * surface, const Common::Point & position, uint8 orientation, int delta_frame) {
uint8 frames_left_right[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
uint8 frames_up[] = {18, 19, 20, 21, 22, 23, 24, 25, };
@@ -68,3 +69,5 @@
if (s != NULL)
s->render(surface, position.x - dx, position.y - dy, orientation == Object::ActorLeft);
}
+
+} // End of namespace TeenAgent
Modified: scummvm/trunk/engines/teenagent/actor.h
===================================================================
--- scummvm/trunk/engines/teenagent/actor.h 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/actor.h 2009-09-04 20:08:33 UTC (rev 43945)
@@ -22,7 +22,7 @@
* $Id$
*/
-#include "animation.h"
+#include "teenagent/animation.h"
#include "common/rect.h"
namespace TeenAgent {
@@ -31,4 +31,5 @@
public:
void render(Graphics::Surface * surface, const Common::Point & position, uint8 orientation, int delta_frame);
};
-}
+
+} // End of namespace TeenAgent
Modified: scummvm/trunk/engines/teenagent/animation.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/animation.cpp 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/animation.cpp 2009-09-04 20:08:33 UTC (rev 43945)
@@ -22,11 +22,10 @@
* $Id$
*/
-
-#include "animation.h"
+#include "teenagent/animation.h"
#include "common/endian.h"
-using namespace TeenAgent;
+namespace TeenAgent {
Animation::Animation() : id(0), x(0), y(0), loop(true), data(0), data_size(0), frames_count(0), frames(0), index(0) {
}
@@ -183,3 +182,5 @@
Animation::~Animation() {
free();
}
+
+} // End of namespace TeenAgent
Modified: scummvm/trunk/engines/teenagent/animation.h
===================================================================
--- scummvm/trunk/engines/teenagent/animation.h 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/animation.h 2009-09-04 20:08:33 UTC (rev 43945)
@@ -22,14 +22,14 @@
* $Id$
*/
-
#ifndef TEENAGENT_ANIMATION_H
#define TEENAGENT_ANIMATION_H
#include "common/stream.h"
-#include "surface.h"
+#include "teenagent/surface.h"
namespace TeenAgent {
+
class Animation {
public:
uint16 id, x, y;
@@ -57,8 +57,7 @@
Surface * frames;
uint16 index;
};
-}
+} // End of namespace TeenAgent
#endif
-
Modified: scummvm/trunk/engines/teenagent/callbacks.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/callbacks.cpp 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/callbacks.cpp 2009-09-04 20:08:33 UTC (rev 43945)
@@ -22,12 +22,12 @@
* $Id$
*/
-#include "scene.h"
-#include "teenagent.h"
-#include "resources.h"
-#include "dialog.h"
+#include "teenagent/scene.h"
+#include "teenagent/teenagent.h"
+#include "teenagent/resources.h"
+#include "teenagent/dialog.h"
-using namespace TeenAgent;
+namespace TeenAgent {
#define CHECK_FLAG(addr, v) (res->dseg.get_byte(addr) == (v))
#define SET_FLAG(addr, v) (res->dseg.set_byte((addr), (v)))
@@ -1823,3 +1823,5 @@
debug(0, "invalid callback %04x called", addr);
return true;
}
+
+} // End of namespace TeenAgent
Modified: scummvm/trunk/engines/teenagent/detection.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/detection.cpp 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/detection.cpp 2009-09-04 20:08:33 UTC (rev 43945)
@@ -22,13 +22,14 @@
* $Id$
*/
+#include "common/system.h"
+#include "common/savefile.h"
+#include "base/plugins.h"
+
#include "engines/advancedDetector.h"
-#include "base/plugins.h"
+
#include "teenagent/teenagent.h"
-#include "common/system.h"
-#include "common/savefile.h"
-#include "teenagent.h"
static const PlainGameDescriptor teenAgentGames[] = {
{ "teenagent", "Teen agent" },
Modified: scummvm/trunk/engines/teenagent/dialog.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/dialog.cpp 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/dialog.cpp 2009-09-04 20:08:33 UTC (rev 43945)
@@ -22,11 +22,11 @@
* $Id$
*/
-#include "dialog.h"
-#include "resources.h"
-#include "scene.h"
+#include "teenagent/dialog.h"
+#include "teenagent/resources.h"
+#include "teenagent/scene.h"
-using namespace TeenAgent;
+namespace TeenAgent {
void Dialog::show(Scene * scene, uint16 addr, uint16 animation) {
debug(0, "Dialog::show(%04x, %u)", addr, animation);
@@ -104,3 +104,5 @@
show(scene, next, animation);
return next;
}
+
+} // End of namespace TeenAgent
Modified: scummvm/trunk/engines/teenagent/dialog.h
===================================================================
--- scummvm/trunk/engines/teenagent/dialog.h 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/dialog.h 2009-09-04 20:08:33 UTC (rev 43945)
@@ -36,7 +36,7 @@
static uint16 pop(Scene *scene, uint16 addr, uint16 animation = 0);
static void show(Scene *scene, uint16 addr, uint16 animation = 0);
};
-}
+} // End of namespace TeenAgent
+
#endif
-
Modified: scummvm/trunk/engines/teenagent/font.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/font.cpp 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/font.cpp 2009-09-04 20:08:33 UTC (rev 43945)
@@ -22,12 +22,11 @@
* $Id$
*/
+#include "teenagent/font.h"
+#include "teenagent/resources.h"
-#include "font.h"
-#include "resources.h"
+namespace TeenAgent {
-using namespace TeenAgent;
-
Font::Font() : grid_color(0xd0), color(0xd1), data(0) {
}
@@ -140,3 +139,5 @@
Font::~Font() {
delete[] data;
}
+
+} // End of namespace TeenAgent
Modified: scummvm/trunk/engines/teenagent/font.h
===================================================================
--- scummvm/trunk/engines/teenagent/font.h 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/font.h 2009-09-04 20:08:33 UTC (rev 43945)
@@ -28,6 +28,7 @@
#include "graphics/surface.h"
namespace TeenAgent {
+
class Font {
public:
byte grid_color, color;
@@ -42,7 +43,8 @@
private:
byte *data;
};
-}
+} // End of namespace TeenAgent
+
#endif
Modified: scummvm/trunk/engines/teenagent/inventory.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/inventory.cpp 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/inventory.cpp 2009-09-04 20:08:33 UTC (rev 43945)
@@ -22,14 +22,15 @@
* $Id$
*/
-#include "inventory.h"
-#include "resources.h"
#include "common/stream.h"
-#include "objects.h"
-#include "teenagent.h"
-using namespace TeenAgent;
+#include "teenagent/inventory.h"
+#include "teenagent/resources.h"
+#include "teenagent/objects.h"
+#include "teenagent/teenagent.h"
+namespace TeenAgent {
+
void Inventory::init(TeenAgentEngine * engine) {
_engine = engine;
_active = false;
@@ -283,3 +284,5 @@
}
}
}
+
+} // End of namespace TeenAgent
Modified: scummvm/trunk/engines/teenagent/inventory.h
===================================================================
--- scummvm/trunk/engines/teenagent/inventory.h 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/inventory.h 2009-09-04 20:08:33 UTC (rev 43945)
@@ -25,10 +25,10 @@
#ifndef TEENAGENT_INVENTORY_H
#define TEENAGENT_INVENTORY_H
-#include "surface.h"
-#include "animation.h"
+#include "teenagent/surface.h"
+#include "teenagent/animation.h"
#include "common/events.h"
-#include "objects.h"
+#include "teenagent/objects.h"
namespace TeenAgent {
@@ -78,7 +78,7 @@
InventoryObject *hovered_obj, *selected_obj;
};
-}
+} // End of namespace TeenAgent
+
#endif
-
Modified: scummvm/trunk/engines/teenagent/music.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/music.cpp 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/music.cpp 2009-09-04 20:08:33 UTC (rev 43945)
@@ -23,10 +23,10 @@
*
*/
-#include "music.h"
-#include "resources.h"
+#include "teenagent/music.h"
+#include "teenagent/resources.h"
-using namespace TeenAgent;
+namespace TeenAgent {
static uint32 noteToPeriod[3][12] = {
{855, 807, 761, 720, 678, 640, 604, 569, 537, 508, 480, 453},
@@ -160,3 +160,5 @@
++_currRow;
}
+
+} // End of namespace TeenAgent
Modified: scummvm/trunk/engines/teenagent/objects.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/objects.cpp 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/objects.cpp 2009-09-04 20:08:33 UTC (rev 43945)
@@ -22,10 +22,10 @@
* $Id$
*/
-#include "objects.h"
+#include "teenagent/objects.h"
#include "common/debug.h"
-using namespace TeenAgent;
+namespace TeenAgent {
void Rect::render(Graphics::Surface *surface, uint8 color) const {
surface->hLine(left, bottom, right, color);
@@ -84,3 +84,5 @@
Common::String InventoryObject::description() const {
return Object::description(name);
}
+
+} // End of namespace TeenAgent
Modified: scummvm/trunk/engines/teenagent/objects.h
===================================================================
--- scummvm/trunk/engines/teenagent/objects.h 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/objects.h 2009-09-04 20:08:33 UTC (rev 43945)
@@ -99,6 +99,6 @@
#include "common/pack-end.h" // END STRUCT PACKING
-}
+} // End of namespace TeenAgent
#endif
Modified: scummvm/trunk/engines/teenagent/pack.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/pack.cpp 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/pack.cpp 2009-09-04 20:08:33 UTC (rev 43945)
@@ -22,12 +22,11 @@
* $Id$
*/
-
-#include "pack.h"
+#include "teenagent/pack.h"
#include "common/util.h"
#include "common/debug.h"
-using namespace TeenAgent;
+namespace TeenAgent {
Pack::Pack() : count(0), offsets(0) {}
@@ -81,3 +80,5 @@
debug(0, "stream: %04x-%04x", offsets[id - 1], offsets[id]);
return new Common::SeekableSubReadStream(&file, offsets[id - 1], offsets[id], false);
}
+
+} // End of namespace TeenAgent
Modified: scummvm/trunk/engines/teenagent/pack.h
===================================================================
--- scummvm/trunk/engines/teenagent/pack.h 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/pack.h 2009-09-04 20:08:33 UTC (rev 43945)
@@ -44,6 +44,6 @@
Common::SeekableReadStream * getStream(uint32 id) const;
};
-}
+} // End of namespace TeenAgent
#endif
Modified: scummvm/trunk/engines/teenagent/resources.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/resources.cpp 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/resources.cpp 2009-09-04 20:08:33 UTC (rev 43945)
@@ -22,10 +22,10 @@
* $Id$
*/
-#include "resources.h"
-#include "teenagent.h"
+#include "teenagent/resources.h"
+#include "teenagent/teenagent.h"
-using namespace TeenAgent;
+namespace TeenAgent {
Resources::Resources() {}
@@ -143,3 +143,5 @@
}
return lan000.getStream(id);
}
+
+} // End of namespace TeenAgent
Modified: scummvm/trunk/engines/teenagent/resources.h
===================================================================
--- scummvm/trunk/engines/teenagent/resources.h 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/resources.h 2009-09-04 20:08:33 UTC (rev 43945)
@@ -22,13 +22,12 @@
* $Id$
*/
-
#ifndef TEENAGENT_RESOURCES_H
#define TEENAGENT_RESOURCES_H
-#include "pack.h"
-#include "segment.h"
-#include "font.h"
+#include "teenagent/pack.h"
+#include "teenagent/segment.h"
+#include "teenagent/font.h"
#include "graphics/surface.h"
namespace TeenAgent {
@@ -53,6 +52,6 @@
Font font7;
};
-}
+} // End of namespace TeenAgent
#endif
Modified: scummvm/trunk/engines/teenagent/scene.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/scene.cpp 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/scene.cpp 2009-09-04 20:08:33 UTC (rev 43945)
@@ -22,17 +22,16 @@
* $Id$
*/
-
-#include "scene.h"
-#include "resources.h"
-#include "surface.h"
+#include "teenagent/scene.h"
+#include "teenagent/resources.h"
+#include "teenagent/surface.h"
#include "common/debug.h"
-#include "objects.h"
-#include "teenagent.h"
-#include "dialog.h"
-#include "music.h"
+#include "teenagent/objects.h"
+#include "teenagent/teenagent.h"
+#include "teenagent/dialog.h"
+#include "teenagent/music.h"
-using namespace TeenAgent;
+namespace TeenAgent {
Scene::Scene() : _engine(NULL),
_system(NULL),
@@ -509,3 +508,5 @@
events.clear();
current_event.clear();
}
+
+} // End of namespace TeenAgent
Modified: scummvm/trunk/engines/teenagent/scene.h
===================================================================
--- scummvm/trunk/engines/teenagent/scene.h 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/scene.h 2009-09-04 20:08:33 UTC (rev 43945)
@@ -22,12 +22,11 @@
* $Id$
*/
-
#ifndef TEENAGENT_SCENE_H
#define TEENAGENT_SCENE_H
-#include "surface.h"
-#include "actor.h"
+#include "teenagent/surface.h"
+#include "teenagent/actor.h"
#include "common/system.h"
#include "common/list.h"
@@ -160,7 +159,7 @@
byte sound_id, sound_delay;
};
-}
-#endif
+} // End of namespace TeenAgent
+#endif
Modified: scummvm/trunk/engines/teenagent/segment.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/segment.cpp 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/segment.cpp 2009-09-04 20:08:33 UTC (rev 43945)
@@ -22,8 +22,9 @@
* $Id$
*/
+#include "teenagent/segment.h"
-#include "segment.h"
+namespace TeenAgent {
void Segment::read(Common::ReadStream *stream, uint32 s) {
_size = s;
@@ -35,3 +36,4 @@
delete[] _data;
}
+} // End of namespace TeenAgent
Modified: scummvm/trunk/engines/teenagent/segment.h
===================================================================
--- scummvm/trunk/engines/teenagent/segment.h 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/segment.h 2009-09-04 20:08:33 UTC (rev 43945)
@@ -22,13 +22,14 @@
* $Id$
*/
-
#ifndef TEENAGENT_SEGMENT_H
#define TEENAGENT_SEGMENT_H
#include "common/stream.h"
#include "common/endian.h"
+namespace TeenAgent {
+
class Segment {
uint32 _size;
byte * _data;
@@ -76,5 +77,6 @@
uint size() const { return _size; }
};
+} // End of namespace TeenAgent
+
#endif
-
Modified: scummvm/trunk/engines/teenagent/surface.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/surface.cpp 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/surface.cpp 2009-09-04 20:08:33 UTC (rev 43945)
@@ -22,13 +22,12 @@
* $Id$
*/
-
-#include "surface.h"
-#include "pack.h"
+#include "teenagent/surface.h"
+#include "teenagent/pack.h"
#include "common/stream.h"
#include "common/debug.h"
-using namespace TeenAgent;
+namespace TeenAgent {
Surface::Surface() : x(0), y(0) {
memset(flags, 0, sizeof(flags));
@@ -46,7 +45,7 @@
if (stream->eos())
return;
- for(byte i = 0; i < fn; ++i) {
+ for (byte i = 0; i < fn; ++i) {
flags[i] = stream->readUint16LE();
debug(0, "flags[%u] = %u (0x%04x)", i, flags[i], flags[i]);
}
@@ -83,8 +82,8 @@
byte *src = (byte *)pixels;
byte *dst = (byte *)surface->getBasePtr(dx + x, dy + y);
- for(int i = 0; i < h; ++i) {
- for(int j = 0; j < w; ++j) {
+ for (int i = 0; i < h; ++i) {
+ for (int j = 0; j < w; ++j) {
byte p = src[j];
if (p != 0xff)
dst[mirror? w - j - 1: j] = p;
@@ -93,3 +92,5 @@
src += pitch;
}
}
+
+} // End of namespace TeenAgent
Modified: scummvm/trunk/engines/teenagent/surface.h
===================================================================
--- scummvm/trunk/engines/teenagent/surface.h 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/surface.h 2009-09-04 20:08:33 UTC (rev 43945)
@@ -22,7 +22,6 @@
* $Id$
*/
-
#ifndef TAGET_SURFACE_H
#define TAGET_SURFACE_H
@@ -46,7 +45,6 @@
bool empty() const { return pixels == NULL; }
};
-}
+} // End of namespace TeenAgent
#endif
-
Modified: scummvm/trunk/engines/teenagent/teenagent.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/teenagent.cpp 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/teenagent.cpp 2009-09-04 20:08:33 UTC (rev 43945)
@@ -22,7 +22,6 @@
* $Id$
*/
-
#include "teenagent/teenagent.h"
#include "common/system.h"
#include "common/events.h"
@@ -30,11 +29,11 @@
#include "common/savefile.h"
#include "common/config-manager.h"
#include "sound/mixer.h"
-#include "scene.h"
-#include "objects.h"
-#include "music.h"
+#include "teenagent/scene.h"
+#include "teenagent/objects.h"
+#include "teenagent/music.h"
-using namespace TeenAgent;
+namespace TeenAgent {
TeenAgentEngine::TeenAgentEngine(OSystem * system, const GameDescription *gd) : Engine(system), action(ActionNone), _gameDescription(gd) {
music = new MusicPlayer();
@@ -482,3 +481,5 @@
return false;
}
}
+
+} // End of namespace TeenAgent
Modified: scummvm/trunk/engines/teenagent/teenagent.h
===================================================================
--- scummvm/trunk/engines/teenagent/teenagent.h 2009-09-04 20:06:19 UTC (rev 43944)
+++ scummvm/trunk/engines/teenagent/teenagent.h 2009-09-04 20:08:33 UTC (rev 43945)
@@ -22,14 +22,13 @@
* $Id$
*/
-
#ifndef TEENAGENT_ENGINE_H
#define TEENAGENT_ENGINE_H
#include "engines/engine.h"
-#include "pack.h"
-#include "resources.h"
-#include "inventory.h"
+#include "teenagent/pack.h"
+#include "teenagent/resources.h"
+#include "teenagent/inventory.h"
#include "sound/audiostream.h"
#include "sound/mixer.h"
#include "engines/advancedDetector.h"
@@ -117,7 +116,6 @@
const GameDescription *_gameDescription;
};
-}
+} // End of namespace TeenAgent
#endif
-
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