#include "init.h"
#include "tools.h"
#include "tape.h"
+#include "config.h"
#define ENABLE_UNUSED_CODE 0 /* currently unused functions */
#define ENABLE_HISTORIC_CHUNKS 0 /* only for historic reference */
level_sp->header.DemoRandomSeed = tape.random_seed;
demo->length = 0;
+
for (i = 0; i < tape.length; i++)
{
int demo_action = map_key_RND_to_SP(tape.pos[i].action[0]);
int demo_repeat = tape.pos[i].delay;
+ int demo_entries = (demo_repeat + 15) / 16;
+
+ if (demo->length + demo_entries >= SP_MAX_TAPE_LEN)
+ {
+ Error(ERR_WARN, "tape truncated: size exceeds maximum SP demo size %d",
+ SP_MAX_TAPE_LEN);
+
+ break;
+ }
for (j = 0; j < demo_repeat / 16; j++)
demo->data[demo->length++] = 0xf0 | demo_action;
demo->data[demo->length++] = ((demo_repeat % 16 - 1) << 4) | demo_action;
}
- demo->data[demo->length++] = 0xff;
-
demo->is_available = TRUE;
}
return;
tape.level_nr = demo->level_nr; /* (currently not used) */
- tape.length = demo->length - 1; /* without "end of demo" byte */
tape.random_seed = level_sp->header.DemoRandomSeed;
TapeSetDateFromEpochSeconds(getFileTimestampEpochSeconds(filename));
- for (i = 0; i < demo->length - 1; i++)
+ tape.counter = 0;
+ tape.pos[tape.counter].delay = 0;
+
+ for (i = 0; i < demo->length; i++)
{
int demo_action = demo->data[i] & 0x0f;
int demo_repeat = (demo->data[i] & 0xf0) >> 4;
+ int tape_action = map_key_SP_to_RND(demo_action);
+ int tape_repeat = demo_repeat + 1;
+ byte action[MAX_PLAYERS] = { tape_action, 0, 0, 0 };
+ boolean success = 0;
+ int j;
- tape.pos[i].action[0] = map_key_SP_to_RND(demo_action);
- tape.pos[i].delay = demo_repeat + 1;
+ for (j = 0; j < tape_repeat; j++)
+ success = TapeAddAction(action);
+
+ if (!success)
+ {
+ Error(ERR_WARN, "SP demo truncated: size exceeds maximum tape size %d",
+ MAX_TAPE_LEN);
+
+ break;
+ }
}
- tape.length_frames = GetTapeLengthFrames();
- tape.length_seconds = GetTapeLengthSeconds();
+ TapeHaltRecording();
}
for (i = 0; i < tape->length; i++)
{
if (i >= MAX_TAPE_LEN)
+ {
+ Error(ERR_WARN, "tape truncated -- size exceeds maximum tape size %d",
+ MAX_TAPE_LEN);
+
+ // tape too large; read and ignore remaining tape data from this chunk
+ for (;i < tape->length; i++)
+ ReadUnusedBytesFromFile(file, tape->num_participating_players + 1);
+
break;
+ }
for (j = 0; j < MAX_PLAYERS; j++)
{
/* internal setup */
#define SETUP_TOKEN_INT_PROGRAM_TITLE 0
-#define SETUP_TOKEN_INT_PROGRAM_AUTHOR 1
-#define SETUP_TOKEN_INT_PROGRAM_EMAIL 2
-#define SETUP_TOKEN_INT_PROGRAM_WEBSITE 3
-#define SETUP_TOKEN_INT_PROGRAM_COPYRIGHT 4
-#define SETUP_TOKEN_INT_PROGRAM_COMPANY 5
-#define SETUP_TOKEN_INT_PROGRAM_ICON_FILE 6
-#define SETUP_TOKEN_INT_DEFAULT_GRAPHICS_SET 7
-#define SETUP_TOKEN_INT_DEFAULT_SOUNDS_SET 8
-#define SETUP_TOKEN_INT_DEFAULT_MUSIC_SET 9
-#define SETUP_TOKEN_INT_FALLBACK_GRAPHICS_FILE 10
-#define SETUP_TOKEN_INT_FALLBACK_SOUNDS_FILE 11
-#define SETUP_TOKEN_INT_FALLBACK_MUSIC_FILE 12
-#define SETUP_TOKEN_INT_DEFAULT_LEVEL_SERIES 13
-#define SETUP_TOKEN_INT_CHOOSE_FROM_TOP_LEVELDIR 14
-#define SETUP_TOKEN_INT_DEFAULT_WINDOW_WIDTH 15
-#define SETUP_TOKEN_INT_DEFAULT_WINDOW_HEIGHT 16
-
-#define NUM_INTERNAL_SETUP_TOKENS 17
+#define SETUP_TOKEN_INT_PROGRAM_VERSION 1
+#define SETUP_TOKEN_INT_PROGRAM_AUTHOR 2
+#define SETUP_TOKEN_INT_PROGRAM_EMAIL 3
+#define SETUP_TOKEN_INT_PROGRAM_WEBSITE 4
+#define SETUP_TOKEN_INT_PROGRAM_COPYRIGHT 5
+#define SETUP_TOKEN_INT_PROGRAM_COMPANY 6
+#define SETUP_TOKEN_INT_PROGRAM_ICON_FILE 7
+#define SETUP_TOKEN_INT_DEFAULT_GRAPHICS_SET 8
+#define SETUP_TOKEN_INT_DEFAULT_SOUNDS_SET 9
+#define SETUP_TOKEN_INT_DEFAULT_MUSIC_SET 10
+#define SETUP_TOKEN_INT_FALLBACK_GRAPHICS_FILE 11
+#define SETUP_TOKEN_INT_FALLBACK_SOUNDS_FILE 12
+#define SETUP_TOKEN_INT_FALLBACK_MUSIC_FILE 13
+#define SETUP_TOKEN_INT_DEFAULT_LEVEL_SERIES 14
+#define SETUP_TOKEN_INT_CHOOSE_FROM_TOP_LEVELDIR 15
+#define SETUP_TOKEN_INT_SHOW_SCALING_IN_TITLE 16
+#define SETUP_TOKEN_INT_DEFAULT_WINDOW_WIDTH 17
+#define SETUP_TOKEN_INT_DEFAULT_WINDOW_HEIGHT 18
+
+#define NUM_INTERNAL_SETUP_TOKENS 19
/* debug setup */
#define SETUP_TOKEN_DEBUG_FRAME_DELAY_0 0
#define SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_9 19
#define SETUP_TOKEN_DEBUG_FRAME_DELAY_USE_MOD_KEY 20
#define SETUP_TOKEN_DEBUG_FRAME_DELAY_GAME_ONLY 21
+#define SETUP_TOKEN_DEBUG_SHOW_FRAMES_PER_SECOND 22
-#define NUM_DEBUG_SETUP_TOKENS 22
+#define NUM_DEBUG_SETUP_TOKENS 23
/* options setup */
#define SETUP_TOKEN_OPTIONS_VERBOSE 0
static struct TokenInfo internal_setup_tokens[] =
{
{ TYPE_STRING, &sxi.program_title, "program_title" },
+ { TYPE_STRING, &sxi.program_version, "program_version" },
{ TYPE_STRING, &sxi.program_author, "program_author" },
{ TYPE_STRING, &sxi.program_email, "program_email" },
{ TYPE_STRING, &sxi.program_website, "program_website" },
{ TYPE_STRING, &sxi.fallback_music_file, "fallback_music_file" },
{ TYPE_STRING, &sxi.default_level_series, "default_level_series" },
{ TYPE_BOOLEAN,&sxi.choose_from_top_leveldir, "choose_from_top_leveldir" },
+ { TYPE_BOOLEAN,&sxi.show_scaling_in_title, "show_scaling_in_title" },
{ TYPE_INTEGER,&sxi.default_window_width, "default_window_width" },
{ TYPE_INTEGER,&sxi.default_window_height, "default_window_height" },
};
{ TYPE_KEY_X11, &sdi.frame_delay_key[9], "debug.key.frame_delay_9" },
{ TYPE_BOOLEAN, &sdi.frame_delay_use_mod_key,"debug.frame_delay.use_mod_key"},
{ TYPE_BOOLEAN, &sdi.frame_delay_game_only, "debug.frame_delay.game_only" },
+ { TYPE_BOOLEAN, &sdi.show_frames_per_second, "debug.show_frames_per_second" },
};
static struct TokenInfo options_setup_tokens[] =
si->system.audio_fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE;
si->internal.program_title = getStringCopy(PROGRAM_TITLE_STRING);
+ si->internal.program_version = getStringCopy(getProgramRealVersionString());
si->internal.program_author = getStringCopy(PROGRAM_AUTHOR_STRING);
si->internal.program_email = getStringCopy(PROGRAM_EMAIL_STRING);
si->internal.program_website = getStringCopy(PROGRAM_WEBSITE_STRING);
si->internal.default_level_series = getStringCopy(UNDEFINED_LEVELSET);
si->internal.choose_from_top_leveldir = FALSE;
+ si->internal.show_scaling_in_title = TRUE;
si->internal.default_window_width = WIN_XSIZE_DEFAULT;
si->internal.default_window_height = WIN_YSIZE_DEFAULT;
si->debug.frame_delay_use_mod_key = DEFAULT_FRAME_DELAY_USE_MOD_KEY;
si->debug.frame_delay_game_only = DEFAULT_FRAME_DELAY_GAME_ONLY;
+ si->debug.show_frames_per_second = FALSE;
+
si->options.verbose = FALSE;
#if defined(PLATFORM_ANDROID)
si->editor_cascade.el_dynamic = FALSE;
}
+#define MAX_HIDE_SETUP_TOKEN_SIZE 20
+
+static char *getHideSetupToken(void *setup_value)
+{
+ static char hide_setup_token[MAX_HIDE_SETUP_TOKEN_SIZE];
+
+ if (setup_value != NULL)
+ snprintf(hide_setup_token, MAX_HIDE_SETUP_TOKEN_SIZE, "%p", setup_value);
+
+ return hide_setup_token;
+}
+
+static void setHideSetupEntry(void *setup_value_raw)
+{
+ /* !!! DIRTY WORKAROUND; TO BE FIXED AFTER THE MM ENGINE RELEASE !!! */
+ void *setup_value = setup_value_raw - (void *)&si + (void *)&setup;
+
+ char *hide_setup_token = getHideSetupToken(setup_value);
+
+ if (setup_value != NULL)
+ setHashEntry(hide_setup_hash, hide_setup_token, "");
+}
+
+boolean hideSetupEntry(void *setup_value)
+{
+ char *hide_setup_token = getHideSetupToken(setup_value);
+
+ return (setup_value != NULL &&
+ getHashEntry(hide_setup_hash, hide_setup_token) != NULL);
+}
+
static void setSetupInfoFromTokenText(SetupFileHash *setup_file_hash,
struct TokenInfo *token_info,
int token_nr, char *token_text)
{
+ char *token_hide_text = getStringCat2(token_text, ".hide");
+ char *token_hide_value = getHashEntry(setup_file_hash, token_hide_text);
+
+ /* set the value of this setup option in the setup option structure */
setSetupInfo(token_info, token_nr, getHashEntry(setup_file_hash, token_text));
+
+ /* check if this setup option should be hidden in the setup menu */
+ if (token_hide_value != NULL && get_boolean_from_string(token_hide_value))
+ setHideSetupEntry(token_info[token_nr].value);
}
static void setSetupInfoFromTokenInfo(SetupFileHash *setup_file_hash,
if (!setup_file_hash)
return;
+ if (hide_setup_hash == NULL)
+ hide_setup_hash = newSetupFileHash();
+
/* global setup */
si = setup;
for (i = 0; i < NUM_GLOBAL_SETUP_TOKENS; i++)
projects / rocksndiamonds.git / blobdiff