From: Holger Schemel Date: Mon, 19 Oct 2009 22:30:29 +0000 (+0200) Subject: rnd-20091020-1-src X-Git-Tag: 3.3.0.0^2~76 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=98edd2c02783d6cf8ffe4d7aec340fe80cc8bcff;hp=055b582fdcaeddfa6dbb240eb591ec61f37e21d3;p=rocksndiamonds.git rnd-20091020-1-src --- diff --git a/src/conftime.h b/src/conftime.h index abf61b70..fbea7efb 100644 --- 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 79f1ec9c..a07d6967 100644 --- 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) +#if 0 printf("::: ExitToMenuFlag == True\n"); +#endif goto locExitMainGameLoop; } @@ -270,6 +272,14 @@ locRepeatMainGameLoop: // start repeating game loop locExitMainGameLoop: + + +#if 1 + return subMainGameLoop; +#endif + + + #if 0 printf("::: locExitMainGameLoop reached [%d]\n", LeadOutCounter); #endif @@ -306,7 +316,6 @@ locExitMainGameLoop: if (UpdatedFlag == 0) // update playing time subUpdatePlayingTime(); - return subMainGameLoop; } // subMainGameLoop diff --git a/src/game_sp/Makefile b/src/game_sp/Makefile index 13ed56e4..4679486b 100644 --- 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 # ----------------------------------------------------------------------------- -# 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 -# (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 886cd80b..a2063fda 100644 --- 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 -#if 0 +#if 1 game_sp_info.LevelSolved = TRUE; #endif diff --git a/src/game_sp/file.c b/src/game_sp/file.c index cd183a24..2aa0ddf5 100644 --- 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) */ - port->PortLocation = getFile16BitBE(file); + port->PortLocation = getFile16BitBE(file); /* yes, big endian */ #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->DemoRandomSeed = getFile16BitLE(file); + header->DemoRandomSeed = getFile16BitLE(file); /* yes, little endian */ -#if 1 +#if 0 printf("::: file.c: DemoRandomSeed == %d\n", header->DemoRandomSeed); #endif