projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20140224-1-src
[rocksndiamonds.git]
/
src
/
tape.c
diff --git
a/src/tape.c
b/src/tape.c
index cf72eda3066aeefdecfd201ea5186a03eb274130..2ab6f4be8bbcdced5b641be9e27e10d2f5ca718b 100644
(file)
--- a/
src/tape.c
+++ b/
src/tape.c
@@
-186,7
+186,7
@@
static struct GadgetInfo *tape_gadget[NUM_TAPE_BUTTONS];
/* video display functions */
/* ========================================================================= */
/* video display functions */
/* ========================================================================= */
-void DrawVideoDisplay(unsigned
long state, unsigned long
value)
+void DrawVideoDisplay(unsigned
int state, unsigned int
value)
{
int i, j, k;
static char *monatsname[12] =
{
int i, j, k;
static char *monatsname[12] =
@@
-677,12
+677,12
@@
static void TapeRewind()
InitRND(tape.random_seed);
}
InitRND(tape.random_seed);
}
-static void TapeSetRandomSeed(
long
random_seed)
+static void TapeSetRandomSeed(
int
random_seed)
{
tape.random_seed = InitRND(random_seed);
}
{
tape.random_seed = InitRND(random_seed);
}
-void TapeStartRecording(
long
random_seed)
+void TapeStartRecording(
int
random_seed)
{
if (!TAPE_IS_STOPPED(tape))
TapeStop();
{
if (!TAPE_IS_STOPPED(tape))
TapeStop();
@@
-1079,7
+1079,7
@@
void TapeQuickSave()
{
if (game_status == GAME_MODE_MAIN)
{
{
if (game_status == GAME_MODE_MAIN)
{
- Request("No game that can be saved
!", REQ_CONFIRM);
+ Request("No game that can be saved!", REQ_CONFIRM);
return;
}
return;
}
@@
-1092,7
+1092,7
@@
void TapeQuickSave()
if (TAPE_IS_EMPTY(tape))
{
if (TAPE_IS_EMPTY(tape))
{
- Request("No tape that can be saved
!", REQ_CONFIRM);
+ Request("No tape that can be saved!", REQ_CONFIRM);
return;
}
return;
}
@@
-1107,12
+1107,12
@@
void TapeQuickLoad()
if (!fileExists(filename))
{
if (!fileExists(filename))
{
- Request("No tape for this level
!", REQ_CONFIRM);
+ Request("No tape for this level!", REQ_CONFIRM);
return;
}
return;
}
- if (tape.recording && !Request("Stop recording and load tape
?",
+ if (tape.recording && !Request("Stop recording and load tape?",
REQ_ASK | REQ_STAY_CLOSED))
{
OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
REQ_ASK | REQ_STAY_CLOSED))
{
OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
@@
-1157,7
+1157,7
@@
void TapeQuickLoad()
{
int reopen_door = (game_status == GAME_MODE_PLAYING ? REQ_REOPEN : 0);
{
int reopen_door = (game_status == GAME_MODE_PLAYING ? REQ_REOPEN : 0);
- Request("No tape for this level
!", REQ_CONFIRM | reopen_door);
+ Request("No tape for this level!", REQ_CONFIRM | reopen_door);
}
}
}
}
@@
-1169,7
+1169,7
@@
void InsertSolutionTape()
LoadSolutionTape(level_nr);
if (TAPE_IS_EMPTY(tape))
LoadSolutionTape(level_nr);
if (TAPE_IS_EMPTY(tape))
- Request("No solution tape for this level
!", REQ_CONFIRM);
+ Request("No solution tape for this level!", REQ_CONFIRM);
DrawCompleteVideoDisplay();
}
DrawCompleteVideoDisplay();
}
@@
-1188,7
+1188,9
@@
void AutoPlayTape()
static int num_levels_solved = 0;
static int num_tape_missing = 0;
static boolean level_failed[MAX_TAPES_PER_SET];
static int num_levels_solved = 0;
static int num_tape_missing = 0;
static boolean level_failed[MAX_TAPES_PER_SET];
+#if 0
static boolean tape_missing[MAX_TAPES_PER_SET];
static boolean tape_missing[MAX_TAPES_PER_SET];
+#endif
int i;
if (autoplay_initialized)
int i;
if (autoplay_initialized)
@@
-1237,7
+1239,9
@@
void AutoPlayTape()
for (i = 0; i < MAX_TAPES_PER_SET; i++)
{
level_failed[i] = FALSE;
for (i = 0; i < MAX_TAPES_PER_SET; i++)
{
level_failed[i] = FALSE;
+#if 0
tape_missing[i] = FALSE;
tape_missing[i] = FALSE;
+#endif
}
autoplay_initialized = TRUE;
}
autoplay_initialized = TRUE;
@@
-1272,8
+1276,10
@@
void AutoPlayTape()
if (tape.no_valid_file)
{
num_tape_missing++;
if (tape.no_valid_file)
{
num_tape_missing++;
+#if 0
if (level_nr >= 0 && level_nr < MAX_TAPES_PER_SET)
tape_missing[level_nr] = TRUE;
if (level_nr >= 0 && level_nr < MAX_TAPES_PER_SET)
tape_missing[level_nr] = TRUE;
+#endif
printf("(no tape)\n");
continue;
printf("(no tape)\n");
continue;
@@
-1452,7
+1458,7
@@
static void HandleTapeButtonsExt(int id)
LoadTape(level_nr);
if (TAPE_IS_EMPTY(tape))
LoadTape(level_nr);
if (TAPE_IS_EMPTY(tape))
- Request("No tape for this level
!", REQ_CONFIRM);
+ Request("No tape for this level!", REQ_CONFIRM);
}
else
{
}
else
{