r177 - in trunk/src: . objects
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Feb 4 16:45:28 EST 2006
Author: jonas
Date: 2006-02-04 16:45:27 -0500 (Sat, 04 Feb 2006)
New Revision: 177
Modified:
trunk/src/characters_common.cpp
trunk/src/characters_common.h
trunk/src/monsters_common.cpp
trunk/src/monsters_common.h
trunk/src/objectpools.cpp
trunk/src/objectpools.h
trunk/src/objects/baleog.cpp
trunk/src/objects/baleog.h
trunk/src/objects/bomb.cpp
trunk/src/objects/bomb.h
trunk/src/objects/door.cpp
trunk/src/objects/door.h
trunk/src/objects/erik.cpp
trunk/src/objects/erik.h
trunk/src/objects/exit.cpp
trunk/src/objects/exit.h
trunk/src/objects/fang.cpp
trunk/src/objects/fang.h
trunk/src/objects/geyser.cpp
trunk/src/objects/geyser.h
trunk/src/objects/heart.cpp
trunk/src/objects/heart.h
trunk/src/objects/key.cpp
trunk/src/objects/key.h
trunk/src/objects/olaf.cpp
trunk/src/objects/olaf.h
trunk/src/objects/plant.cpp
trunk/src/objects/plant.h
trunk/src/objects/scorch.cpp
trunk/src/objects/scorch.h
trunk/src/objects/spike.cpp
trunk/src/objects/spike.h
trunk/src/objects/teleport.cpp
trunk/src/objects/teleport.h
trunk/src/objects/trigger.cpp
trunk/src/objects/trigger.h
trunk/src/objects/triggered_bomb.cpp
trunk/src/objects/triggered_bomb.h
trunk/src/objects/wall.cpp
trunk/src/objects/wall.h
trunk/src/objects/water.cpp
trunk/src/objects/water.h
trunk/src/objects/wind.cpp
trunk/src/objects/wind.h
trunk/src/objects/zombie.cpp
trunk/src/objects/zombie.h
trunk/src/objects_common.cpp
trunk/src/objects_common.h
trunk/src/players_common.cpp
trunk/src/players_common.h
Log:
Changed the parameter map to be a constant to allow specifying a default option. Unfortunately this needs yet another parameter member inside the object class... :(
Modified: trunk/src/characters_common.cpp
===================================================================
--- trunk/src/characters_common.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/characters_common.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -7,8 +7,8 @@
#include "characters_common.h"
-Character::Character(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Object(xcord,ycord,parameters),
+Character::Character(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Object(xcord,ycord,param),
health(1),
maxhealth(1),
maxspeedx(300),
Modified: trunk/src/characters_common.h
===================================================================
--- trunk/src/characters_common.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/characters_common.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -35,7 +35,7 @@
*/
class Character : public Object {
public:
- Character(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Character(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Character();
static ParameterMap default_parameters;
Uint8 getHealth();
Modified: trunk/src/monsters_common.cpp
===================================================================
--- trunk/src/monsters_common.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/monsters_common.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -10,8 +10,8 @@
#include "players_common.h"
-Monster::Monster(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Character(xcord,ycord,parameters),
+Monster::Monster(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Character(xcord,ycord,param),
Dai(0),
Dattack(0) {
state=STATE_FALL;
Modified: trunk/src/monsters_common.h
===================================================================
--- trunk/src/monsters_common.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/monsters_common.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -9,7 +9,7 @@
*/
class Monster : public Character {
public:
- Monster(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Monster(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Monster();
static ParameterMap default_parameters;
virtual void removedObject(Object*);
Modified: trunk/src/objectpools.cpp
===================================================================
--- trunk/src/objectpools.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objectpools.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -215,13 +215,13 @@
else return empty_parameter;
}
-Object* ObjectsPool::addObjectbyName(const string& obj, Sint16 x, Sint16 y, ParameterMap& objparam, bool outside) {
+Object* ObjectsPool::addObjectbyName(const string& obj, Sint16 x, Sint16 y, const ParameterMap& objparam, bool outside) {
ParameterMap parameters;
if (hasParam(objparam,"file")) {
- parameters=getFileParameters(objparam["file"]);
- ParameterMap::iterator it=objparam.begin();
+ parameters=getFileParameters(objparam.find("file")->second);
+ ParameterMap::const_iterator it=objparam.begin();
while (it!=objparam.end()) {
- if ((*it).first!="file") parameters[(*it).first]=(*it).second;
+ if (it->first!="file") parameters[it->first]=it->second;
++it;
}
} else {
Modified: trunk/src/objectpools.h
===================================================================
--- trunk/src/objectpools.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objectpools.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -36,7 +36,7 @@
/// \param outside True if the object shouldn't be added to the pools
/// \return Pointer to the new entry in the objectspool or NULL if
/// the object was not recognized
- Object* addObjectbyName(const string& obj, Sint16 x=0, Sint16 y=0, ParameterMap& parameters=ParameterMap(), bool outside=false);
+ Object* addObjectbyName(const string& obj, Sint16 x=0, Sint16 y=0, const ParameterMap& param=ParameterMap(), bool outside=false);
/// Add an Object to all corresponding pools
/// \return Pointer to the new entry in the objectspool or NULL if it failed
Object* addObject(Object* object, bool outside=false);
Modified: trunk/src/objects/baleog.cpp
===================================================================
--- trunk/src/objects/baleog.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/baleog.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -8,8 +8,8 @@
#include "baleog.h"
-Baleog::Baleog(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Player(xcord,ycord,parameters) {
+Baleog::Baleog(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Player(xcord,ycord,param) {
weapon=Weapon(-1,W_STRIKE);
/* Parameters */
Modified: trunk/src/objects/baleog.h
===================================================================
--- trunk/src/objects/baleog.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/baleog.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -5,7 +5,7 @@
*/
class Baleog : public Player {
public:
- Baleog(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Baleog(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Baleog();
static ParameterMap default_parameters;
/// \brief Baleog attacks with a sword
Modified: trunk/src/objects/bomb.cpp
===================================================================
--- trunk/src/objects/bomb.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/bomb.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -7,8 +7,8 @@
#include "triggered_bomb.h"
#include "bomb.h"
-Bomb::Bomb(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Item(xcord,ycord,parameters) {
+Bomb::Bomb(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Item(xcord,ycord,param) {
/* Parameters */
if (!hasParam(parameters,"image")) anim_orig=loadAnimation(scenario->imgcache->loadImage(1,"bomb_fire.bmp"));
if (hasParam(parameters,"image_bomb")) triggered_bomb_param["image"]=parameters["image_bomb"];
Modified: trunk/src/objects/bomb.h
===================================================================
--- trunk/src/objects/bomb.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/bomb.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -8,7 +8,7 @@
*/
class Bomb : public Item {
public:
- Bomb(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Bomb(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Bomb();
static ParameterMap default_parameters;
virtual bool act(Object* obj);
Modified: trunk/src/objects/door.cpp
===================================================================
--- trunk/src/objects/door.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/door.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -6,8 +6,8 @@
#include "door.h"
-Door::Door(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Object(xcord,ycord,parameters) {
+Door::Door(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Object(xcord,ycord,param) {
otype=OTYPE_DENSE;
/* Parameters */
Modified: trunk/src/objects/door.h
===================================================================
--- trunk/src/objects/door.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/door.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -5,7 +5,7 @@
*/
class Door : public Object {
public:
- Door(Sint16 xcord=0, Sint16 ycord=0, ParameterMap& parameters=ParameterMap());
+ Door(Sint16 xcord=0, Sint16 ycord=0, const ParameterMap& param=ParameterMap());
virtual ~Door();
static ParameterMap default_parameters;
virtual bool act(Object* obj);
Modified: trunk/src/objects/erik.cpp
===================================================================
--- trunk/src/objects/erik.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/erik.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -10,8 +10,8 @@
#include "erik.h"
-Erik::Erik(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Player(xcord,ycord,parameters),
+Erik::Erik(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Player(xcord,ycord,param),
jump(V_JUMP),
jump2(V_JUMP2) {
weapon=Weapon(-1,W_PRESSURE,WS_PRESSURE);
Modified: trunk/src/objects/erik.h
===================================================================
--- trunk/src/objects/erik.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/erik.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -13,7 +13,7 @@
*/
class Erik : public Player {
public:
- Erik(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Erik(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Erik();
static ParameterMap default_parameters;
virtual void idle(Uint16);
Modified: trunk/src/objects/exit.cpp
===================================================================
--- trunk/src/objects/exit.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/exit.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -7,8 +7,8 @@
#include "exit.h"
-Exit::Exit(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Object(xcord,ycord,parameters) {
+Exit::Exit(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Object(xcord,ycord,param) {
/* Parameters */
if (!hasParam(parameters,"image")) anim_orig=loadAnimation(scenario->imgcache->loadImage(1,"exit.bmp"));
}
Modified: trunk/src/objects/exit.h
===================================================================
--- trunk/src/objects/exit.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/exit.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -6,7 +6,7 @@
*/
class Exit : public Object {
public:
- Exit(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Exit(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param =ParameterMap());
virtual ~Exit();
static ParameterMap default_parameters;
virtual bool act(Object* obj);
Modified: trunk/src/objects/fang.cpp
===================================================================
--- trunk/src/objects/fang.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/fang.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -8,8 +8,8 @@
#include "fang.h"
-Fang::Fang(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Player(xcord,ycord,parameters),
+Fang::Fang(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Player(xcord,ycord,param),
jump(V_JUMP) {
weapon=Weapon(-1,W_STRIKE);
Modified: trunk/src/objects/fang.h
===================================================================
--- trunk/src/objects/fang.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/fang.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -22,7 +22,7 @@
*/
class Fang : public Player {
public:
- Fang(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Fang(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Fang();
static ParameterMap default_parameters;
virtual void fall(Uint16);
Modified: trunk/src/objects/geyser.cpp
===================================================================
--- trunk/src/objects/geyser.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/geyser.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -8,8 +8,8 @@
#include "geyser.h"
-Geyser::Geyser(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Object(xcord,ycord,parameters),
+Geyser::Geyser(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Object(xcord,ycord,param),
Deffect(0) {
/* Parameters */
if (hasParam(parameters,"aspeed")) aspeed=atoi(parameters["aspeed"].c_str());
Modified: trunk/src/objects/geyser.h
===================================================================
--- trunk/src/objects/geyser.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/geyser.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -9,7 +9,7 @@
*/
class Geyser : public Object {
public:
- Geyser(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Geyser(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Geyser();
static ParameterMap default_parameters;
virtual void idle(Uint16 dt);
Modified: trunk/src/objects/heart.cpp
===================================================================
--- trunk/src/objects/heart.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/heart.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -8,8 +8,8 @@
#include "heart.h"
-Heart::Heart(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Item(xcord,ycord,parameters) {
+Heart::Heart(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Item(xcord,ycord,param) {
/* Parameters */
if (!hasParam(parameters,"image")) anim_orig=loadAnimation(scenario->imgcache->loadImage(1,"heart.bmp"));
if (hasParam(parameters,"alife")) alife=atoi(parameters["alife"].c_str());
Modified: trunk/src/objects/heart.h
===================================================================
--- trunk/src/objects/heart.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/heart.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -7,7 +7,7 @@
*/
class Heart : public Item {
public:
- Heart(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Heart(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Heart();
static ParameterMap default_parameters;
virtual bool act(Object* obj);
Modified: trunk/src/objects/key.cpp
===================================================================
--- trunk/src/objects/key.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/key.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -9,8 +9,8 @@
#include "key.h"
-Key::Key(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Item(xcord,ycord,parameters) {
+Key::Key(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Item(xcord,ycord,param) {
/* Parameters */
if (!hasParam(parameters,"image")) anim_orig=loadAnimation(scenario->imgcache->loadImage(1,"key.bmp"));
if (hasParam(parameters,"audio_key")) au_key=scenario->sndcache->loadWAV(parameters["audio_key"]);
Modified: trunk/src/objects/key.h
===================================================================
--- trunk/src/objects/key.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/key.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -7,7 +7,7 @@
*/
class Key : public Item {
public:
- Key(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Key(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Key();
static ParameterMap default_parameters;
virtual bool act(Object* obj);
Modified: trunk/src/objects/olaf.cpp
===================================================================
--- trunk/src/objects/olaf.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/olaf.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -9,8 +9,8 @@
#include "olaf.h"
-Olaf::Olaf(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Player(xcord,ycord,parameters),
+Olaf::Olaf(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Player(xcord,ycord,param),
fart(V_FART) {
/* Parameters */
if (hasParam(parameters,"anim_olaf_small_left")) anim_olaf_small_left=loadAnimation(getParameters(parameters["anim_olaf_small_left"],':'));
Modified: trunk/src/objects/olaf.h
===================================================================
--- trunk/src/objects/olaf.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/olaf.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -16,7 +16,7 @@
*/
class Olaf : public Player {
public:
- Olaf(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Olaf(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Olaf();
static ParameterMap default_parameters;
/// Additionally checks if Olaf is small and how he wears his shield
Modified: trunk/src/objects/plant.cpp
===================================================================
--- trunk/src/objects/plant.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/plant.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -7,8 +7,8 @@
#include "scenario.h"
#include "plant.h"
-Plant::Plant(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Monster(xcord,ycord,parameters) {
+Plant::Plant(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Monster(xcord,ycord,param) {
enemy_types|=(OTYPE_PLAYER);
weapon=Weapon(-1,W_TOUCH);
tcur=recover;
Modified: trunk/src/objects/plant.h
===================================================================
--- trunk/src/objects/plant.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/plant.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -5,7 +5,7 @@
*/
class Plant : public Monster {
public:
- Plant(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Plant(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Plant();
static ParameterMap default_parameters;
virtual void touch(Object*);
Modified: trunk/src/objects/scorch.cpp
===================================================================
--- trunk/src/objects/scorch.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/scorch.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -8,8 +8,8 @@
#include "scorch.h"
-Scorch::Scorch(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Player(xcord,ycord,parameters),
+Scorch::Scorch(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Player(xcord,ycord,param),
left_wings(SCORCH_MAX_WINGS),
wing(V_FLY) {
Modified: trunk/src/objects/scorch.h
===================================================================
--- trunk/src/objects/scorch.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/scorch.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -16,7 +16,7 @@
*/
class Scorch : public Player {
public:
- Scorch(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Scorch(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Scorch();
static ParameterMap default_parameters;
virtual void fall(Uint16);
Modified: trunk/src/objects/spike.cpp
===================================================================
--- trunk/src/objects/spike.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/spike.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -7,8 +7,8 @@
#include "scenario.h"
#include "spike.h"
-Spike::Spike(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Object(xcord,ycord,parameters) {
+Spike::Spike(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Object(xcord,ycord,param) {
weapon=Weapon(-10,W_TOUCH,WS_SPIKE);
/* Parameters */
Modified: trunk/src/objects/spike.h
===================================================================
--- trunk/src/objects/spike.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/spike.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -5,7 +5,7 @@
*/
class Spike : public Object {
public:
- Spike(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Spike(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Spike();
static ParameterMap default_parameters;
virtual void touch(Object*);
Modified: trunk/src/objects/teleport.cpp
===================================================================
--- trunk/src/objects/teleport.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/teleport.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -8,8 +8,8 @@
#include "teleport.h"
-Teleporter::Teleporter(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Object(xcord,ycord,parameters) {
+Teleporter::Teleporter(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Object(xcord,ycord,param) {
/* Parameters */
if (hasParam(parameters,"audio_teleport")) au_tele=scenario->sndcache->loadWAV(parameters["audio_teleport"]);
else au_tele=scenario->sndcache->loadWAV("teleprt.wav");
Modified: trunk/src/objects/teleport.h
===================================================================
--- trunk/src/objects/teleport.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/teleport.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -6,7 +6,7 @@
*/
class Teleporter : public Object {
public:
- Teleporter(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Teleporter(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Teleporter();
static ParameterMap default_parameters;
virtual bool act(Object* obj);
Modified: trunk/src/objects/trigger.cpp
===================================================================
--- trunk/src/objects/trigger.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/trigger.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -6,8 +6,8 @@
#include "trigger.h"
-Trigger::Trigger(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Object(xcord,ycord,parameters) {
+Trigger::Trigger(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Object(xcord,ycord,param) {
/* Parameters */
if (!hasParam(parameters,"image")) anim_orig=loadAnimation(scenario->imgcache->loadImage(1,"key.bmp"));
if (hasParam(parameters,"key")) key=parameters["key"];
Modified: trunk/src/objects/trigger.h
===================================================================
--- trunk/src/objects/trigger.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/trigger.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -7,7 +7,7 @@
*/
class Trigger : public Object {
public:
- Trigger(Sint16 xcord=0, Sint16 ycord=0, ParameterMap& parameters=ParameterMap());
+ Trigger(Sint16 xcord=0, Sint16 ycord=0, const ParameterMap& param=ParameterMap());
virtual ~Trigger();
static ParameterMap default_parameters;
virtual bool act(Object* obj);
Modified: trunk/src/objects/triggered_bomb.cpp
===================================================================
--- trunk/src/objects/triggered_bomb.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/triggered_bomb.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -6,8 +6,8 @@
#include "scenario.h"
#include "triggered_bomb.h"
-TriggeredBomb::TriggeredBomb(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Character(xcord,ycord,parameters) {
+TriggeredBomb::TriggeredBomb(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Character(xcord,ycord,param) {
weapon=Weapon(-1,W_EXPLOSION);
enemy_types|=(OTYPE_PLAYER|OTYPE_MONSTER);
Modified: trunk/src/objects/triggered_bomb.h
===================================================================
--- trunk/src/objects/triggered_bomb.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/triggered_bomb.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -5,7 +5,7 @@
*/
class TriggeredBomb : public Character {
public:
- TriggeredBomb(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ TriggeredBomb(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~TriggeredBomb();
static ParameterMap default_parameters;
virtual void idle(Uint16);
Modified: trunk/src/objects/wall.cpp
===================================================================
--- trunk/src/objects/wall.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/wall.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -3,8 +3,8 @@
#include "wall.h"
-Wall::Wall(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Object(xcord,ycord,parameters) {
+Wall::Wall(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Object(xcord,ycord,param) {
otype=OTYPE_DENSE;
}
Wall::~Wall() { }
Modified: trunk/src/objects/wall.h
===================================================================
--- trunk/src/objects/wall.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/wall.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -5,7 +5,7 @@
*/
class Wall : public Object {
public:
- Wall(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Wall(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Wall();
static ParameterMap default_parameters;
};
Modified: trunk/src/objects/water.cpp
===================================================================
--- trunk/src/objects/water.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/water.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -9,8 +9,8 @@
#include "water.h"
-Water::Water(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Object(xcord,ycord,parameters) {
+Water::Water(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Object(xcord,ycord,param) {
weapon=Weapon(-1,W_WATER,WS_WATER);
/* Parameters */
if (hasParam(parameters,"audio_water_land")) au_water=scenario->sndcache->loadWAV(parameters["audio_water_land"]);
Modified: trunk/src/objects/water.h
===================================================================
--- trunk/src/objects/water.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/water.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -6,7 +6,7 @@
*/
class Water : public Object {
public:
- Water(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Water(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Water();
static ParameterMap default_parameters;
virtual void enter(Object* obj);
Modified: trunk/src/objects/wind.cpp
===================================================================
--- trunk/src/objects/wind.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/wind.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -4,8 +4,8 @@
#include "characters_common.h"
#include "wind.h"
-Wind::Wind(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Object(xcord,ycord,parameters) {
+Wind::Wind(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Object(xcord,ycord,param) {
/* Parameters */
if (hasParam(parameters,"accel")) gravitymod=atoi(parameters["accel"].c_str());
else gravitymod=0;
Modified: trunk/src/objects/wind.h
===================================================================
--- trunk/src/objects/wind.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/wind.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -6,7 +6,7 @@
*/
class Wind : public Object {
public:
- Wind(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Wind(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Wind();
static ParameterMap default_parameters;
virtual void enter(Object* obj);
Modified: trunk/src/objects/zombie.cpp
===================================================================
--- trunk/src/objects/zombie.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/zombie.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -10,8 +10,8 @@
#include "zombie.h"
-Zombie::Zombie(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Monster(xcord,ycord,parameters),
+Zombie::Zombie(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Monster(xcord,ycord,param),
T_Attack_Bite(1500) {
weapon=Weapon(-1,W_STRIKE);
Modified: trunk/src/objects/zombie.h
===================================================================
--- trunk/src/objects/zombie.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects/zombie.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -8,7 +8,7 @@
*/
class Zombie : public Monster {
public:
- Zombie(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Zombie(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Zombie();
static ParameterMap default_parameters;
virtual void idle(Uint16);
Modified: trunk/src/objects_common.cpp
===================================================================
--- trunk/src/objects_common.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects_common.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -7,7 +7,8 @@
#include "scenario.h"
-Object::Object(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
+Object::Object(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ parameters(param),
state(NOTHING),
event(NULL),
otype(OTYPE_COMMON),
@@ -318,15 +319,15 @@
}
-Item::Item(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Object(xcord,ycord,parameters), owner(NULL) {
+Item::Item(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Object(xcord,ycord,param), owner(NULL) {
otype|=OTYPE_ITEM;
}
Item::~Item() { }
-Background::Background(ParameterMap& parameters):
- Object(0,0,parameters) {
+Background::Background(const ParameterMap& param):
+ Object(0,0,param) {
otype=NOTHING;
name="Background";
Modified: trunk/src/objects_common.h
===================================================================
--- trunk/src/objects_common.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/objects_common.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -37,7 +37,7 @@
*/
class Object {
public:
- Object(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Object(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Object();
static ParameterMap default_parameters;
/// Sets the new position. If the coordinates are not in the map area
@@ -123,7 +123,7 @@
Uint16 astart_pos=0,
AllignType aallign_type=AT_MD);
/// Load an animation based on a parameter map
- EmptyAnimationPtr loadAnimation(const ParameterMap& parameters=ParameterMap());
+ EmptyAnimationPtr loadAnimation(const ParameterMap& param=ParameterMap());
//Events (triggered animations/effects)
//@{
/// Clears the event field (sets it to NULL). This should only be used by
@@ -181,6 +181,7 @@
bool operator<(const Object& obj) const;
Uint32 onum;
protected:
+ ParameterMap parameters;
Uint32 state;
Event* event;
///\todo Document this!
@@ -203,7 +204,7 @@
*/
class Item : public Object {
public:
- Item(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Item(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Item();
static ParameterMap default_parameters;
virtual bool act(Object*) { return false; }
@@ -220,7 +221,7 @@
*/
class Background : public Object {
public:
- Background(ParameterMap& parameters=ParameterMap());
+ Background(const ParameterMap& param=ParameterMap());
virtual ~Background();
static ParameterMap default_parameters;
};
Modified: trunk/src/players_common.cpp
===================================================================
--- trunk/src/players_common.cpp 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/players_common.cpp 2006-02-04 21:45:27 UTC (rev 177)
@@ -13,8 +13,8 @@
#include "players_common.h"
-Player::Player(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Character(xcord,ycord,parameters),
+Player::Player(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Character(xcord,ycord,param),
currentitem(0) {
for (Uint8 i=0; i<MAX_ITEMS; i++) {
items[i]=NULL;
@@ -443,7 +443,7 @@
return newhealth;
}
-DeadPlayer::DeadPlayer(Sint16 xcord, Sint16 ycord, ParameterMap& parameters):
- Character(xcord,ycord,parameters) {
+DeadPlayer::DeadPlayer(Sint16 xcord, Sint16 ycord, const ParameterMap& param):
+ Character(xcord,ycord,param) {
}
DeadPlayer::~DeadPlayer() { }
Modified: trunk/src/players_common.h
===================================================================
--- trunk/src/players_common.h 2005-09-14 17:38:52 UTC (rev 176)
+++ trunk/src/players_common.h 2006-02-04 21:45:27 UTC (rev 177)
@@ -17,7 +17,7 @@
*/
class Player : public Character {
public:
- Player(Sint16 xpos=0, Sint16 ypos=0, ParameterMap& parameters=ParameterMap());
+ Player(Sint16 xpos=0, Sint16 ypos=0, const ParameterMap& param=ParameterMap());
virtual ~Player();
static ParameterMap default_parameters;
//@{
@@ -175,7 +175,7 @@
*/
class DeadPlayer : public Character {
public:
- DeadPlayer(Sint16 xcord=0, Sint16 ycord=0, ParameterMap& parameters=ParameterMap());
+ DeadPlayer(Sint16 xcord=0, Sint16 ycord=0, const ParameterMap& param=ParameterMap());
virtual ~DeadPlayer();
static ParameterMap default_parameters;
};
More information about the lostpenguins-commits
mailing list