projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6413b63
)
rnd-20050815-1-src
author
Holger Schemel
<info@artsoft.org>
Mon, 15 Aug 2005 21:43:12 +0000
(23:43 +0200)
committer
Holger Schemel
<info@artsoft.org>
Sat, 30 Aug 2014 08:49:16 +0000
(10:49 +0200)
Makefile
patch
|
blob
|
history
src/Makefile
patch
|
blob
|
history
src/conftime.h
patch
|
blob
|
history
src/game_em/init.c
patch
|
blob
|
history
src/game_em/input.c
patch
|
blob
|
history
src/game_em/level.h
patch
|
blob
|
history
src/game_em/synchro_1.c
patch
|
blob
|
history
src/game_em/synchro_2.c
patch
|
blob
|
history
src/game_em/synchro_3.c
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index 538c451c55863a85b87a08bccd80e27971598d11..bf09646daa34bb1b8136ea31f0cf5ecced63cba3 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-76,6
+76,9
@@
solaris-sdl:
mac:
@$(MAKE_CMD) PLATFORM=macosx
mac:
@$(MAKE_CMD) PLATFORM=macosx
+mac-static:
+ @$(MAKE_CMD) PLATFORM=macosx TARGET=sdl-static
+
msdos:
@$(MAKE_CMD) PLATFORM=msdos
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) 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
tags:
$(MAKE_CMD) tags
diff --git
a/src/Makefile
b/src/Makefile
index 286a5c9a0676af2a26e8cb13d1fd2dcda954741b..4cd0223f346f74ffcf1c2d343fc13504c8065592 100644
(file)
--- 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
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
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 b96b8ac511124de3bd248f95efc0957d810e6f67..d497fb8f02c6096c8ebd95fe697ad4a14b9dc36a 100644
(file)
--- 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 c22c551d3377f4e87cf5406d12f48bf053957292..54759eefbe5a12ca785365e6fca8817e1a079f58 100644
(file)
--- 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;
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 || Random
EM
== NEW_RANDOMIZE; i++)
+ Random
EM = RandomEM
* 129 + 1;
- seed = Random;
+ seed = Random
EM
;
}
}
- Random = seed;
+ Random
EM
= seed;
return (unsigned int) seed;
}
return (unsigned int) seed;
}
diff --git
a/src/game_em/input.c
b/src/game_em/input.c
index b46399039058863e9c4ee81eafe5e208fd6e1377..7418f0b6a55547757d60334fb3a3089733dbd348 100644
(file)
--- a/
src/game_em/input.c
+++ b/
src/game_em/input.c
@@
-8,7
+8,7
@@
#include "level.h"
#include "level.h"
-unsigned long Random;
+unsigned long Random
EM
;
struct PLAYER ply1;
struct PLAYER ply2;
struct PLAYER ply1;
struct PLAYER ply2;
@@
-29,7
+29,7
@@
void game_init_vars(void)
{
int x, y;
{
int x, y;
- Random = 1684108901;
+ Random
EM
= 1684108901;
for (y = 0; y < HEIGHT; y++)
for (x = 0; x < WIDTH; x++)
for (y = 0; y < HEIGHT; y++)
for (x = 0; x < WIDTH; x++)
@@
-85,7
+85,7
@@
void GameActions_EM(byte action)
game_animscreen();
game_animscreen();
- Random
= Random
* 129 + 1;
+ Random
EM = RandomEM
* 129 + 1;
frame = (frame - 1) & 7;
frame = (frame - 1) & 7;
diff --git
a/src/game_em/level.h
b/src/game_em/level.h
index e4e221d3eca2c523d1390f89c4acb2a348926a11..46ba9e4038825e8d5a49750a74bbf92fbf7b881b 100644
(file)
--- a/
src/game_em/level.h
+++ b/
src/game_em/level.h
@@
-89,7
+89,7
@@
struct PLAYER
#endif
#endif
-extern unsigned long Random;
+extern unsigned long Random
EM
;
extern struct PLAYER ply1;
extern struct PLAYER ply2;
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 c5b2c456b4910ed38eae9452f42b29d4f17d1edb..124751d0ad312087bbf805251937df00481ef4eb 100644
(file)
--- 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;
ply2.oldy = ply2.y;
ply2.anim = SPR_still;
- if (Random & 256)
+ if (Random
EM
& 256)
{
if (ply1.alive) check_player(&ply1);
if (ply2.alive) check_player(&ply2);
{
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;
}
ply->dynamite_cnt = 0;
}
- Random
+= 7;
/* be a bit more random if the player doesn't move */
+ Random
EM += 7;
/* be a bit more random if the player doesn't move */
return;
}
return;
}
diff --git
a/src/game_em/synchro_2.c
b/src/game_em/synchro_2.c
index 3ce1efebbd19a336c1dd68d7610bd47b1a525681..3dff9e62edd2445be9f9df73bdbe96d0e2d2a662 100644
(file)
--- 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 int x = 0;
register unsigned int y = 1;
- register unsigned long random = Random;
+ register unsigned long random = Random
EM
;
register unsigned short *cave_cache = Cave[y]; /* might be a win */
unsigned long score = 0;
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 */
if (ply1.alive || ply2.alive)
lev.score += score; /* only get a score if someone is alive */
- Random = random;
+ Random
EM
= random;
{
void *temp = Cave;
{
void *temp = Cave;
diff --git
a/src/game_em/synchro_3.c
b/src/game_em/synchro_3.c
index bc171a8372eb5e87011911f69e00b2de12b78cf0..449ecab094649ad72c2104835294bd8cb11f4b32 100644
(file)
--- a/
src/game_em/synchro_3.c
+++ b/
src/game_em/synchro_3.c
@@
-63,7
+63,7
@@
void synchro_3(void)
/* grow amoeba */
/* grow amoeba */
- random = Random;
+ random = Random
EM
;
for (count = lev.amoeba_time; count--;)
{
for (count = lev.amoeba_time; count--;)
{
@@
-89,7
+89,7
@@
void synchro_3(void)
random = random * 129 + 1;
}
random = random * 129 + 1;
}
- Random = random;
+ Random
EM
= random;
/* handle explosions */
/* handle explosions */