Change exclamation marks with dots for less scream factor.

This commit is contained in:
Themaister 2012-02-11 20:59:41 +01:00
parent ffc0c1d77e
commit 1cff87c758
5 changed files with 28 additions and 28 deletions

View File

@ -81,7 +81,7 @@
#elif defined(HAVE_DYLIB) #elif defined(HAVE_DYLIB)
#define VIDEO_DEFAULT_DRIVER VIDEO_EXT #define VIDEO_DEFAULT_DRIVER VIDEO_EXT
#else #else
#error "Need at least one video driver!" #error "Need at least one video driver."
#endif #endif
#if defined(__CELLOS_LV2__) #if defined(__CELLOS_LV2__)
@ -117,7 +117,7 @@
#elif defined(HAVE_DYLIB) #elif defined(HAVE_DYLIB)
#define AUDIO_DEFAULT_DRIVER AUDIO_EXT #define AUDIO_DEFAULT_DRIVER AUDIO_EXT
#else #else
#error "Need at least one audio driver!" #error "Need at least one audio driver."
#endif #endif
#if defined(XENON) #if defined(XENON)
@ -133,7 +133,7 @@
#elif defined(HAVE_XVIDEO) #elif defined(HAVE_XVIDEO)
#define INPUT_DEFAULT_DRIVER INPUT_X #define INPUT_DEFAULT_DRIVER INPUT_X
#else #else
#error "Need at least one input driver!" #error "Need at least one input driver."
#endif #endif

View File

@ -1042,7 +1042,7 @@ static bool netplay_get_cmd(netplay_t *handle)
handle->flip_frame = flip_frame; handle->flip_frame = flip_frame;
SSNES_LOG("Netplay players are flipped!\n"); SSNES_LOG("Netplay players are flipped!\n");
msg_queue_push(g_extern.msg_queue, "Netplay players are flipped!", 1, 180); msg_queue_push(g_extern.msg_queue, "Netplay players are flipped.", 1, 180);
return netplay_cmd_ack(handle); return netplay_cmd_ack(handle);
} }
@ -1061,13 +1061,13 @@ void netplay_flip_players(netplay_t *handle)
if (handle->spectate) if (handle->spectate)
{ {
msg = "Cannot flip players in spectate mode!"; msg = "Cannot flip players in spectate mode.";
goto error; goto error;
} }
if (handle->port == 0) if (handle->port == 0)
{ {
msg = "Cannot flip players if you're not the host!"; msg = "Cannot flip players if you're not the host.";
goto error; goto error;
} }
@ -1082,7 +1082,7 @@ void netplay_flip_players(netplay_t *handle)
&& netplay_get_response(handle)) && netplay_get_response(handle))
{ {
SSNES_LOG("Netplay players are flipped!\n"); SSNES_LOG("Netplay players are flipped!\n");
msg_queue_push(g_extern.msg_queue, "Netplay players are flipped!", 1, 180); msg_queue_push(g_extern.msg_queue, "Netplay players are flipped.", 1, 180);
// Queue up a flip well enough in the future. // Queue up a flip well enough in the future.
handle->flip ^= true; handle->flip ^= true;
@ -1090,7 +1090,7 @@ void netplay_flip_players(netplay_t *handle)
} }
else else
{ {
msg = "Failed to flip players!"; msg = "Failed to flip players.";
goto error; goto error;
} }
@ -1214,7 +1214,7 @@ static int16_t netplay_get_spectate_input(netplay_t *handle, bool port, unsigned
{ {
SSNES_ERR("Connection with host was cut!\n"); SSNES_ERR("Connection with host was cut!\n");
msg_queue_clear(g_extern.msg_queue); msg_queue_clear(g_extern.msg_queue);
msg_queue_push(g_extern.msg_queue, "Connection with host was cut!", 1, 180); msg_queue_push(g_extern.msg_queue, "Connection with host was cut.", 1, 180);
psnes_set_input_state(netplay_callbacks(g_extern.netplay)->state_cb); psnes_set_input_state(netplay_callbacks(g_extern.netplay)->state_cb);
return netplay_callbacks(g_extern.netplay)->state_cb(port, device, index, id); return netplay_callbacks(g_extern.netplay)->state_cb(port, device, index, id);
@ -1382,7 +1382,7 @@ static void netplay_post_frame_spectate(netplay_t *handle)
SSNES_LOG("Client (#%u) disconnected ...\n", i); SSNES_LOG("Client (#%u) disconnected ...\n", i);
char msg[512]; char msg[512];
snprintf(msg, sizeof(msg), "Client (#%u) disconnected!", i); snprintf(msg, sizeof(msg), "Client (#%u) disconnected.", i);
msg_queue_push(g_extern.msg_queue, msg, 1, 180); msg_queue_push(g_extern.msg_queue, msg, 1, 180);
close(handle->spectate_fds[i]); close(handle->spectate_fds[i]);

View File

@ -400,7 +400,7 @@ static void ingame_menu(void)
bool ret = load_state(g_extern.savestate_name); bool ret = load_state(g_extern.savestate_name);
msg_queue_clear(g_extern.msg_queue); msg_queue_clear(g_extern.msg_queue);
if(ret) if(ret)
snprintf(msg, sizeof(msg), "Loaded state from slot #%d!", g_extern.state_slot); snprintf(msg, sizeof(msg), "Loaded state from slot #%d.", g_extern.state_slot);
else else
snprintf(msg, sizeof(msg), "Can't load from save state slot #%d", g_extern.state_slot); snprintf(msg, sizeof(msg), "Can't load from save state slot #%d", g_extern.state_slot);
msg_queue_clear(g_extern.msg_queue); msg_queue_clear(g_extern.msg_queue);
@ -439,7 +439,7 @@ static void ingame_menu(void)
char msg[512]; char msg[512];
bool ret = save_state(g_extern.savestate_name); bool ret = save_state(g_extern.savestate_name);
snprintf(msg, sizeof(msg), "Saved state to slot #%d!", g_extern.state_slot); snprintf(msg, sizeof(msg), "Saved state to slot #%d.", g_extern.state_slot);
msg_queue_clear(g_extern.msg_queue); msg_queue_clear(g_extern.msg_queue);
msg_queue_push(g_extern.msg_queue, msg, 1, 180); msg_queue_push(g_extern.msg_queue, msg, 1, 180);

View File

@ -1590,7 +1590,7 @@ static void select_rom(void)
if (FILEBROWSER_IS_CURRENT_A_DIRECTORY(browser)) if (FILEBROWSER_IS_CURRENT_A_DIRECTORY(browser))
{ {
if(!strcmp(FILEBROWSER_GET_CURRENT_FILENAME(browser),"app_home") || !strcmp(FILEBROWSER_GET_CURRENT_FILENAME(browser),"host_root")) if(!strcmp(FILEBROWSER_GET_CURRENT_FILENAME(browser),"app_home") || !strcmp(FILEBROWSER_GET_CURRENT_FILENAME(browser),"host_root"))
cellDbgFontPrintf(0.09f, 0.83f, 0.91f, RED, "WARNING - This path only works on DEX PS3 systems. Do not attempt to open\n this directory on CEX PS3 systems, or you might have to restart!"); cellDbgFontPrintf(0.09f, 0.83f, 0.91f, RED, "WARNING - This path only works on DEX PS3 systems. Do not attempt to open\n this directory on CEX PS3 systems, or you might have to restart.");
else if(!strcmp(FILEBROWSER_GET_CURRENT_FILENAME(browser),"..")) else if(!strcmp(FILEBROWSER_GET_CURRENT_FILENAME(browser),".."))
cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, "INFO - Press X to go back to the previous directory."); cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, "INFO - Press X to go back to the previous directory.");
else else

30
ssnes.c
View File

@ -117,12 +117,12 @@ static void take_screenshot(void)
if (ret) if (ret)
{ {
SSNES_LOG("Taking screenshot!\n"); SSNES_LOG("Taking screenshot!\n");
msg = "Taking screenshot!"; msg = "Taking screenshot.";
} }
else else
{ {
SSNES_WARN("Failed to take screenshot ...\n"); SSNES_WARN("Failed to take screenshot ...\n");
msg = "Failed to take screenshot!"; msg = "Failed to take screenshot.";
} }
msg_queue_clear(g_extern.msg_queue); msg_queue_clear(g_extern.msg_queue);
@ -1189,20 +1189,20 @@ static void init_movie(void)
} }
g_extern.bsv.movie_playback = true; g_extern.bsv.movie_playback = true;
msg_queue_push(g_extern.msg_queue, "Starting movie playback!", 2, 180); msg_queue_push(g_extern.msg_queue, "Starting movie playback.", 2, 180);
SSNES_LOG("Starting movie playback!\n"); SSNES_LOG("Starting movie playback!\n");
g_settings.rewind_granularity = 1; g_settings.rewind_granularity = 1;
} }
else if (g_extern.bsv.movie_start_recording) else if (g_extern.bsv.movie_start_recording)
{ {
char msg[PATH_MAX]; char msg[PATH_MAX];
snprintf(msg, sizeof(msg), "Starting movie record to \"%s\"!", snprintf(msg, sizeof(msg), "Starting movie record to \"%s\".",
g_extern.bsv.movie_start_path); g_extern.bsv.movie_start_path);
g_extern.bsv.movie = bsv_movie_init(g_extern.bsv.movie_start_path, SSNES_MOVIE_RECORD); g_extern.bsv.movie = bsv_movie_init(g_extern.bsv.movie_start_path, SSNES_MOVIE_RECORD);
msg_queue_clear(g_extern.msg_queue); msg_queue_clear(g_extern.msg_queue);
msg_queue_push(g_extern.msg_queue, msg_queue_push(g_extern.msg_queue,
g_extern.bsv.movie ? msg : "Failed to start movie record!", 1, 180); g_extern.bsv.movie ? msg : "Failed to start movie record.", 1, 180);
if (g_extern.bsv.movie) if (g_extern.bsv.movie)
{ {
@ -1521,7 +1521,7 @@ static void check_savestates(void)
if (save_state(save_path)) if (save_state(save_path))
{ {
msg_queue_clear(g_extern.msg_queue); msg_queue_clear(g_extern.msg_queue);
snprintf(msg, sizeof(msg), "Saved state to slot #%u!", g_extern.state_slot); snprintf(msg, sizeof(msg), "Saved state to slot #%u.", g_extern.state_slot);
msg_queue_push(g_extern.msg_queue, msg, 1, 180); msg_queue_push(g_extern.msg_queue, msg, 1, 180);
} }
else else
@ -1548,7 +1548,7 @@ static void check_savestates(void)
if (load_state(load_path)) if (load_state(load_path))
{ {
msg_queue_clear(g_extern.msg_queue); msg_queue_clear(g_extern.msg_queue);
snprintf(msg, sizeof(msg), "Loaded state from slot #%u!", g_extern.state_slot); snprintf(msg, sizeof(msg), "Loaded state from slot #%u.", g_extern.state_slot);
msg_queue_push(g_extern.msg_queue, msg, 1, 180); msg_queue_push(g_extern.msg_queue, msg, 1, 180);
} }
else else
@ -1690,14 +1690,14 @@ static void check_rewind(void)
g_extern.frame_is_reverse = true; g_extern.frame_is_reverse = true;
setup_rewind_audio(); setup_rewind_audio();
msg_queue_push(g_extern.msg_queue, "Rewinding!", 0, g_extern.is_paused ? 1 : 30); msg_queue_push(g_extern.msg_queue, "Rewinding.", 0, g_extern.is_paused ? 1 : 30);
psnes_unserialize((uint8_t*)buf, g_extern.state_size); psnes_unserialize((uint8_t*)buf, g_extern.state_size);
if (g_extern.bsv.movie) if (g_extern.bsv.movie)
bsv_movie_frame_rewind(g_extern.bsv.movie); bsv_movie_frame_rewind(g_extern.bsv.movie);
} }
else else
msg_queue_push(g_extern.msg_queue, "Reached end of rewind buffer!", 0, 30); msg_queue_push(g_extern.msg_queue, "Reached end of rewind buffer.", 0, 30);
} }
else else
{ {
@ -1722,7 +1722,7 @@ static void check_movie_record(void)
if (g_extern.bsv.movie) if (g_extern.bsv.movie)
{ {
msg_queue_clear(g_extern.msg_queue); msg_queue_clear(g_extern.msg_queue);
msg_queue_push(g_extern.msg_queue, "Stopping movie record!", 2, 180); msg_queue_push(g_extern.msg_queue, "Stopping movie record.", 2, 180);
SSNES_LOG("Stopping movie record!\n"); SSNES_LOG("Stopping movie record!\n");
bsv_movie_free(g_extern.bsv.movie); bsv_movie_free(g_extern.bsv.movie);
g_extern.bsv.movie = NULL; g_extern.bsv.movie = NULL;
@ -1744,11 +1744,11 @@ static void check_movie_record(void)
} }
char msg[PATH_MAX]; char msg[PATH_MAX];
snprintf(msg, sizeof(msg), "Starting movie record to \"%s\"!", path); snprintf(msg, sizeof(msg), "Starting movie record to \"%s\".", path);
g_extern.bsv.movie = bsv_movie_init(path, SSNES_MOVIE_RECORD); g_extern.bsv.movie = bsv_movie_init(path, SSNES_MOVIE_RECORD);
msg_queue_clear(g_extern.msg_queue); msg_queue_clear(g_extern.msg_queue);
msg_queue_push(g_extern.msg_queue, g_extern.bsv.movie ? msg : "Failed to start movie record!", 1, 180); msg_queue_push(g_extern.msg_queue, g_extern.bsv.movie ? msg : "Failed to start movie record.", 1, 180);
if (g_extern.bsv.movie) if (g_extern.bsv.movie)
SSNES_LOG("Starting movie record to \"%s\"!\n", path); SSNES_LOG("Starting movie record to \"%s\"!\n", path);
@ -1764,7 +1764,7 @@ static void check_movie_playback(void)
{ {
if (g_extern.bsv.movie_end) if (g_extern.bsv.movie_end)
{ {
msg_queue_push(g_extern.msg_queue, "Movie playback ended!", 1, 180); msg_queue_push(g_extern.msg_queue, "Movie playback ended.", 1, 180);
SSNES_LOG("Movie playback ended!\n"); SSNES_LOG("Movie playback ended!\n");
bsv_movie_free(g_extern.bsv.movie); bsv_movie_free(g_extern.bsv.movie);
@ -1854,7 +1854,7 @@ void ssnes_game_reset(void)
{ {
SSNES_LOG("Resetting game!\n"); SSNES_LOG("Resetting game!\n");
msg_queue_clear(g_extern.msg_queue); msg_queue_clear(g_extern.msg_queue);
msg_queue_push(g_extern.msg_queue, "Reset!", 1, 120); msg_queue_push(g_extern.msg_queue, "Reset.", 1, 120);
psnes_reset(); psnes_reset();
init_controllers(); // bSNES since v073r01 resets controllers to JOYPAD after a reset, so just enforce it here. init_controllers(); // bSNES since v073r01 resets controllers to JOYPAD after a reset, so just enforce it here.
} }
@ -1980,7 +1980,7 @@ static void check_mute(void)
{ {
g_extern.audio_data.mute = !g_extern.audio_data.mute; g_extern.audio_data.mute = !g_extern.audio_data.mute;
const char *msg = g_extern.audio_data.mute ? "Audio muted!" : "Audio unmuted!"; const char *msg = g_extern.audio_data.mute ? "Audio muted." : "Audio unmuted.";
msg_queue_clear(g_extern.msg_queue); msg_queue_clear(g_extern.msg_queue);
msg_queue_push(g_extern.msg_queue, msg, 1, 180); msg_queue_push(g_extern.msg_queue, msg, 1, 180);