Commit c660ca88 authored by Tom Barbalet's avatar Tom Barbalet

Update simulated ape

parent 9056a989
Pipeline #118368912 passed with stages
in 53 minutes and 20 seconds
Subproject commit 0699b87d1199b518f4af0a2af0d96b4411873a62
Subproject commit c6d78a85871430a9af833760c90d3835003f5623
Subproject commit 29cd1e98039ebb0de104b2692f378db4a91372ef
Subproject commit 7f33131e1b8865df021e2ce0df7a2c1f66c2cef1
......@@ -36,12 +36,14 @@
#ifndef _WIN32
#include "../apetoolkit/toolkit.h"
#include "../apetoolkit/shared.h"
#include "../script/script.h"
#include "../sim/sim.h"
#else
#include "..\toolkit\toolkit.h"
#include "..\apetoolkit\toolkit.h"
#include "..\apetoolkit\shared.h"
#include "..\script\script.h"
#include "..\sim\sim.h"
......
......@@ -87,23 +87,6 @@
#define IS_WINDOW_KIND(x,y) (((x)>>(y))&1)
enum
{
NA_MENU_PAUSE = 0,
NA_MENU_WEATHER,
NA_MENU_BRAIN,
NA_MENU_BRAINCODE,
NA_MENU_TIDEDAYLIGHT,
NA_MENU_TERRITORY,
NA_MENU_PREVIOUS_APE,
NA_MENU_NEXT_APE,
NA_MENU_CLEAR_ERRORS,
NA_MENU_FLOOD,
NA_MENU_HEALTHY_CARRIER,
NA_MENU_FOLLOW,
NA_MENU_SOCIAL_WEB
};
#define spot_color(alpha,spx,spy,col) alpha[((spx)|((spy)<<8))]=(col)
/* Graphics Metrics */
......
......@@ -37,12 +37,14 @@
#ifndef _WIN32
#include "../apetoolkit/toolkit.h"
#include "../apetoolkit/shared.h"
#include "../script/script.h"
#include "../sim/sim.h"
#else
#include "..\toolkit\toolkit.h"
#include "..\apetoolkit\toolkit.h"
#include "..\apetoolkit\shared.h"
#include "..\script\script.h"
#include "..\sim\sim.h"
......
......@@ -101,12 +101,6 @@ typedef enum
ET_FIERCE_BIRD_OF_PREY,
}entity_type;
#define NUM_VIEW (0)
#define NUM_TERRAIN (1)
#define NUM_CONTROL (2)
#define WINDOW_PROCESSING NUM_TERRAIN
#define DRAW_WINDOW_VIEW (1)
......@@ -199,16 +193,6 @@ typedef enum
WEATHER_SEVEN_DAWN_DUSK = 6
} weather_values;
enum window_information
{
TERRAIN_WINDOW_WIDTH = (4096),
TERRAIN_WINDOW_HEIGHT = (3072),
TERRAIN_WINDOW_AREA = (TERRAIN_WINDOW_WIDTH * TERRAIN_WINDOW_HEIGHT),
CONTROL_WINDOW_WIDTH = (2048),
CONTROL_WINDOW_HEIGHT = (2048),
CONTROL_WINDOW_AREA = (CONTROL_WINDOW_WIDTH * CONTROL_WINDOW_HEIGHT)
};
typedef enum
{
KIND_PRE_STARTUP = -2,
......
......@@ -39,6 +39,7 @@
#ifndef _WIN32
#include "../apetoolkit/toolkit.h"
#include "../apetoolkit/shared.h"
#include "../toolkit2/toolkit2.h"
#include "../script/script.h"
#include "../sim/sim.h"
......@@ -47,7 +48,8 @@
#else
#include "..\toolkit\toolkit.h"
#include "..\apetoolkit\toolkit.h"
#include "..\apetoolkit\shared.h"
#include "..\toolkit2\toolkit2.h"
#include "..\script\script.h"
#include "..\sim\sim.h"
......
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