From: Holger Schemel <info@artsoft.org>
Date: Mon, 15 Aug 2005 21:43:12 +0000 (+0200)
Subject: rnd-20050815-1-src
X-Git-Tag: 3.1.1^2~1
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=ceb7ded99fc9cc9519adeea07808a344678c196e;p=rocksndiamonds.git

rnd-20050815-1-src
---

diff --git a/Makefile b/Makefile
index 538c451c..bf09646d 100644
--- a/Makefile
+++ b/Makefile
@@ -76,6 +76,9 @@ solaris-sdl:
 mac:
 	@$(MAKE_CMD) PLATFORM=macosx
 
+mac-static:
+	@$(MAKE_CMD) PLATFORM=macosx TARGET=sdl-static
+
 msdos:
 	@$(MAKE_CMD) PLATFORM=msdos
 
@@ -169,11 +172,13 @@ dist-build-all:
 	$(MAKE) clean
 	$(MAKE) dist-build-unix		; $(MAKE) dist-clean
 	$(MAKE) dist-build-win32	; $(MAKE) dist-clean
-	$(MAKE) dist-build-msdos	; $(MAKE) dist-clean
+#	$(MAKE) dist-build-msdos	; $(MAKE) dist-clean
 
-dist-all: dist-build-all dist-unix dist-msdos dist-win32 dist-macosx
+# dist-all: dist-build-all dist-unix dist-msdos dist-win32 dist-macosx
+dist-all: dist-build-all dist-unix dist-win32 dist-macosx
 
-upload-all: upload-unix upload-msdos upload-win32 upload-macosx
+# upload-all: upload-unix upload-msdos upload-win32 upload-macosx
+upload-all: upload-unix upload-win32 upload-macosx
 
 tags:
 	$(MAKE_CMD) tags
diff --git a/src/Makefile b/src/Makefile
index 286a5c9a..4cd0223f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -95,6 +95,12 @@ SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
 SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs)
 endif
 
+ifeq ($(TARGET),sdl-static)
+SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
+endif
+
 ifeq ($(TARGET),allegro)
 SYS_CFLAGS = -DTARGET_ALLEGRO -I$(CROSS_PATH_MSDOS)/include
 SYS_LDFLAGS = -lalleg
diff --git a/src/conftime.h b/src/conftime.h
index b96b8ac5..d497fb8f 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2005-08-07 01:52]"
+#define COMPILE_DATE_STRING "[2005-08-15 23:05]"
diff --git a/src/game_em/init.c b/src/game_em/init.c
index c22c551d..54759eef 100644
--- a/src/game_em/init.c
+++ b/src/game_em/init.c
@@ -379,13 +379,13 @@ unsigned int InitEngineRND_EM(long seed)
     int simple_rnd = SimpleRND(1000);
     int i;
 
-    for (i = 0; i < simple_rnd || Random == NEW_RANDOMIZE; i++)
-      Random = Random * 129 + 1;
+    for (i = 0; i < simple_rnd || RandomEM == NEW_RANDOMIZE; i++)
+      RandomEM = RandomEM * 129 + 1;
 
-    seed = Random;
+    seed = RandomEM;
   }
 
-  Random = seed;
+  RandomEM = seed;
 
   return (unsigned int) seed;
 }
diff --git a/src/game_em/input.c b/src/game_em/input.c
index b4639903..7418f0b6 100644
--- a/src/game_em/input.c
+++ b/src/game_em/input.c
@@ -8,7 +8,7 @@
 #include "level.h"
 
 
-unsigned long Random;
+unsigned long RandomEM;
 
 struct PLAYER ply1;
 struct PLAYER ply2;
@@ -29,7 +29,7 @@ void game_init_vars(void)
 {
   int x, y;
 
-  Random = 1684108901;
+  RandomEM = 1684108901;
 
   for (y = 0; y < HEIGHT; y++)
     for (x = 0; x < WIDTH; x++)
@@ -85,7 +85,7 @@ void GameActions_EM(byte action)
 
   game_animscreen();
 
-  Random = Random * 129 + 1;
+  RandomEM = RandomEM * 129 + 1;
 
   frame = (frame - 1) & 7;
 
diff --git a/src/game_em/level.h b/src/game_em/level.h
index e4e221d3..46ba9e40 100644
--- a/src/game_em/level.h
+++ b/src/game_em/level.h
@@ -89,7 +89,7 @@ struct PLAYER
 
 #endif
 
-extern unsigned long Random;
+extern unsigned long RandomEM;
 
 extern struct PLAYER ply1;
 extern struct PLAYER ply2;
diff --git a/src/game_em/synchro_1.c b/src/game_em/synchro_1.c
index c5b2c456..124751d0 100644
--- a/src/game_em/synchro_1.c
+++ b/src/game_em/synchro_1.c
@@ -38,7 +38,7 @@ void synchro_1(void)
   ply2.oldy = ply2.y;
   ply2.anim = SPR_still;
 
-  if (Random & 256)
+  if (RandomEM & 256)
   {
     if (ply1.alive) check_player(&ply1);
     if (ply2.alive) check_player(&ply2);
@@ -489,7 +489,7 @@ static void check_player(struct PLAYER *ply)
       ply->dynamite_cnt = 0;
     }
 
-    Random += 7;	/* be a bit more random if the player doesn't move */
+    RandomEM += 7;	/* be a bit more random if the player doesn't move */
 
     return;
   }
diff --git a/src/game_em/synchro_2.c b/src/game_em/synchro_2.c
index 3ce1efeb..3dff9e62 100644
--- a/src/game_em/synchro_2.c
+++ b/src/game_em/synchro_2.c
@@ -20,7 +20,7 @@ void synchro_2(void)
 {
   register unsigned int x = 0;
   register unsigned int y = 1;
-  register unsigned long random = Random;
+  register unsigned long random = RandomEM;
   register unsigned short *cave_cache = Cave[y]; /* might be a win */
   unsigned long score = 0;
 
@@ -4887,7 +4887,7 @@ void synchro_2(void)
   if (ply1.alive || ply2.alive)
     lev.score += score; /* only get a score if someone is alive */
 
-  Random = random;
+  RandomEM = random;
 
   {
     void *temp = Cave;
diff --git a/src/game_em/synchro_3.c b/src/game_em/synchro_3.c
index bc171a83..449ecab0 100644
--- a/src/game_em/synchro_3.c
+++ b/src/game_em/synchro_3.c
@@ -63,7 +63,7 @@ void synchro_3(void)
 
   /* grow amoeba */
 
-  random = Random;
+  random = RandomEM;
 
   for (count = lev.amoeba_time; count--;)
   {
@@ -89,7 +89,7 @@ void synchro_3(void)
     random = random * 129 + 1;
   }
 
-  Random = random;
+  RandomEM = random;
 
   /* handle explosions */