Cube  Diff

Differences From Artifact [9e15fb9815]:

To Artifact [40ed8384d1]:


1
2
3
4
5
6
7
8
9
10

11
12
13
14
15
16
17
18
19
// one big bad include file for the whole engine... nasty!

#import <ObjFW/ObjFW.h>

#include <SDL2/SDL.h>

#include "tools.h"

#define _MAXDEFSTR 260


@class Entity;
@class DynamicEntity;

@interface Cube: OFObject <OFApplicationDelegate>
@property (class, readonly, nonatomic) Cube *sharedInstance;
@property (readonly, nonatomic) SDL_Window *window;
@property (readonly, nonatomic) OFIRI *gameDataIRI, *userDataIRI;
@property (nonatomic) bool repeatsKeys;
@property (nonatomic) int framesInMap;










>

|







1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
// one big bad include file for the whole engine... nasty!

#import <ObjFW/ObjFW.h>

#include <SDL2/SDL.h>

#include "tools.h"

#define _MAXDEFSTR 260

@class DynamicEntity;
@class Entity;
@class Player;

@interface Cube: OFObject <OFApplicationDelegate>
@property (class, readonly, nonatomic) Cube *sharedInstance;
@property (readonly, nonatomic) SDL_Window *window;
@property (readonly, nonatomic) OFIRI *gameDataIRI, *userDataIRI;
@property (nonatomic) bool repeatsKeys;
@property (nonatomic) int framesInMap;
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
extern "C" {
#endif
// map data, the mips are sequential 2D arrays in memory
extern struct sqr *world, *wmip[];
extern struct header hdr;      // current map header
extern int sfactor, ssize;     // ssize = 2^sfactor
extern int cubicsize, mipsize; // cubicsize = ssize^2
// special client ent that receives input and acts as camera
extern DynamicEntity *player1;
// all the other clients (in multiplayer)
extern OFMutableArray *players;
extern bool editmode;
extern OFMutableArray<Entity *> *ents; // map entities
extern OFVector3D worldpos; // current target of the crosshair in the world
extern int lastmillis;      // last time
extern int curtime;         // current frame time







<
<







253
254
255
256
257
258
259


260
261
262
263
264
265
266
extern "C" {
#endif
// map data, the mips are sequential 2D arrays in memory
extern struct sqr *world, *wmip[];
extern struct header hdr;      // current map header
extern int sfactor, ssize;     // ssize = 2^sfactor
extern int cubicsize, mipsize; // cubicsize = ssize^2


// all the other clients (in multiplayer)
extern OFMutableArray *players;
extern bool editmode;
extern OFMutableArray<Entity *> *ents; // map entities
extern OFVector3D worldpos; // current target of the crosshair in the world
extern int lastmillis;      // last time
extern int curtime;         // current frame time