ObjectTypes.h

There are two copies of this file in the engine. one in the console directory and game directory. Both of them are in the VC++ project and are both being #included.

These files are using them:

D:\TORQUE\ENGINE\editor\missionAreaEditor.cc(14):#include "console/objectTypes.h"

D:\TORQUE\ENGINE\game\main.cc(61):#include "game/objectTypes.h"

D:\TORQUE\ENGINE\game\fx\particleEmitter.cc(12):#include "console/objectTypes.h"

D:\TORQUE\ENGINE\gui\guiControl.cc(17):#include "console/objectTypes.h"

D:\TORQUE\ENGINE\sim\sceneObject.h(27):#include "game/objectTypes.h"

D:\TORQUE\ENGINE\terrain\sun.cc(9):#include "console/objectTypes.h"


Both files #define the same _OBJECTTYPES_H_, and both check for the definition before doing anything. So only one of them is being used. When I checked from player.cc, the one in the game directory seems to be the one being used.

So should the other one be removed? They have different contents. The game directory one has everything defined in an enum and has 27 object types, while the other one has everything #defined and has 30 object types. The latter also has more things in the DAMAGABLE_MASK.