Skip to content

Commit

Permalink
Minor typedef changes and GPL license added.
Browse files Browse the repository at this point in the history
  • Loading branch information
brennana committed Sep 16, 2012
1 parent 22bd106 commit d077212
Show file tree
Hide file tree
Showing 6 changed files with 712 additions and 21 deletions.
34 changes: 24 additions & 10 deletions GameContainer/PBaseEntity.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@
//
//
// @ Project : PorkParser
// @ File Name : PBaseEntity.h
// @ Date : 9/16/2011
// @ Author : Andy Brennan
//
//
/***********************************************************************
PorkScript Game Engine (C) 2012 Andy J. Brennan
PBaseEntity.h -- Header file that defines the PBaseEntity class. This is
the base for types such as items and maps.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
PorkScript on GitHub: https://github.com/valdez42/porkscript/
*************************************************************************/

#if !defined(_PBASEENTITY_H)
#define _PBASEENTITY_H
Expand All @@ -29,6 +42,7 @@ namespace GameContainer
{
typedef std::pair<string, string> PropQualifier; // ReqFile.prop qualifier name for properties
typedef std::pair<GlobalTypeEnum, string> PropValue;
typedef std::map<PropValue, PropValue> DynPropValues;

class PBaseEntity
{
Expand Down Expand Up @@ -60,7 +74,7 @@ namespace GameContainer

// Overall Property Funcs
void SetPropList(map<PropQualifier, PropValue> list) { propList = list; }
void SetDynVersions(map<PropQualifier, map<PropValue,PropValue>> dyns) { dynVersions = dyns; }
void SetDynVersions(map<PropQualifier, DynPropValues> dyns) { dynVersions = dyns; }

private:
// Private methods/members for boost::serialization
Expand All @@ -83,7 +97,7 @@ namespace GameContainer

// Custom properties container
map<PropQualifier, PropValue> propList;
map<PropQualifier, map<PropValue,PropValue>> dynVersions;
map<PropQualifier, DynPropValues> dynVersions;
};
}

Expand Down
Loading

0 comments on commit d077212

Please sign in to comment.