|
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 199-204
Link Here
|
| 199 |
extern const uchar faceedgesidx[6][4]; |
200 |
extern const uchar faceedgesidx[6][4]; |
| 200 |
extern Texture *crosshair; |
201 |
extern Texture *crosshair; |
| 201 |
extern bool inbetweenframes; |
202 |
extern bool inbetweenframes; |
|
|
203 |
#endif |
| 202 |
|
204 |
|
| 203 |
extern int curtime; // current frame time |
205 |
extern int curtime; // current frame time |
| 204 |
extern int lastmillis; // last time |
206 |
extern int lastmillis; // last time |
|
Lines 210-215
Link Here
|
| 210 |
|
212 |
|
| 211 |
extern vector<int> entgroup; |
213 |
extern vector<int> entgroup; |
| 212 |
|
214 |
|
|
|
215 |
#ifndef STANDALONE |
| 213 |
// rendergl |
216 |
// rendergl |
| 214 |
extern bool hasVBO, hasOQ, hasFBO, hasCM, hasTC; |
217 |
extern bool hasVBO, hasOQ, hasFBO, hasCM, hasTC; |
| 215 |
|
218 |
|
|
Lines 341-346
Link Here
|
| 341 |
extern void drawreflections(); |
344 |
extern void drawreflections(); |
| 342 |
extern void renderwater(); |
345 |
extern void renderwater(); |
| 343 |
extern void rendermaterials(float zclip = 0, bool refract = false); |
346 |
extern void rendermaterials(float zclip = 0, bool refract = false); |
|
|
347 |
#endif |
| 344 |
|
348 |
|
| 345 |
// server |
349 |
// server |
| 346 |
|
350 |
|
|
Lines 353-358
Link Here
|
| 353 |
extern void localconnect(); |
357 |
extern void localconnect(); |
| 354 |
extern bool serveroption(char *opt); |
358 |
extern bool serveroption(char *opt); |
| 355 |
|
359 |
|
|
|
360 |
#ifndef STANDALONE |
| 356 |
// serverbrowser |
361 |
// serverbrowser |
| 357 |
extern bool resolverwait(const char *name, ENetAddress *address); |
362 |
extern bool resolverwait(const char *name, ENetAddress *address); |
| 358 |
extern void addserver(char *servername); |
363 |
extern void addserver(char *servername); |
|
Lines 429-431
Link Here
|
| 429 |
extern bool g3d_windowhit(bool on, bool act); |
434 |
extern bool g3d_windowhit(bool on, bool act); |
| 430 |
|
435 |
|
| 431 |
extern void g3d_mainmenu(); |
436 |
extern void g3d_mainmenu(); |
| 432 |
-- sauerbraten/src/shared/pch.h |
437 |
#endif |
|
|
438 |
++ 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 40-46
Link Here
|
| 40 |
|
40 |
|
| 41 |
SERVER_LIBS=-Lenet -lenet |
41 |
SERVER_LIBS=-Lenet -lenet |
| 42 |
SERVER_OBJS= \ |
42 |
SERVER_OBJS= \ |
| 43 |
shared/tools.o \ |
43 |
shared/tools-standalone.o \ |
| 44 |
engine/server-standalone.o \ |
44 |
engine/server-standalone.o \ |
| 45 |
fpsgame/fps-standalone.o |
45 |
fpsgame/fps-standalone.o |
| 46 |
|
46 |
|
|
Lines 57-62
Link Here
|
| 57 |
clean: enet/Makefile |
57 |
clean: enet/Makefile |
| 58 |
-$(RM) $(SERVER_OBJS) $(CLIENT_OBJS) sauer_server sauer_client |
58 |
-$(RM) $(SERVER_OBJS) $(CLIENT_OBJS) sauer_server sauer_client |
| 59 |
$(MAKE) -C enet/ clean |
59 |
$(MAKE) -C enet/ clean |
|
|
60 |
|
| 61 |
shared/tools-standalone.o: |
| 62 |
$(CXX) $(CXXFLAGS) -DSTANDALONE -c -o shared/tools-standalone.o shared/tools.cpp |
| 60 |
|
63 |
|
| 61 |
engine/server-standalone.o: |
64 |
engine/server-standalone.o: |
| 62 |
$(CXX) $(CXXFLAGS) -DSTANDALONE -c -o engine/server-standalone.o engine/server.cpp |
65 |
$(CXX) $(CXXFLAGS) -DSTANDALONE -c -o engine/server-standalone.o engine/server.cpp |
