projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
055b582
)
rnd-20091020-1-src
author
Holger Schemel
<info@artsoft.org>
Mon, 19 Oct 2009 22:30:29 +0000
(
00:30
+0200)
committer
Holger Schemel
<info@artsoft.org>
Sat, 30 Aug 2014 08:57:43 +0000
(10:57 +0200)
src/conftime.h
patch
|
blob
|
history
src/game_sp/MainGameLoop.c
patch
|
blob
|
history
src/game_sp/Makefile
patch
|
blob
|
history
src/game_sp/Murphy.c
patch
|
blob
|
history
src/game_sp/file.c
patch
|
blob
|
history
diff --git
a/src/conftime.h
b/src/conftime.h
index abf61b701768edf061317b19453d6cb13d2188b4..fbea7efb1895288c8d44fad70cb09319dfbd9035 100644
(file)
--- a/
src/conftime.h
+++ b/
src/conftime.h
@@
-1
+1
@@
-#define COMPILE_DATE_STRING "2009-10-
19 00:25
"
+#define COMPILE_DATE_STRING "2009-10-
20 00:29
"
diff --git
a/src/game_sp/MainGameLoop.c
b/src/game_sp/MainGameLoop.c
index 79f1ec9c6fbbffbe633f119e9ee2b52b946f2dd4..a07d6967a34bbad6616c68bed424c5daf1793c4c 100644
(file)
--- a/
src/game_sp/MainGameLoop.c
+++ b/
src/game_sp/MainGameLoop.c
@@
-236,7
+236,9
@@
locRepeatMainGameLoop: // start repeating game loop
{
// happens when demo ends or when Murphy enters exit (to be checked)
{
// happens when demo ends or when Murphy enters exit (to be checked)
+#if 0
printf("::: ExitToMenuFlag == True\n");
printf("::: ExitToMenuFlag == True\n");
+#endif
goto locExitMainGameLoop;
}
goto locExitMainGameLoop;
}
@@
-270,6
+272,14
@@
locRepeatMainGameLoop: // start repeating game loop
locExitMainGameLoop:
locExitMainGameLoop:
+
+
+#if 1
+ return subMainGameLoop;
+#endif
+
+
+
#if 0
printf("::: locExitMainGameLoop reached [%d]\n", LeadOutCounter);
#endif
#if 0
printf("::: locExitMainGameLoop reached [%d]\n", LeadOutCounter);
#endif
@@
-306,7
+316,6
@@
locExitMainGameLoop:
if (UpdatedFlag == 0) // update playing time
subUpdatePlayingTime();
if (UpdatedFlag == 0) // update playing time
subUpdatePlayingTime();
-
return subMainGameLoop;
} // subMainGameLoop
return subMainGameLoop;
} // subMainGameLoop
diff --git
a/src/game_sp/Makefile
b/src/game_sp/Makefile
index 13ed56e4a13d9d0eae6cba5241784d0de59c50e2..4679486b91860219241ac68fcb8ef8b7c39e3ab7 100644
(file)
--- a/
src/game_sp/Makefile
+++ b/
src/game_sp/Makefile
@@
-1,12
+1,11
@@
# =============================================================================
# =============================================================================
-# Makefile for
Rocks'n'Diamonds native Supaplex engine
(game_sp)
+# Makefile for
native Supaplex engine for Rocks'n'Diamonds
(game_sp)
# -----------------------------------------------------------------------------
# (c) 1995-2009 Holger Schemel <info@artsoft.org>
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
# (c) 1995-2009 Holger Schemel <info@artsoft.org>
# -----------------------------------------------------------------------------
-# MegaPlex version 0.5 beta release xmas 2001 by Frank Schindler,
+#
based on
MegaPlex version 0.5 beta release xmas 2001 by Frank Schindler,
# based on the Speed Fix 6.3+ by Herman Perk,
# based on original Supaplex by Michael Stopp & Philip Jespersen
# based on the Speed Fix 6.3+ by Herman Perk,
# based on original Supaplex by Michael Stopp & Philip Jespersen
-# (code automatically converted from VisualBasic to C by vb2c.pl).
# =============================================================================
# -----------------------------------------------------------------------------
# =============================================================================
# -----------------------------------------------------------------------------
diff --git
a/src/game_sp/Murphy.c
b/src/game_sp/Murphy.c
index 886cd80bfccb3b9583a332241636d51a6158b2ea..a2063fda6cea7ef3c506018950f57f8fee9e843b 100644
(file)
--- a/
src/game_sp/Murphy.c
+++ b/
src/game_sp/Murphy.c
@@
-936,7
+936,7
@@
loc_g_6756:
printf("::: Murphy.c: !!!!!!!!!! LEVEL %d SOLVED !!!!!!!!!!\n",LevelNumber);
#endif
printf("::: Murphy.c: !!!!!!!!!! LEVEL %d SOLVED !!!!!!!!!!\n",LevelNumber);
#endif
-#if
0
+#if
1
game_sp_info.LevelSolved = TRUE;
#endif
game_sp_info.LevelSolved = TRUE;
#endif
diff --git
a/src/game_sp/file.c
b/src/game_sp/file.c
index cd183a2471e3eaed80be66032e60ec331229c5db..2aa0ddf5e34e39adff14a286f8874db1dadf28ad 100644
(file)
--- a/
src/game_sp/file.c
+++ b/
src/game_sp/file.c
@@
-159,7
+159,7
@@
static void LoadNativeLevelFromFileStream_SP(FILE *file, boolean demo_available)
the 16 bit value here calculates as 2 * (x + (y * 60)) (this is twice
of what may be expected: Supaplex works with a game field in memory
which is 2 bytes per tile) */
the 16 bit value here calculates as 2 * (x + (y * 60)) (this is twice
of what may be expected: Supaplex works with a game field in memory
which is 2 bytes per tile) */
- port->PortLocation = getFile16BitBE(file);
+ port->PortLocation = getFile16BitBE(file);
/* yes, big endian */
#if 0
{
#if 0
{
@@
-190,9
+190,9
@@
static void LoadNativeLevelFromFileStream_SP(FILE *file, boolean demo_available)
header->CheckSumByte = getFile8Bit(file);
/* random seed used for recorded demos */
header->CheckSumByte = getFile8Bit(file);
/* random seed used for recorded demos */
- header->DemoRandomSeed = getFile16BitLE(file);
+ header->DemoRandomSeed = getFile16BitLE(file);
/* yes, little endian */
-#if
1
+#if
0
printf("::: file.c: DemoRandomSeed == %d\n", header->DemoRandomSeed);
#endif
printf("::: file.c: DemoRandomSeed == %d\n", header->DemoRandomSeed);
#endif