|
Line
Link Here
|
| 0 |
-- sauerbraten/src/engine/engine.h |
0 |
++ sauerbraten/src/engine/engine.h |
|
Lines 2-7
Link Here
|
| 2 |
#include "iengine.h" |
2 |
#include "iengine.h" |
| 3 |
#include "igame.h" |
3 |
#include "igame.h" |
| 4 |
|
4 |
|
|
|
5 |
#ifndef STANDALONE |
| 5 |
#include "world.h" |
6 |
#include "world.h" |
| 6 |
#include "octa.h" |
7 |
#include "octa.h" |
| 7 |
#include "lightmap.h" |
8 |
#include "lightmap.h" |
|
Lines 61-66
Link Here
|
| 61 |
extern const ushort fv[6][4]; |
62 |
extern const ushort fv[6][4]; |
| 62 |
extern const uchar faceedgesidx[6][4]; |
63 |
extern const uchar faceedgesidx[6][4]; |
| 63 |
extern bool inbetweenframes; |
64 |
extern bool inbetweenframes; |
|
|
65 |
#endif |
| 64 |
|
66 |
|
| 65 |
extern int curtime; // current frame time |
67 |
extern int curtime; // current frame time |
| 66 |
extern int lastmillis; // last time |
68 |
extern int lastmillis; // last time |
|
Lines 73-78
Link Here
|
| 73 |
extern icliententities *et; |
75 |
extern icliententities *et; |
| 74 |
|
76 |
|
| 75 |
extern vector<int> entgroup; |
77 |
extern vector<int> entgroup; |
|
|
78 |
#ifndef STANDALONE |
| 76 |
|
79 |
|
| 77 |
// texture |
80 |
// texture |
| 78 |
|
81 |
|
|
Lines 215-220
Link Here
|
| 215 |
extern void queryreflections(); |
218 |
extern void queryreflections(); |
| 216 |
extern void drawreflections(); |
219 |
extern void drawreflections(); |
| 217 |
extern void renderwater(); |
220 |
extern void renderwater(); |
|
|
221 |
#endif |
| 218 |
|
222 |
|
| 219 |
// server |
223 |
// server |
| 220 |
extern void initserver(bool dedicated); |
224 |
extern void initserver(bool dedicated); |
|
Lines 226-231
Link Here
|
| 226 |
extern void localconnect(); |
230 |
extern void localconnect(); |
| 227 |
extern bool serveroption(char *opt); |
231 |
extern bool serveroption(char *opt); |
| 228 |
|
232 |
|
|
|
233 |
#ifndef STANDALONE |
| 229 |
// serverbrowser |
234 |
// serverbrowser |
| 230 |
extern bool resolverwait(const char *name, ENetAddress *address); |
235 |
extern bool resolverwait(const char *name, ENetAddress *address); |
| 231 |
extern void addserver(char *servername); |
236 |
extern void addserver(char *servername); |
|
Lines 320-323
Link Here
|
| 320 |
|
325 |
|
| 321 |
// grass |
326 |
// grass |
| 322 |
extern void rendergrass(); |
327 |
extern void rendergrass(); |
|
|
328 |
#endif |
| 323 |
|
329 |
|
| 324 |
-- sauerbraten/src/shared/pch.h |
330 |
++ sauerbraten/src/shared/pch.h |
|
Lines 28-33
Link Here
|
| 28 |
#endif |
28 |
#endif |
| 29 |
|
29 |
|
| 30 |
#include <SDL.h> |
30 |
#include <SDL.h> |
|
|
31 |
#ifndef STANDALONE |
| 31 |
#include <SDL_image.h> |
32 |
#include <SDL_image.h> |
| 32 |
|
33 |
|
| 33 |
#define GL_GLEXT_LEGACY |
34 |
#define GL_GLEXT_LEGACY |
|
Lines 36-41
Link Here
|
| 36 |
#include <SDL_opengl.h> |
37 |
#include <SDL_opengl.h> |
| 37 |
#undef __glext_h__ |
38 |
#undef __glext_h__ |
| 38 |
#include "GL/glext.h" |
39 |
#include "GL/glext.h" |
|
|
40 |
#endif |
| 39 |
|
41 |
|
| 40 |
#include <enet/enet.h> |
42 |
#include <enet/enet.h> |
| 41 |
|
43 |
|
| 42 |
-- sauerbraten/src/Makefile |
44 |
++ sauerbraten/src/Makefile |
|
Lines 45-51
Link Here
|
| 45 |
|
45 |
|
| 46 |
SERVER_LIBS=-Lenet -lenet |
46 |
SERVER_LIBS=-Lenet -lenet |
| 47 |
SERVER_OBJS= \ |
47 |
SERVER_OBJS= \ |
| 48 |
shared/tools.o \ |
48 |
shared/tools-standalone.o \ |
| 49 |
engine/server-standalone.o \ |
49 |
engine/server-standalone.o \ |
| 50 |
fpsgame/fps-standalone.o |
50 |
fpsgame/fps-standalone.o |
| 51 |
|
51 |
|
|
Lines 62-67
Link Here
|
| 62 |
clean: enet/Makefile |
62 |
clean: enet/Makefile |
| 63 |
-$(RM) $(SERVER_OBJS) $(CLIENT_OBJS) sauer_server sauer_client |
63 |
-$(RM) $(SERVER_OBJS) $(CLIENT_OBJS) sauer_server sauer_client |
| 64 |
$(MAKE) -C enet/ clean |
64 |
$(MAKE) -C enet/ clean |
|
|
65 |
|
| 66 |
shared/tools-standalone.o: |
| 67 |
$(CXX) $(CXXFLAGS) -DSTANDALONE -c -o shared/tools-standalone.o shared/tools.cpp |
| 65 |
|
68 |
|
| 66 |
engine/server-standalone.o: |
69 |
engine/server-standalone.o: |
| 67 |
$(CXX) $(CXXFLAGS) -DSTANDALONE -c -o engine/server-standalone.o engine/server.cpp |
70 |
$(CXX) $(CXXFLAGS) -DSTANDALONE -c -o engine/server-standalone.o engine/server.cpp |
