[freespace2] FS1 patch released
Bradley Bell
btb at icculus.org
Wed Feb 5 15:36:59 EST 2003
actually, it appears there are lots of these in there:
bbell at pokey:~/src/descent/patches$ zgrep '#if !defined(FS2_DEMO) ||
!defined(FS1_DEMO)' fs1-final.patch.gz
+#if !defined(FS2_DEMO) || !defined(FS1_DEMO)
+#if !defined(FS2_DEMO) || !defined(FS1_DEMO)
+ #if !defined(FS2_DEMO) || !defined(FS1_DEMO)
+ #if !defined(FS2_DEMO) || !defined(FS1_DEMO)
+ #if !defined(FS2_DEMO) || !defined(FS1_DEMO)
+ #if !defined(FS2_DEMO) || !defined(FS1_DEMO)
+ #if !defined(FS2_DEMO) || !defined(FS1_DEMO)
+#if !defined(FS2_DEMO) || !defined(FS1_DEMO)
+#if !defined(FS2_DEMO) || !defined(FS1_DEMO)
+#if !defined(FS2_DEMO) || !defined(FS1_DEMO)
+#if !defined(FS2_DEMO) || !defined(FS1_DEMO)
+#if !defined(FS2_DEMO) || !defined(FS1_DEMO)
also, indenting preprocessor directives is evil!!!
-brad
Quoting Bradley Bell <btb at icculus.org>:
> a little correction to fs1-final.patch.gz: if you use || here, this test
> will
> always be true unless you are building for both FS1_DEMO and FS2_DEMO, which
> I
> don't think is possible...
>
> Also, when can we get the fs1 stuff into cvs? It works great!
>
> -brad
>
> --- src/asteroid/asteroid.cpp.orig 2003-02-05 12:26:17.000000000 -0800
> +++ src/asteroid/asteroid.cpp 2003-02-05 12:26:24.000000000 -0800
> @@ -285,7 +285,7 @@
> #include "localize.h"
> #include "multi.h"
>
> -#if !defined(FS2_DEMO) || !defined(FS1_DEMO)
> +#if !defined(FS2_DEMO) && !defined(FS1_DEMO)
>
> #define ASTEROID_OBJ_USED (1<<0) // flag used in asteroid_obj struct
> #define MAX_ASTEROID_OBJS MAX_ASTEROIDS // max number of asteroids
> tracked
> in asteroid list
>
>
>
More information about the freespace2
mailing list