Commit 5262e7f9 authored by Tom Barbalet's avatar Tom Barbalet

Update for WIndows

parent b6a18266
Pipeline #121769258 failed with stages
in 1 minute and 1 second
......@@ -172,7 +172,7 @@ typedef enum
} AFFECT_TYPE;
enum inventory_type
typedef enum
{
INVENTORY_CHILD = 1,
INVENTORY_WOUND = 2,
......@@ -189,13 +189,13 @@ enum inventory_type
INVENTORY_FISH = 4096,
INVENTORY_BIRD_EGGS = 8192,
INVENTORY_LIZARD_EGGS = 16384
};
}inventory_type;
/* energy values for different foods */
/* TODO: add EGGS and potentially INSECTS to food groups */
enum FOOD_KINDS
typedef enum
{
FOOD_VEGETABLE = 0,
FOOD_FRUIT,
......@@ -204,11 +204,11 @@ enum FOOD_KINDS
FOOD_BIRD_EGGS,
FOOD_LIZARD_EGGS,
FOOD_TYPES
};
}FOOD_KINDS;
/* maximum energy obtainable from different types of food */
enum energy_types
typedef enum
{
ENERGY_GRASS = 50,
ENERGY_BUSH = 100,
......@@ -219,7 +219,7 @@ enum energy_types
ENERGY_FISH = 600,
ENERGY_BIRD_EGGS = 800,
ENERGY_LIZARD_EGGS = 1000
};
}energy_types;
/* gestation period in days */
#define GESTATION_DAYS 1
......
......@@ -159,15 +159,15 @@ static const n_ae_error apescript_errors[]=
#define IO_LOWER_CHAR(value) if(ASCII_UPPERCASE(value)) (value) += 'a' - 'A'
enum PRIMARY_APESCRIPT
typedef enum
{
VARIABLE_FUNCTION = 0,
VARIABLE_RUN,
VARIABLE_WHILE,
VARIABLE_IF
};
}PRIMARY_APESCRIPT;
enum SYNTAX_APESCRIPT
typedef enum
{
SYNTAX_MINUS = 0,
SYNTAX_ADDITION,
......@@ -193,17 +193,17 @@ enum SYNTAX_APESCRIPT
SYNTAX_GREATER_EQUAL,
SYNTAX_EQUALS
};
}SYNTAX_APESCRIPT;
enum SYNTAX_ADDITIONAL_BRAINCODE
typedef enum
{
SYNTAX_MOVE = SYNTAX_EQUALS + 1,
SYNTAX_JUMP_TO,
SYNTAX_JUMP_EQUAL_ZERO,
SYNTAX_DATA
};
}SYNTAX_ADDITIONAL_BRAINCODE;
enum APESCRIPT_INTERPRET_TYPES
typedef enum
{
APESCRIPT_OPEN_BRACKET = ('('),
APESCRIPT_CLOSE_BRACKET = (')'),
......@@ -217,7 +217,7 @@ enum APESCRIPT_INTERPRET_TYPES
APESCRIPT_FUNCTION = ('f'),
APESCRIPT_RUN = ('r'),
APESCRIPT_STRING = ('"')
};
}APESCRIPT_INTERPRET_TYPES;
#define ASCII_QUOTE(num) ((num) == '"')
......
......@@ -32,6 +32,9 @@
this software.
****************************************************************/
#include "../toolkit/toolkit.h"
#include "../script/script.h"
#include "../sim/sim.h"
#ifndef SIMULATEDAPE_UNIVERSE_H
#define SIMULATEDAPE_UNIVERSE_H
......@@ -98,7 +101,7 @@ static const n_byte operators[17][7] =
#define AGE_OF_MATURITY (30)
/*4*/
enum SECONDARY_APESCRIPT
typedef enum
{
VARIABLE_VECT_X = (VARIABLE_IF + 1),
VARIABLE_VECT_Y,
......@@ -244,9 +247,9 @@ enum SECONDARY_APESCRIPT
VARIABLE_MEMORY_AFFECT,
VARIABLE_BEING /* This is a special case, it is the location where the main code starts */
};
}SECONDARY_APESCRIPT;
enum BODY_INVENTORY_TYPES
typedef enum
{
BODY_HEAD = 0,
......@@ -260,9 +263,9 @@ enum BODY_INVENTORY_TYPES
BODY_RIGHT_FOOT,
INVENTORY_SIZE
};
}BODY_INVENTORY_TYPES;
enum
typedef enum
{
RELATIONSHIP_SELF = 1,
RELATIONSHIP_MOTHER,
......@@ -294,7 +297,7 @@ enum
RELATIONSHIPS
};
enum PREFERENCES_MATE
typedef enum
{
PREFERENCE_MATE_HEIGHT_MALE = 0,
PREFERENCE_MATE_HEIGHT_FEMALE,
......@@ -311,9 +314,9 @@ enum PREFERENCES_MATE
PREFERENCE_CHAT,
PREFERENCE_SOCIAL,
PREFERENCES
};
}PREFERENCES_MATE;
enum attention_type
typedef enum
{
ATTENTION_EXTERNAL = 0,
ATTENTION_ACTOR,
......@@ -322,9 +325,9 @@ enum attention_type
ATTENTION_RELATIONSHIP,
ATTENTION_TERRITORY,
ATTENTION_SIZE
};
}attention_type;
enum
typedef enum
{
INTERVAL_MINS = 0,
INTERVAL_HOURS,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment