From b8b3e92e8a55efbc626ac7e8f1588fd0aefd13fe Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Sun, 4 May 2008 12:26:44 +0000 Subject: [PATCH] constructor ordering fix git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1862 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/entity.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/src/entity.h b/source/src/entity.h index e50ffa1c..ed0f19ee 100644 --- a/source/src/entity.h +++ b/source/src/entity.h @@ -21,16 +21,16 @@ struct persistent_entity // map entity short attr1; uchar type; // type is one of the above uchar attr2, attr3, attr4; - persistent_entity(short x, short y, short z, uchar type, short attr1, uchar attr2, uchar attr3, uchar attr4) : x(x), y(y), z(z), type(type), attr1(attr1), attr2(attr2), attr3(attr3), attr4(attr4) {}; - persistent_entity(){}; + persistent_entity(short x, short y, short z, uchar type, short attr1, uchar attr2, uchar attr3, uchar attr4) : x(x), y(y), z(z), attr1(attr1), type(type), attr2(attr2), attr3(attr3), attr4(attr4) {} + persistent_entity() {} }; struct entity : public persistent_entity { bool spawned; //the only dynamic state of a map entity bool soundinuse; - entity(short x, short y, short z, uchar type, short attr1, uchar attr2, uchar attr3, uchar attr4) : persistent_entity(x, y, z, type, attr1, attr2, attr3, attr4), spawned(false), soundinuse(false) {}; - entity(){}; + entity(short x, short y, short z, uchar type, short attr1, uchar attr2, uchar attr3, uchar attr4) : persistent_entity(x, y, z, type, attr1, attr2, attr3, attr4), spawned(false), soundinuse(false) {} + entity() {} }; struct itemstat { int add, start, max, sound; };